Merge branch 'dev-3.6' into master-3.6

Author: edgarfuste

core/toolbars/utilities/style_manager.py

@@ -123,6 +123,7 @@ def _add_style_group(self, dialog):
         self._load_sys_roles(dialog_create)
 
         dialog_create.btn_add.clicked.connect(partial(self._handle_add_feature, dialog_create))
+        dialog_create.btn_cancel.clicked.connect(partial(tools_gw.close_dialog, dialog_create))
         dialog_create.feature_id.textChanged.connect(partial(self._check_style_exists, dialog_create))
         dialog_create.idval.textChanged.connect(partial(self._check_style_exists, dialog_create))
 

core/toolbars/utilities/toolbox_btn.py

@@ -13,7 +13,7 @@
 from time import time
 from datetime import timedelta
 
-from qgis.PyQt.QtCore import Qt, QTimer
+from qgis.PyQt.QtCore import Qt, QTimer, QDate
 from qgis.PyQt.QtGui import QColor, QIcon, QStandardItemModel, QStandardItem
 from qgis.PyQt.QtWidgets import QSpinBox, QWidget, QLineEdit, QComboBox, QCheckBox, QRadioButton, QAbstractItemView, \
     QTreeWidget, QCompleter, QGridLayout, QHBoxLayout, QLabel, QTableWidgetItem, QFileDialog
@@ -39,6 +39,7 @@ def __init__(self, icon_path, action_name, text, toolbar, action_group):
         self.function_list = []
         self.rbt_checked = {}
         self.no_clickable_items = ['Processes', 'Reports']
+        self.ignore_widgets = ['qt_spinbox_lineedit', 'qt_calendar_yearedit']
         self.temp_layers_added = []
         self.add_columns = {}
         self.queryAdd = None
@@ -137,6 +138,8 @@ def save_parametric_values(self, dialog, function_name):
         layout = dialog.findChild(QWidget, 'grb_parameters')
         widgets = layout.findChildren(QWidget)
         for widget in widgets:
+            if widget.objectName() in self.ignore_widgets:
+                continue
             if type(widget) is QCheckBox:
                 tools_gw.set_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}",
                                            f"{widget.isChecked()}")
@@ -146,6 +149,9 @@ def save_parametric_values(self, dialog, function_name):
             elif type(widget) in (QLineEdit, QSpinBox):
                 value = tools_qt.get_text(dialog, widget, False, False)
                 tools_gw.set_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", f"{value}")
+            elif type(widget) is QgsDateTimeEdit:
+                 value = tools_qt.get_calendar_date(dialog, widget, date_format=lib_vars.date_format)
+                 tools_gw.set_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", f"{value}")
 
 
     def save_settings_values(self, dialog, function_name):
@@ -517,23 +523,26 @@ def _load_parametric_values(self, dialog, function):
         widgets = layout.findChildren(QWidget)
 
         for widget in widgets:
-            if type(widget) not in (QCheckBox, QComboBox, QLineEdit, QRadioButton):
-                continue
-            if type(widget) in (QCheckBox, QRadioButton):
+            if type(widget) in (QCheckBox, QRadioButton) and widget.property('value') is None:
                 value = tools_gw.get_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", "user",
                                                    "session")
                 if value not in (None, 'None'):
                     tools_qt.set_checked(dialog, widget, value)
-            elif type(widget) is QComboBox and widget.property('selectedId') in (None,'','NULL'):
+            elif type(widget) is QComboBox and widget.property('selectedId') is None:
                 value = tools_gw.get_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", "user",
                                                    "session")
                 if value in (None, '', 'NULL') and widget.property('selectedId') not in (None, '', 'NULL'):
                     value = widget.property('selectedId')
                 tools_qt.set_combo_value(widget, value, 0)
-            elif type(widget) in (QLineEdit, QSpinBox) and widget.property('value') in (None, ''):
+            elif type(widget) in (QLineEdit, QSpinBox) and widget.property('value') is None:
                 value = tools_gw.get_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", "user",
                                                    "session")
                 tools_qt.set_widget_text(dialog, widget, value)
+            elif type(widget) is QgsDateTimeEdit and widget.property('value') is None:
+                 value = tools_gw.get_config_parser('btn_toolbox', f"{function_name}_{widget.objectName()}", "user",
+                                                    "session")
+                 date = QDate.fromString(value, lib_vars.date_format)
+                 tools_qt.set_calendar(dialog, widget, date)
 
 
     def _load_settings_values(self, dialog, function):

core/utils/tools_gw.py

@@ -1400,7 +1400,7 @@ def build_dialog_options(dialog, row, pos, _json, temp_layers_added=None, module
                         widget.setProperty('ismandatory', field['isMandatory'])
                     else:
                         widget.setProperty('ismandatory', False)
-                    if 'value' in field:
+                    if field.get('value') is not None:
                         widget.setText(field['value'])
                         widget.setProperty('value', field['value'])
                     widgetcontrols = field.get('widgetcontrols')
@@ -1423,10 +1423,9 @@ def build_dialog_options(dialog, row, pos, _json, temp_layers_added=None, module
                     widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
                 elif field['widgettype'] == 'check':
                     widget = QCheckBox()
-                    if field['value'] is not None and field['value'].lower() == "true":
-                        widget.setChecked(True)
-                    else:
-                        widget.setChecked(False)
+                    if field.get('value') is not None:
+                        widget.setChecked(tools_os.set_boolean(field['value']))
+                        widget.setProperty('value', field['value'])
                     widget.stateChanged.connect(partial(get_dialog_changed_values, dialog, None, widget, field, _json))
                     widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
                 elif field['widgettype'] == 'datetime':
@@ -1437,8 +1436,9 @@ def build_dialog_options(dialog, row, pos, _json, temp_layers_added=None, module
                     if lib_vars.date_format in ("dd/MM/yyyy", "dd-MM-yyyy", "yyyy/MM/dd", "yyyy-MM-dd"):
                         widget.setDisplayFormat(lib_vars.date_format)
                     widget.clear()  # Set date to NULL initially
-                    if field.get('value') not in ('', None, 'null'):
+                    if field.get('value') is not None:
                         date = QDate.fromString(field['value'].replace('/', '-'), 'yyyy-MM-dd')
+                        widget.setProperty('value', field['value'].replace('/', '-'))
                         widget.setDate(date)
                     widget.valueChanged.connect(partial(get_dialog_changed_values, dialog, None, widget, field, _json))
                     widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
@@ -1452,9 +1452,10 @@ def build_dialog_options(dialog, row, pos, _json, temp_layers_added=None, module
                         maximumNumber = widgetcontrols.get('maximumNumber')
                         if maximumNumber is not None:
                             widget.setMaximum(maximumNumber)
-                    if field.get('value') not in (None, ""):
+                    if field.get('value') is not None:
                         value = float(str(field['value']))
                         widget.setValue(value)
+                        widget.setProperty('value', field['value'])
                     widget.valueChanged.connect(partial(get_dialog_changed_values, dialog, None, widget, field, _json))
                     widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
                 elif field['widgettype'] == 'button':

metadata.txt

@@ -8,6 +8,10 @@ version=3.6.019
 author=David Erill, Natasa Cica, Nestor Ibañez, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Lia Bertran, Abel García Juanes, Maria Guzmán, Jordi Blanch, Xavier Torret, Daniel Marín, Ferran Martínez, Nico Pérez, Pablo Marques, Arnau Torret, Namrata Karki, Arnau Urgeles, Oscar Pueyo
 
 Changelog=Version 3.6.019
+version=3.6.020
+author=David Erill, Natasa Cica, Nestor Ibañez, Barbara Rzepka, Sergi Muñoz, Josep Lluís Sala, Edgar Fusté, Albert Bofill, Sergi Maspons, Lia Bertran, Abel García Juanes, Maria Guzmán, Jordi Blanch, Xavier Torret, Daniel Marín, Ferran Martínez, Nico Pérez, Pablo Marques, Arnau Torret, Namrata Karki, Arnau Urgeles, Oscar Pueyo
+
+Changelog=Version 3.6.020
 
 
 tags= giswater, water networks, sewerage, urban drainage, EPANET, SWMM