c2cgeoportal-geoportal 2.7.1.156__py2.py3-none-any.whl → 2.8.1.87__py2.py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt

@@ -1 +1 @@
-c2cciutils==1.1.*
+c2cciutils[checks,publish]==1.4.16

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml

@@ -0,0 +1,26 @@
+# This file is used by the acceptance tests to have a local database.
+
+version: '2.3'
+
+volumes:
+  postgresql_data:
+
+services:
+  config: &db-config
+    environment:
+      - PGHOST=db
+      - PGHOST_SLAVE=db
+      - PGSSLMODE=prefer
+  geoportal: *db-config
+  # geoportal-advance: *db-config
+  tools: *db-config
+  alembic: *db-config
+  # alembic-advance: *db-config
+  # webpack_dev_server: *db-config
+
+  db:
+    extends:
+      file: docker-compose-lib.yaml
+      service: db
+    volumes:
+      - postgresql_data:/var/lib/postgresql/data

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml

@@ -1,4 +1,5 @@
----
+# This file is managed by c2cgeoportal, it contains the default services configuration
+
 version: '2.3'
 
 services:
@@ -64,9 +65,11 @@ services:
       - AZURE_STORAGE_SAS_TOKEN
       - TILEGENERATION_AZURE_CONTAINER
       - RASTER_BASE_PATH
+      - DISABLE_HAPROXY_LOGGING
+      - HAPROXY_LOGGING_OPTIONS
 
   print:
-    image: camptocamp/mapfish_print:3.28
+    image: camptocamp/mapfish_print:3.30
     user: www-data
     restart: unless-stopped
     environment:
@@ -74,12 +77,13 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:7.6-gdal3.7
+    image: camptocamp/mapserver:8.0-gdal3.7
     user: www-data
     restart: unless-stopped
     entrypoint: []
     environment:
       - PGOPTIONS
+      - MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
 
   qgisserver:
     image: camptocamp/geomapfish-qgisserver:gmf${GEOMAPFISH_MAIN_VERSION}-qgis${QGIS_VERSION}
@@ -106,30 +110,26 @@ services:
       - CPL_VSIL_CURL_CACHE_SIZE
       - CPL_VSIL_CURL_USE_HEAD
       - GDAL_DISABLE_READDIR_ON_OPEN
-      - QGIS_SERVER_LOG_LEVEL=2
+      - QGIS_SERVER_LOG_LEVEL
       - QGIS_AUTH_DB_DIR_PATH
       - QGIS_SERVER_IGNORE_BAD_LAYERS
       - QGIS_SERVER_DISABLE_GETPRINT
       - PGSERVICEFILE
-      - LOG_LEVEL=INFO
+      - LOG_LEVEL=${QGIS_LOG_LEVEL}
       - LOG_TYPE
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
       - OTHER_LOG_LEVEL
       - GEOMAPFISH_ACCESSCONTROL_BASE_URL=${QGISSERVER_URL}
-      - QGIS_SERVER_TRUST_LAYER_METADATA=TRUE
-      - QGIS_SERVER_PARALLEL_RENDERING=FALSE
-      - MAX_CACHE_LAYERS=100
-      - QGIS_SERVER_IGNORE_BAD_LAYERS=TRUE
-      - QGIS_SERVER_CACHE_SIZE=60 # MB
-      - QGIS_SERVER_WMS_MAX_HEIGHT=5000
-      - QGIS_SERVER_WMS_MAX_WIDTH=5000
-      - QGIS_SERVER_API_WFS3_MAX_LIMIT=10000
-      - QGIS_SERVER_DISABLE_GETPRINT=TRUE
-      - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
-      - QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE=fr
-      - QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/
-      - PGSERVICEFILE=/etc/qgisserver/pg_service.conf
+      - QGIS_SERVER_TRUST_LAYER_METADATA
+      - QGIS_SERVER_PARALLEL_RENDERING
+      - MAX_CACHE_LAYERS
+      - QGIS_SERVER_CACHE_SIZE
+      - QGIS_SERVER_WMS_MAX_HEIGHT
+      - QGIS_SERVER_WMS_MAX_WIDTH
+      - QGIS_SERVER_API_WFS3_MAX_LIMIT
+      - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES
+      - QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE
 
   tinyows:
     image: camptocamp/tinyows:master
@@ -137,7 +137,7 @@ services:
     restart: unless-stopped
 
   redis:
-    image: &redis-image redis:6
+    image: &redis-image redis:7.0
     user: www-data
     restart: unless-stopped
     command:
@@ -198,6 +198,14 @@ services:
       - C2C_PROFILER_PATH
       - C2C_PROFILER_MODULES
       - C2C_SECRET
+      - C2C_AUTH_GITHUB_REPOSITORY
+      - C2C_AUTH_GITHUB_ACCESS_TYPE
+      - C2C_AUTH_GITHUB_CLIENT_ID
+      - C2C_AUTH_GITHUB_CLIENT_SECRET
+      - C2C_AUTH_GITHUB_SCOPE
+      - C2C_AUTH_GITHUB_SECRET
+      - C2C_AUTH_GITHUB_PROXY_URL
+      - C2C_USE_SESSION=true
       - TILECLOUD_LOG_LEVEL
       - TILECLOUD_CHAIN_LOG_LEVEL
       - C2CWSGI_LOG_LEVEL
@@ -238,7 +246,6 @@ services:
       - PGPASSWORD
       - PGDATABASE
       - PGSSLMODE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
       - PGOPTIONS
       - SQLALCHEMY_POOL_RECYCLE
@@ -291,6 +298,13 @@ services:
       - C2C_PROFILER_MODULES
       - C2C_DEBUG_VIEW_ENABLED=TRUE
       - C2C_SECRET
+      - C2C_AUTH_GITHUB_REPOSITORY
+      - C2C_AUTH_GITHUB_ACCESS_TYPE
+      - C2C_AUTH_GITHUB_CLIENT_ID
+      - C2C_AUTH_GITHUB_CLIENT_SECRET
+      - C2C_AUTH_GITHUB_SCOPE
+      - C2C_AUTH_GITHUB_SECRET
+      - C2C_AUTH_GITHUB_PROXY_URL
       - LOG_LEVEL
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
@@ -379,7 +393,6 @@ services:
       - C2C_PROFILER_PATH
       - C2C_PROFILER_MODULES
       - C2C_DEBUG_VIEW_ENABLED=TRUE
-      - C2C_SECRET
       - LOG_LEVEL
       - C2CGEOPORTAL_LOG_LEVEL
       - SQL_LOG_LEVEL
@@ -408,7 +421,6 @@ services:
       - PGPASSWORD
       - PGDATABASE
       - PGSSLMODE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
       - LOG_TYPE
 
@@ -418,7 +430,7 @@ services:
     build: *geoportal-build
 
   front:
-    image: haproxy:2.3
+    image: haproxy:2.6.7
     restart: unless-stopped
     volumes:
       - ${FRONT_LOG_DIRECTORY}:/dev/log:rw
@@ -466,9 +478,6 @@ services:
   db:
     image: camptocamp/postgres:${POSTGRES_TAG}
     environment:
-      - PGUSER
-      - PGPASSWORD
-      - PGDATABASE
       - POSTGRES_PASSWORD=${PGPASSWORD}
       - POSTGRES_DB=${PGDATABASE}
       - POSTGRES_USER=${PGUSER}

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml

@@ -0,0 +1,23 @@
+# This file is used to run QGIS client from the Docker image
+
+version: '2'
+
+services:
+  qgis:
+    extends:
+      file: docker-compose-lib.yaml
+      service: qgisserver
+    image: camptocamp/qgis-server:${QGIS_VERSION}-desktop
+    user: root
+    volumes_from:
+      - config
+    volumes:
+      - ${HOME}:${HOME}
+      - /tmp/.X11-unix:/tmp/.X11-unix
+    environment:
+      - PGSERVICEFILE=/etc/qgisserver/pg_service.conf
+      - DISPLAY=unix${DISPLAY}
+      - QGIS_DEBUG=0
+      - QGIS_LOG_FILE=/dev/null
+      - PGOPTIONS=-c statement_timeout=30000
+      - AZURE_STORAGE_CONNECTION_STRING

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml

@@ -1,4 +1,3 @@
----
 # This file can be renamed as `docker-compose.override.yaml` and uncomment the desired lines for
 # development. The file `docker-compose.override.yaml` is ignored by Git by default.
 
@@ -25,7 +24,6 @@ services:
       # - PRINT_URL=http://print:8080/print/
       - PYTHONWARNINGS=default::DeprecationWarning
       - SQLALCHEMY_WARN_20=true
-      - C2CWSGIUTILS_FORCE_PROTO=https
     ports:
       - 5678:5678 # For remote debugging using Visual Studio Code
 

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml

@@ -1,5 +1,4 @@
----
-# The project Docker compose file for development.
+# The project Docker compose file.
 
 version: '2.3'
 
@@ -23,6 +22,7 @@ services:
     extends:
       file: docker-compose-lib.yaml
       service: mapserver
+
     volumes_from:
       - config:ro
     volumes:
@@ -107,7 +107,7 @@ services:
     volumes_from:
       - config:ro
 
-  # Rich image for project development with e.-g. vim, tree, awscli, psql, ...
+  # Rich image for project development with e.-g. vim, psql, ...
   tools:
     extends:
       file: docker-compose-lib.yaml

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default

@@ -30,6 +30,11 @@ DISABLE_LOCAL=
 # For backward compatibility
 DISABLE_MUTUALIZED_PRINT=#
 DISABLE_LOCAL_PRINT=
+# Set DISABLE_HAPROXY_LOGGING to # to disable logging
+DISABLE_HAPROXY_LOGGING=
+HAPROXY_LOGGING_OPTIONS="log global
+    option httplog
+    option dontlognull"
 
 GEOPORTAL_INTERNAL_URL=http://geoportal:8080
 GEOPORTAL_INTERNAL_HOST=geoportal
@@ -71,12 +76,26 @@ TILECLOUD_LOG_LEVEL=INFO
 TILECLOUD_CHAIN_LOG_LEVEL=INFO
 C2CWSGIUTILS_LOG_LEVEL=INFO
 LOG_TYPE=console
+
+# QGIS
+QGIS_LOG_LEVEL=INFO # For the plugin
+QGIS_SERVER_LOG_LEVEL=2
 CPL_VSIL_CURL_USE_CACHE=TRUE
 CPL_VSIL_CURL_CACHE_SIZE=128000000
 CPL_VSIL_CURL_USE_HEAD=FALSE
 GDAL_DISABLE_READDIR_ON_OPEN=TRUE
 QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/
-QGIS_SERVER_IGNORE_BAD_LAYERS=true
-QGIS_SERVER_DISABLE_GETPRINT=true
+QGIS_SERVER_IGNORE_BAD_LAYERS=TRUE
+QGIS_SERVER_DISABLE_GETPRINT=TRUE
 PGSERVICEFILE=/etc/qgisserver/pg_service.conf
+QGIS_SERVER_TRUST_LAYER_METADATA=TRUE
+QGIS_SERVER_PARALLEL_RENDERING=FALSE
+MAX_CACHE_LAYERS=100
+QGIS_SERVER_CACHE_SIZE=60 # MB
+QGIS_SERVER_WMS_MAX_HEIGHT=5000
+QGIS_SERVER_WMS_MAX_WIDTH=5000
+QGIS_SERVER_API_WFS3_MAX_LIMIT=10000
+QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
+QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE=fr
+
 FRONT_LOG_DIRECTORY=/dev/log

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project

@@ -58,3 +58,12 @@ C2C_REDIS_URL=redis://redis:6379/0
 
 # Set a strong password here for authentication on technical interfaces behind path /c2c
 C2C_SECRET=
+# Or use connection via GitHub, see: https://camptocamp.github.io/c2cgeoportal/{{cookiecutter.geomapfish_main_version}}/integrator/c2cwsgiutils.html#authentication
+C2C_AUTH_GITHUB_REPOSITORY=camptocamp/{{cookiecutter.package}}
+C2C_AUTH_GITHUB_ACCESS_TYPE=admin
+C2C_AUTH_GITHUB_CLIENT_ID=210aefe26259de1e9532
+#C2C_AUTH_GITHUB_CLIENT_SECRET=<github OAuth application client secret>
+C2C_AUTH_GITHUB_SCOPE=repo
+#C2C_AUTH_GITHUB_SECRET=<secret>
+#C2C_AUTH_GITHUB_PROXY_URL=https://geoservicies.camptocamp.com/redirect
+C2C_USE_SESSION=true

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml

@@ -2,17 +2,31 @@
 extends: CONST_vars.yaml
 
 vars:
+  # To use an other SRID you should change:
+  #  - vars.srid
+  #  - vars.alternate_projections
+  #  - vars.resolutions
+  #  - vars.extent
+  #  - vars.tilesOrigin
+  #  - vars.interfaces_config.default.constants.gmfOptions.view.center
+  #  - vars.interfaces_config.default.constants.gmfOptions.wmtsTopLeft
+  #  - vars.interfaces_config.default.constants.gmfVectorTilesOptions.tileGrid.origin
   srid: &srid {{cookiecutter.srid}}
 
+  main_ogc_server: source for image/png
+
   alternate_projections: &alternate_projections
     - EPSG:4326
     - EPSG:{srid}
     - EPSG:21781
 
-  resolutions: &resolutions [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05]
+  resolutions: &resolutions [250, 100, 50, 20, 10, 5, 2.5, 1, 0.5, 0.25, 0.1, 0.05]
 
   extent: &extent [2420000, 1030000, 2900000, 1350000]
 
+  # Origin of the tiles [left, top]
+  tilesOrigin: &tilesOrigin [2420000, 1350000]
+
   # The application's default language. This is the language used by
   # the application if no specific language is specified in the URLs.
   # This also defines the language used for the text search.
@@ -30,7 +44,7 @@ vars:
       constants:
         defaultTheme: Demo
         defaultLang: '{default_locale_name}'
-        gmfOptions:
+        gmfOptions: &gmfOptions
           map: {}
           view: &view
             projection: EPSG:{srid}
@@ -39,6 +53,8 @@ vars:
             resolutions: *resolutions
             extent: *extent
           geolocalisation: True
+          # Used to get pixel perfect render on WMTS layers [left, top]
+          wmtsTopLeft: *tilesOrigin
         gmfElevationOptions:
           layers: [aster, srtm]
         gmfSearchOptions:
@@ -49,7 +65,7 @@ vars:
           projection: EPSG:{srid}
           tileGrid:
             extent: *extent
-            origin: [2420000, 1350000]
+            origin: *tilesOrigin
             resolutions: *resolutions
       routes:
         fulltextsearchUrl:
@@ -60,12 +76,12 @@ vars:
     desktop:
       constants:
         gmfOptions:
+          <<: *gmfOptions
           map:
             maxTilesLoading: 128
           view:
             <<: *view
             constrainResolution: True
-          geolocalisation: True
         gmfExternalOGCServers:
           - name: swisstopo WMS
             type: WMS
@@ -103,11 +119,10 @@ vars:
     mobile:
       constants:
         gmfOptions:
-          map: {}
+          <<: *gmfOptions
           view:
             <<: *view
             autoRotate: True
-          geolocalisation: True
         gmfMobileMeasurePointOptions:
           rasterLayers:
             - name: aster
@@ -115,6 +130,10 @@ vars:
             - name: srtm
               unit: m
 
+    iframe_api:
+      constants:
+        gmfOptions: *gmfOptions
+
     api:
       constants:
         # The resolutions list.
@@ -162,11 +181,8 @@ vars:
     geometry_validation: True
 
   api:
-    {}
-    # The OGC server used by the API.
-    # ogc_server: Main PNG
     # The name of the API in JavaScript
-    # name: <package>
+    name: '{{cookiecutter.package}}'
 
   # The "vector tiles web service" configuration. See the "vector tiles"
   # chapter in the integrator documentation.
@@ -283,17 +299,22 @@ vars:
     std:
       # Standalone version
       backend: c2cgeoportal.hybrid
-      arguments:
+      arguments: &redis-cache-arguments
         host: '{REDIS_HOST}'
         port: '{REDIS_PORT}'
         db: '{REDIS_DB}'
       # Kubernetes version
-      # arguments:
+      # arguments: &redis-cache-arguments
       #   sentinels:
       #     - - '{REDIS_HOST}'
       #       - '{REDIS_PORT}'
       #   connection_kwargs:
       #     db: '{REDIS_DB}'
+    ogc-server:
+      # Standalone version
+      backend: c2cgeoportal.hybrid
+      # All versions
+      arguments: *redis-cache-arguments
 
   # This parameter set the list of hosts allowed to use the iframe api.
   # 'self' will block all external usage, you must add additional hosts separated by space.
@@ -328,6 +349,7 @@ update_paths:
   - api
   - authorized_referers
   - cache.std.arguments
+  - cache.ogc-server.arguments
   - cache.obj
   - check_collector.disabled
   - check_collector.hosts
@@ -368,10 +390,12 @@ update_paths:
   - interfaces_config.default.dynamic_constants
   - interfaces_config.default.static
   - interfaces_config.default.routes.fulltextsearchUrl
-  - interfaces_config.desktop.constants
+  - interfaces_config.desktop.constants.gmfOptions.view
+  - interfaces_config.desktop.constants.gmfPrintOptions
   - interfaces_config.desktop.routes
+  - interfaces_config.mobile.constants.gmfOptions.view
   - interfaces_config.mobile.constants.gmfMobileMeasurePointOptions
-  - interfaces_config.iframe_api.constants
+  - interfaces_config.iframe_api.constants.gmfOptions.view
   - interfaces_config.api.constants
   - interfaces_config.api.routes.searchUrl
   - interfaces_theme

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/data/Readme.txt

@@ -20,7 +20,7 @@ ISO3		String(3)		ISO 3166-1 Alpha-3 Country Code
 UN		Short Integer(3)	ISO 3166-1 Numeric-3 Country Code
 NAME		String(50)		Name of country/area
 AREA		Long Integer(7)		Land area, FAO Statistics (2002)
-POP2005		Double(10,0)	 	Population, World Polulation Prospects (2005)
+POP2005		Double(10,0)	 	Population, World Population Prospects (2005)
 REGION		Short Integer(3) 	Macro geographical (continental region), UN Statistics
 SUBREGION	Short Integer(3)	Geogrpahical sub-region, UN Statistics
 LON		FLOAT (7,3)		Longitude
@@ -36,7 +36,7 @@ CHANGELOG VERSION 0.3 - 30 July 2008
 
 CHANGELOG VERSION 0.2 - 1 April 2008
 
-- Made new ZIP archieves. No change in dataset.
+- Made new ZIP archives. No change in dataset.
 
 
 CHANGELOG VERSION 0.1 - 13 March 2008

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.conf

@@ -0,0 +1,15 @@
+# Documentation: https://mapserver.org/mapfile/config.html
+
+CONFIG
+
+    ENV
+        MS_MAPFILE "/etc/mapserver/mapserver.map"
+    END
+
+    #
+    # Map aliases
+    #
+    MAPS
+    END
+
+END

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl

@@ -35,7 +35,7 @@ MAP
     STATUS ON
 
     FONTSET "fonts.conf"
-    #SYMBOLSET "symbole.sym"
+    #SYMBOLSET "symbol.sym"
 
     CONFIG "CPL_VSIL_CURL_USE_CACHE" "TRUE"
     CONFIG "CPL_VSIL_CURL_CACHE_SIZE" "128000000"
@@ -70,10 +70,9 @@ MAP
             "wms_abstract" "changeme"
             "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=source%20for%20image%2Fpng"
             "wms_srs" "EPSG:{{cookiecutter.srid}}"
-            "wms_encoding" "UTF-8"
             "wms_enable_request" "*"
             "wfs_enable_request" "!*"
-            "wfs_encoding" "UTF-8"
+            "wms_allow_getmap_without_styles" "true"
         END
     END
     LEGEND

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Landscape.jrxml

@@ -2,6 +2,7 @@
 <!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="gmf16_A3_landscape" pageWidth="1191" pageHeight="842" orientation="Landscape" columnWidth="1151" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2646b6ef-0cc4-4852-b6e9-8c4dc54c2e84">
 	<parameter name="title" class="java.lang.String"/>
+	<parameter name="username" class="java.lang.String"/>
 	<parameter name="comments" class="java.lang.String"/>
 	<parameter name="debug" class="java.lang.Boolean"/>
 	<parameter name="mapSubReport" class="java.lang.String"/>
@@ -197,6 +198,10 @@ $P{mapContext}.getScale().getDenominator()).replace(",","\'")]]></textFieldExpre
 				<textElement verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="15" width="300" height="15" uuid="f2fb034e-297f-4107-a5f5-da84722deb70"/>
+				<textFieldExpression><![CDATA[$P{username}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 </jasperReport>

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Portrait.jrxml

@@ -2,6 +2,7 @@
 <!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="gmf16_A3_portrait" pageWidth="842" pageHeight="1191" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="041e6c80-82d5-4055-a560-dd402f39361f">
 	<parameter name="title" class="java.lang.String"/>
+	<parameter name="username" class="java.lang.String"/>
 	<parameter name="comments" class="java.lang.String"/>
 	<parameter name="debug" class="java.lang.Boolean"/>
 	<parameter name="mapSubReport" class="java.lang.String"/>
@@ -175,6 +176,10 @@
 				<textElement verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="15" width="300" height="15" uuid="f2fb034e-297f-4107-a5f5-da84722deb70"/>
+				<textFieldExpression><![CDATA[$P{username}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 </jasperReport>

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Landscape.jrxml

@@ -4,6 +4,7 @@
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="title" class="java.lang.String"/>
+	<parameter name="username" class="java.lang.String"/>
 	<parameter name="comments" class="java.lang.String"/>
 	<parameter name="debug" class="java.lang.Boolean"/>
 	<parameter name="mapSubReport" class="java.lang.String"/>
@@ -190,6 +191,10 @@
 				<reportElement x="0" y="1" width="300" height="14" uuid="dc102ea9-973f-4717-a872-0d24d4de1e17"/>
 				<textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="15" width="300" height="15" uuid="f2fb034e-297f-4107-a5f5-da84722deb70"/>
+				<textFieldExpression><![CDATA[$P{username}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 </jasperReport>

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Portrait.jrxml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="gmf16_A4_portrait" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
 	<parameter name="title" class="java.lang.String"/>
+	<parameter name="username" class="java.lang.String"/>
 	<parameter name="comments" class="java.lang.String"/>
 	<parameter name="debug" class="java.lang.Boolean"/>
 	<parameter name="mapSubReport" class="java.lang.String"/>
@@ -160,6 +161,10 @@
 				<textElement verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="15" width="300" height="15"/>
+				<textFieldExpression><![CDATA[$P{username}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageFooter>
 </jasperReport>

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/config.yaml.tmpl

@@ -18,6 +18,9 @@ templates:
       title:
         !string &title
         default: ""
+      username:
+        !string &username
+        default: ""
       comments:
         !string &comments
         default: ""
@@ -121,6 +124,7 @@ templates:
     reportTemplate: A4_Landscape.jrxml
     attributes:
       title: *title
+      username: *username
       comments: *comments
       debug: *debug
       legend: *legend
@@ -138,6 +142,7 @@ templates:
     reportTemplate: A3_Portrait.jrxml
     attributes:
       title: *title
+      username: *username
       comments: *comments
       debug: *debug
       legend: *legend
@@ -155,6 +160,7 @@ templates:
     reportTemplate: A3_Landscape.jrxml
     attributes:
       title: *title
+      username: *username
       comments: *comments
       debug: *debug
       legend: *legend

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml

@@ -1,3 +1,7 @@
 [tool.black]
 line-length = 110
 target-version = ['py38']
+
+[tool.isort]
+profile = "black"
+line_length = 110

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh

@@ -3,11 +3,9 @@
 #
 # Mostly useful in a Docker environment.
 
-for ini in *alembic*.ini
-do
-    if [[ -f $ini ]]
-    then
+for ini in *alembic*.ini; do
+    if [[ -f "$ini" ]]; then
         echo "$ini ==========================="
-        alembic -c $ini upgrade head
+        alembic -c "$ini" upgrade head
     fi
 done