Merge pull request #878 from Giswater/dev-3.5

Dev 3.5
Giswater · Sep 22, 2022 · ef36887 · ef36887
2 parents 890ff7e + 8ff81ca
commit ef36887
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/config/user_params.config b/config/user_params.config
@@ -743,6 +743,7 @@ _gw_fct_graphanalytics_minsector_usepsectors = None
 _gw_fct_graphanalytics_minsector_updatefeature = None
 _gw_fct_graphanalytics_minsector_geomparamupdate = None
 _gw_fct_graphanalytics_minsector_updatemapzone = None
+_gw_fct_graphanalytics_mapzones_advanced_commitchanges = None
 
 [session.docker]
 _position = None

diff --git a/core/admin/admin_btn.py b/core/admin/admin_btn.py
@@ -56,6 +56,7 @@ def __init__(self):
         self.plugin_version, self.message = tools_qgis.get_plugin_version()
         self.canvas = global_vars.canvas
         self.project_type = None
+        self.project_epsg = None
         self.dlg_readsql = None
         self.dlg_info = None
         self.dlg_readsql_create_project = None
@@ -1791,7 +1792,11 @@ def _execute_files(self, filedir, i18n=False, no_ct=False, utils_schema_name=Non
             schema_name = schema_name.replace('"', '')
         else:
             schema_name = self.schema.replace('"', '')
-        self.project_epsg = str(self.project_epsg).replace('"', '')
+        if self.project_epsg:
+            self.project_epsg = str(self.project_epsg).replace('"', '')
+        else:
+            msg = "There is no project selected or it is not valid. Please check the first tab..."
+            tools_qgis.show_warning(msg)
 
         # Manage folders 'i18n'
         manage_i18n = i18n

diff --git a/dbmodel b/dbmodel
diff --git a/metadata.txt b/metadata.txt
@@ -4,16 +4,11 @@ qgisMinimumVersion=3.10
 qgisMaximumVersion=3.99
 description=Plugin to manage water networks (water supply, sewerage and urban drainage) using QGIS and PostGIS-PostgreSQL(from 9.5 to 14.x)
 about=Disclaimer: This plugin is released using the open source GNU-GPL3 license. Although a reasonable effort has been made to assure that the results obtained are correct,  some of the capabilities provided by Giswater are experimental, therefore the development team and the Giswater Association are not responsible and assume no liability whatsoever for any results or any use made of the results obtained from the program, nor for any damages or litigation that result from the use of these programs for any purpose.
-version=3.5.028
+version=3.5.029
 author=David Erill, Luigi Pirelli, Natasa Cica, Nestor Ibañez, Adrian Valenciano, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Elies Bertran, Abel García Juanes, Xavier Torret
 
-Changelog=Version 3.5.028
-    - Highlight connecs/gullys that will be disconnected on feature end process
-    - Improve performance for inserting features in large tables
-    - Allow adding filters as additional columns in toolbox reports
-    - Improve dscenario filter
-    - Bug fix: insert document from another dialog (info/visit)
-    - Bug fix: don't allow role_basic/role_om users to edit in info
+Changelog=Version 3.5.029
+    - Minor bug fixes
 
 tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM
 homepage=https://www.giswater.org
+4 −4		corporate/utils/updates/33/33014/ud/dml.sql
+4 −4		corporate/utils/updates/33/33014/ws/dml.sql
+2 −2		corporate/utils/updates/33/33017/ud/dml.sql
+2 −2		corporate/utils/updates/33/33017/ws/dml.sql
+3 −3		ud/fct/ud_gw_fct_pg2epa_main.sql
+0 −5		updates/35/35027/utils/trg.sql
+0 −3		updates/35/35027/ws/tablect.sql
+1 −1		updates/35/35028/ud/ddl.sql
+1 −1		updates/35/35028/ws/ddl.sql
+1 −1		updates/35/35028/ws/ddlview.sql
+0 −1		updates/35/35028/ws/dml.sql
+5 −0		updates/35/35029/changelog.txt
+31 −0		updates/35/35029/ud/ddlview.sql
+18 −0		updates/35/35029/utils/ddl.sql
+64 −0		updates/35/35029/utils/dml.sql
+19 −0		updates/35/35029/ws/ddl.sql
+121 −0		updates/35/35029/ws/ddlview.sql
+30 −0		updates/35/35029/ws/dml.sql
+47 −0		utils/fct/gw_fct_admin_check_data.sql
+22 −2		utils/fct/gw_fct_admin_schema_utils_fk.sql
+144 −0		utils/fct/gw_fct_anl_node_tcandidate.sql
+17 −0		utils/fct/gw_fct_getmessage.sql
+4 −0		utils/fct/gw_fct_import_scada_x_data.sql
+5 −0		utils/fct/gw_fct_setarcreverse.sql
+34 −27		ws/fct/ws_gw_fct_waterbalance.sql
+3 −3		ws/ftrg/ws_gw_trg_edit_dma.sql