Fixed some bugs when creating a new series

Chooinsg an existing and new method/variable/pcl will active its respective panels, also added some methods to finish creating a new series such as the getMethods, getVariales, etc

Author: Francisco Arrieta

odmtools/controller/WizardMethodController.py

@@ -1,6 +1,7 @@
 import wx
 from wx.wizard import WizardPageSimple
 from odmtools.view.WizardMethodView import WizardMethodView
+from odmtools.odmdata import Method
 
 
 class WizardMethodController(WizardPageSimple):
@@ -16,8 +17,37 @@ def __init__(self, parent, series_service):
         table_columns = ["Descriptions", "Link", "ID"]
         self.method_view.existing_method_table.set_columns(table_columns)
         self.method_view.method_type_combo.AppendItems(["ABC"])
+        self.on_auto_radio(None)
+
+        self.method_view.auto_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_auto_radio)
+        self.method_view.existing_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_existing_method_radio)
+        self.method_view.create_method_radio.Bind(wx.EVT_RADIOBUTTON, self.on_create_method_radio)
+
         self.__fetch_data()
 
+    def on_auto_radio(self, event):
+        self.method_view.existing_method_table.Enable(False)
+        self.__set_create_method_section_(False)
+
+    def on_existing_method_radio(self, event):
+        self.method_view.existing_method_table.Enable()
+        self.__set_create_method_section_(False)
+
+    def __set_create_method_section_(self, active):
+        if not isinstance(active, bool):
+            raise Exception("active must be type bool")
+
+        self.method_view.method_code_text_ctrl.Enable(active)
+        self.method_view.method_name_text_ctrl.Enable(active)
+        self.method_view.method_type_combo.Enable(active)
+        self.method_view.organization_combo.Enable(active)
+        self.method_view.method_link_text_ctrl.Enable(active)
+        self.method_view.description_text_ctrl.Enable(active)
+
+    def on_create_method_radio(self, event):
+        self.method_view.existing_method_table.Disable()
+        self.__set_create_method_section_(True)
+
     def __fetch_data(self):
         methods = self.series_service.get_all_methods()
         data = []
@@ -29,3 +59,22 @@ def __fetch_data(self):
             ])
 
         self.method_view.existing_method_table.set_table_content(data=data)
+
+    def getMethod(self):
+        m = Method()
+        if self.method_view.auto_method_radio.GetValue():
+            description = "Values derived from ODM Tools Python"
+            m = self.series_service.get_method_by_description(description)
+            if m is None:
+                m = Method()
+                m.description = description
+        elif self.method_view.existing_method_radio.GetValue():
+            index = self.method_view.existing_method_table.GetFirstSelected()
+            desc = self.method_view.existing_method_table.GetItem(index, 0).GetText()
+
+            m = self.series_service.get_method_by_description(desc)
+        elif self.method_view.create_method_radio.GetValue():
+            m.description = self.method_view.description_text_ctrl.GetValue()
+
+
+        return m

odmtools/controller/WizardProcessLevelController.py

@@ -1,6 +1,7 @@
 import wx
 from odmtools.view.WizardProcessLevelView import WizardProcessLevelView
 from wx.wizard import WizardPageSimple
+from odmtools.odmdata import QualityControlLevel
 
 
 class WizardProcessLevelController(WizardPageSimple):
@@ -17,6 +18,25 @@ def __init__(self, parent, service_manager):
         self.processing_level_view.existing_process_table.set_columns(table_columns)
         self.__fetch_data()
 
+        self.processing_level_view.create_process_level_radio.Bind(wx.EVT_RADIOBUTTON, self.on_create_radio)
+        self.processing_level_view.existing_process_radio.Bind(wx.EVT_RADIOBUTTON, self.on_existing_radio)
+
+    def on_create_radio(self, event):
+        self.processing_level_view.existing_process_table.Enable(False)
+        self.__set_create_proces_section(True)
+
+    def on_existing_radio(self, event):
+        self.processing_level_view.existing_process_table.Enable(True)
+        self.__set_create_proces_section(False)
+
+    def __set_create_proces_section(self, active):
+        if not isinstance(active, bool):
+            raise Exception("activet must be type bool")
+
+        self.processing_level_view.level_code_text_ctrl.Enable(active)
+        self.processing_level_view.definition_text_ctrl.Enable(active)
+        self.processing_level_view.explanation_text_ctrl.Enable(active)
+
     def __fetch_data(self):
         series_service = self.service_manager.get_series_service()
         processes = series_service.get_all_qcls()
@@ -31,3 +51,17 @@ def __fetch_data(self):
             ])
 
         self.processing_level_view.existing_process_table.set_table_content(data=data)
+
+    def getQCL(self):
+        q = QualityControlLevel()
+        if self.processing_level_view.create_process_level_radio.GetValue():
+            q.code = self.processing_level_view.level_code_text_ctrl.GetValue()
+            q.definition = self.processing_level_view.definition_text_ctrl.GetValue()
+            q.explanation = self.processing_level_view.explanation_text_ctrl.GetValue()
+
+        elif self.processing_level_view.existing_process_radio.GetValue():
+            selected_row = self.processing_level_view.existing_process_table.get_selected_row()
+            code = selected_row[0]
+            q = self.service_manager.get_series_service().get_qcl_by_code(qcl_code=code)
+
+        return q

odmtools/controller/WizardVariableController.py

@@ -1,13 +1,15 @@
 import wx
 from odmtools.view.WizardVariableView import WizardVariableView
 from wx.wizard import WizardPageSimple
+from odmtools.odmdata import Variable
 
 
 class WizardVariableController(WizardPageSimple):
-    def __init__(self, parent, service_manager):
+    def __init__(self, parent, service_manager, current_variable):
         WizardPageSimple.__init__(self, parent)
 
         self.service_manager = service_manager
+        self.current_variable = current_variable
         main_sizer = wx.BoxSizer(wx.VERTICAL)
         self.variable_view = WizardVariableView(self)
         main_sizer.Add(self.variable_view, 1, wx.EXPAND | wx.RIGHT, -16)
@@ -17,8 +19,35 @@ def __init__(self, parent, service_manager):
                          "Sample Medium", "Value Type", "IsRegular", "Time Support",
                          "Time Units", "DataType", "Genaral Category", "NoDataValue", "ID"]
         self.variable_view.variable_table.set_columns(table_columns)
+        self.on_current_radio(None)
 
         self.__fetch_data()
+        self.variable_view.current_variable_radio.Bind(wx.EVT_RADIOBUTTON, self.on_current_radio)
+        self.variable_view.existing_variable_radio.Bind(wx.EVT_RADIOBUTTON, self.on_existing_radio)
+        self.variable_view.create_variable_radio.Bind(wx.EVT_RADIOBUTTON, self.on_create_radio)
+
+    def on_current_radio(self, event):
+        self.variable_view.variable_table.Enable(False)
+        self.__set_create_variable_section(False)
+
+    def on_create_radio(self, event):
+        self.variable_view.variable_table.Enable(False)
+        self.__set_create_variable_section(True)
+
+    def on_existing_radio(self, event):
+        self.variable_view.variable_table.Enable(True)
+        self.__set_create_variable_section(False)
+
+    def __set_create_variable_section(self, active):
+        if not isinstance(active, bool):
+            raise Exception("active must be type bool")
+
+        self.variable_view.variable_code_text_ctrl.Enable(active)
+        self.variable_view.variable_name_combo.Enable(active)
+        self.variable_view.variable_type_combo.Enable(active)
+        self.variable_view.no_data_value_text_ctrl.Enable(active)
+        self.variable_view.speciation_combo.Enable(active)
+        self.variable_view.definition_text_ctrl.Enable(active)
 
     def __fetch_data(self):
         self.__populate_variable_table()
@@ -53,6 +82,21 @@ def __populate_variable_table(self):
 
         self.variable_view.variable_table.set_table_content(data=data)
 
+    def get_variable(self):
+        v = Variable()
+        if self.variable_view.current_variable_radio.GetValue():
+            v = self.current_variable
+        elif self.variable_view.existing_variable_radio.GetValue():
+            row = self.variable_view.variable_table.get_selected_row()
+            code = row[0]
+            v = self.service_manager.get_series_service().get_variable_by_code(code)
+
+        elif self.variable_view.create_variable_radio.GetValue():
+            # v = self.createdVar
+            pass
+
+        return v
+
 
 
 

odmtools/gui/wizSave.py

@@ -238,9 +238,9 @@ def get_metadata(self):
 
         if self.pgIntro.pnlIntroduction.rbSaveAs.GetValue():
             logger.debug("SaveAs")
-            method = self.pgMethod.panel.getMethod()
-            qcl = self.pgQCL.panel.getQCL()
-            variable = self.pgVariable.panel.getVariable()
+            method = self.pgMethod.getMethod()
+            qcl = self.pgQCL.getQCL()
+            variable = self.pgVariable.get_variable()
         elif self.pgIntro.pnlIntroduction.rbSave.GetValue():
             logger.debug("Save")
             method = self.currSeries.method
@@ -272,7 +272,8 @@ def __init__(self, parent, service_manager, record_service):
         # self.pgQCL = QCLPage(self, "Quality Control Level", self.series_service, self.currSeries.quality_control_level)
         self.pgQCL = WizardProcessLevelController(self, service_manager=service_manager)
         # self.pgVariable = VariablePage(self, "Variable", service_manager, self.currSeries.variable)
-        self.pgVariable = WizardVariableController(self, service_manager=service_manager)
+        self.pgVariable = WizardVariableController(self, service_manager=service_manager,
+                                                   current_variable=self.currSeries.variable)
         self.pgExisting = pageExisting.pageExisting(self, "Existing Series", self.series_service, self.currSeries.site)
         self.pgSummary = SummaryPage(self, "Summary", self.series_service)
 
@@ -302,7 +303,6 @@ def __init__(self, parent, service_manager, record_service):
         self.Destroy()
 
     def on_page_changed(self, event):
-        #if  isinstance(event.Page, pageSummary.pnlSummary):
         if event.Page == self.pgSummary:
             self.pgSummary.fill_summary()
 

odmtools/view/CustomListCtrl.py

@@ -172,5 +172,6 @@ def set_table_content(self, data):
             for j in range(len(data[i])):
                 self.SetStringItem(index, j, str(data[i][j]))
 
+        self.Select(0)
         self.auto_size_table()
         self.alternate_row_color()

odmtools/view/WizardMethodView.py

@@ -38,6 +38,7 @@ def __init__(self, parent):
         self.method_type_combo.SetSelection(0)
         self.organization_combo.SetSelection(0)
         self.SetupScrolling()
+        self.auto_method_radio.SetValue(True)
 
         # Add components to sizer
         table_sizer = wx.BoxSizer()
@@ -80,7 +81,7 @@ def __init__(self, parent):
         main_sizer.Add(self.auto_method_radio, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(self.existing_method_radio, 0, wx.EXPAND | wx.TOP, 5)
         main_sizer.Add(table_panel, 0, wx.EXPAND | wx.TOP, 5)
-        main_sizer.Add(self.create_method_radio, 0, wx.EXPAND | wx.TOP, 5)
+        main_sizer.Add(self.create_method_radio, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(required_static_box_sizer, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(optional_static_box_sizer, 0, wx.EXPAND | wx.TOP, 10)
         self.SetSizer(main_sizer)

odmtools/view/WizardVariableView.py

@@ -14,7 +14,7 @@ def __init__(self, parent):
         self.current_variable_radio = wx.RadioButton(self, label="Use current variable")
         self.variable_table = CustomListCtrl(table_panel)
         self.existing_variable_radio = wx.RadioButton(self, label="Select an existing variable")
-
+        self.create_variable_radio = wx.RadioButton(self, label="Create new variable")
         required_static_box_sizer = wx.StaticBoxSizer(box=wx.StaticBox(self, label="Required Fields"), orient=wx.VERTICAL)
         variable_code_text = wx.StaticText(self, label="Variable Code")
         self.variable_code_text_ctrl = wx.TextCtrl(self)
@@ -38,6 +38,7 @@ def __init__(self, parent):
         self.speciation_combo.SetSelection(0)
         self.variable_type_combo.SetSelection(0)
         self.SetupScrolling()
+        self.current_variable_radio.SetValue(True)
 
         # Add components to sizer
         table_sizer = wx.BoxSizer()
@@ -80,6 +81,7 @@ def __init__(self, parent):
         main_sizer.Add(self.current_variable_radio, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(self.existing_variable_radio, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(table_panel, 0, wx.EXPAND | wx.TOP, 10)
+        main_sizer.Add(self.create_variable_radio, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(required_static_box_sizer, 0, wx.EXPAND | wx.TOP, 10)
         main_sizer.Add(optional_static_box_sizer, 0, wx.EXPAND | wx.TOP, 10)
         self.SetSizer(main_sizer)