Merge pull request #851 from opengisch/tidbidfollowupfixes

Wizard workflow fix

QgisModelBaker/gui/workflow_wizard/import_data_configuration_page.py

@@ -28,6 +28,7 @@
     QCompleter,
     QHeaderView,
     QStyledItemDelegate,
+    QTextEdit,
     QWizardPage,
 )
 
@@ -77,11 +78,21 @@ def updateEditorGeometry(self, editor, option, index):
         editor.setGeometry(option.rect)
 
     def paint(self, painter, option, index):
-        opt = self.createEditor(self.parent, option, index)
-        opt.editable = False
-        value = index.data(int(gui_utils.SourceModel.Roles.DATASET_NAME))
-        num = self.items.index(value) if value in self.items else 0
-        opt.setCurrentIndex(num)
+        if (
+            index.model()
+            .index(index.row(), gui_utils.SourceModel.Columns.IS_CATALOGUE)
+            .data(int(gui_utils.SourceModel.Roles.IS_CATALOGUE))
+        ):
+            opt = QTextEdit()
+            opt.editable = False
+            opt.setText("---")
+            opt.setEnabled(False)
+        else:
+            opt = self.createEditor(self.parent, option, index)
+            opt.editable = False
+            value = index.data(int(gui_utils.SourceModel.Roles.DATASET_NAME))
+            num = self.items.index(value) if value in self.items else 0
+            opt.setCurrentIndex(num)
         opt.resize(option.rect.width(), option.rect.height())
         pixmap = QPixmap(opt.width(), opt.height())
         opt.render(pixmap)

QgisModelBaker/gui/workflow_wizard/workflow_wizard.py

@@ -293,14 +293,14 @@ def next_id(self):
                     self.schema_configuration_page.setComplete(True)
 
             if self.current_id == PageIds.ImportSchemaExecution:
-                # if transfer files available, then go to data import
-                if self.import_data_file_model.rowCount():
-                    return PageIds.ImportDataConfiguration
-
                 # if basket handling active, go to the create basket
                 if self._basket_handling(self.import_schema_configuration):
                     return PageIds.DefaultBaskets
 
+                # if transfer files available, then go to data import
+                if self.import_data_file_model.rowCount():
+                    return PageIds.ImportDataConfiguration
+
                 # if transfer file are possible (by getting via UsabILIty Hub), go to the data import
                 self.log_panel.print_info(
                     self.tr(
@@ -323,6 +323,10 @@ def next_id(self):
                 return PageIds.ProjectCreation
 
             if self.current_id == PageIds.DefaultBaskets:
+                # if transfer files available, then go to data import
+                if self.import_data_file_model.rowCount():
+                    return PageIds.ImportDataConfiguration
+
                 # if transfer file are possible (by getting via UsabILIty Hub), go to the data import
                 self.log_panel.print_info(
                     self.tr(