Added the action form to the wizard and created a get all affiliations

Author: Francisco Arrieta

odmtools/controller/WizardActionController.py

@@ -0,0 +1,25 @@
+import wx
+from odmtools.view.WizardActionView import WizardActionView
+from wx.wizard import WizardPageSimple
+
+
+class WizardActionController(WizardPageSimple):
+    def __init__(self, parent, affiliations):
+        WizardPageSimple.__init__(self, parent)
+        self.action_view = WizardActionView(self)
+        self.affiliations = affiliations
+
+        master_sizer = wx.BoxSizer(wx.VERTICAL)
+        master_sizer.Add(self.action_view, 1, wx.EXPAND | wx.RIGHT, 0)
+        self.SetSizer(master_sizer)
+
+        if self.affiliations is None:
+            return
+        # Populate table with the affiliations
+
+
+if __name__ == '__main__':
+    app = wx.App(False)
+    controller = WizardActionController(None, None)
+    controller.Show()
+    app.MainLoop()

odmtools/gui/wizSave.py

@@ -207,6 +207,7 @@ def fill_summary(self):
 from odmtools.controller.WizardMethodController import WizardMethodController
 from odmtools.controller.WizardProcessLevelController import WizardProcessLevelController
 from odmtools.controller.WizardVariableController import WizardVariableController
+from odmtools.controller.WizardActionController import WizardActionController
 
 
 class wizSave(wx.wizard.Wizard):
@@ -269,6 +270,11 @@ def __init__(self, parent, service_manager, record_service):
                                                    current_variable=self.currSeries.VariableObj)
         self.pgExisting = pageExisting.pageExisting(self, "Existing Series", self.series_service,
                                                     self.currSeries.FeatureActionObj.SamplingFeatureObj)
+
+        affiliations = self.series_service.get_all_affiliations()
+
+        self.action_page = WizardActionController(self, affiliations=affiliations)
+
         self.pgSummary = SummaryPage(self, "Summary", self.series_service)
 
         self.FitToPage(self.pgIntro)
@@ -277,7 +283,6 @@ def __init__(self, parent, service_manager, record_service):
         self.pgIntro.SetNext(self.pgSummary)
         self.pgSummary.SetPrev(self.pgIntro)
 
-
         #SaveAs Pages
         self.pgMethod.SetPrev(self.pgIntro)
         self.pgMethod.SetNext(self.pgQCL)
@@ -286,7 +291,10 @@ def __init__(self, parent, service_manager, record_service):
         self.pgQCL.SetNext(self.pgVariable)
 
         self.pgVariable.SetPrev(self.pgQCL)
-        self.pgVariable.SetNext(self.pgSummary)
+        self.pgVariable.SetNext(self.action_page)
+
+        self.action_page.SetPrev(self.pgVariable)
+        self.action_page.SetNext(self.pgSummary)
 
         #Save existing  page
         self.pgExisting.SetPrev(self.pgIntro)
@@ -308,7 +316,7 @@ def on_page_changing(self, event):
 
         elif self.pgIntro.pnlIntroduction.rbSaveAs.GetValue():
             self.pgIntro.SetNext(self.pgMethod)
-            self.pgSummary.SetPrev(self.pgVariable)
+            self.pgSummary.SetPrev(self.action_page)
 
         else:
             self.pgIntro.SetNext(self.pgExisting)

odmtools/odmservices/series_service.py

@@ -1074,4 +1074,7 @@ def get_all_annotations(self):
         return self.read.getAnnotations(type=None)
 
     def get_aggregation_statistic(self):
-        return self.read.getCVs(type="aggregationstatistic")
+        return self.read.getCVs(type="aggregationstatistic")
+
+    def get_all_affiliations(self):
+        return self.read.getAffiliations(ids=None, personfirst=None, personlast=None, orgcode=None)

odmtools/view/WizardActionView.py

@@ -0,0 +1,60 @@
+import wx
+from odmtools.view.CustomListCtrl import CustomListCtrl
+import wx.lib.scrolledpanel
+
+
+class WizardActionView(wx.lib.scrolledpanel.ScrolledPanel):
+    def __init__(self, parent):
+        wx.lib.scrolledpanel.ScrolledPanel.__init__(self, parent)
+
+        # Header
+        header_text = wx.StaticText(self, label="Action")
+        static_line = wx.StaticLine(self, size=(-1, 12))
+
+        font = wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD)
+        header_text.SetFont(font)
+
+        # REQUIRED FIELDS
+        required_static_box_sizer = wx.StaticBoxSizer(box=wx.StaticBox(self, label="Required Fields"), orient=wx.VERTICAL)
+        affiliations_text = wx.StaticText(self, label="Affiliations")
+        self.affiliations_table = CustomListCtrl(self)
+
+        row_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        row_sizer.Add(affiliations_text, 0, wx.EXPAND)
+        required_static_box_sizer.Add(row_sizer, 0, wx.EXPAND | wx.ALL, 5)
+
+        row_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        row_sizer.Add(self.affiliations_table, 1, wx.EXPAND)
+        required_static_box_sizer.Add(row_sizer, 0, wx.EXPAND | wx.ALL, 5)
+
+        # OPTIONAL FIELDS
+        optional_static_box_sizer = wx.StaticBoxSizer(box=wx.StaticBox(self, label="Optional Fields"), orient=wx.VERTICAL)
+        action_file_link_text = wx.StaticText(self, label="Action File Link")
+        action_file_link_text_box = wx.TextCtrl(self)
+        description_text = wx.StaticText(self, label="Description")
+        description_text_box = wx.TextCtrl(self, style=wx.TE_MULTILINE)
+        role_description_text = wx.StaticText(self, label="Role Description")
+        role_description_text_box = wx.TextCtrl(self, style=wx.TE_MULTILINE)
+
+        flex_grid_sizer = wx.FlexGridSizer(rows=3, cols=2, vgap=9, hgap=25)
+
+        flex_grid_sizer.AddMany([(action_file_link_text), (action_file_link_text_box, 1, wx.EXPAND),
+                                 (description_text), (description_text_box, 1, wx.EXPAND),
+                                 (role_description_text), (role_description_text_box, 1, wx.EXPAND)
+                                 ])
+
+        flex_grid_sizer.AddGrowableRow(1, 1)
+        flex_grid_sizer.AddGrowableCol(1, 1)
+
+        row_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        row_sizer.Add(flex_grid_sizer, 1, wx.EXPAND)
+        optional_static_box_sizer.Add(row_sizer, 0, wx.EXPAND | wx.ALL, 5)
+
+        master_sizer = wx.BoxSizer(wx.VERTICAL)
+        master_sizer.Add(header_text, 0, wx.ALIGN_CENTER | wx.ALL, 5)
+        master_sizer.Add(static_line, 0, wx.EXPAND | wx.TOP, 5)
+        master_sizer.Add(required_static_box_sizer, 0, wx.EXPAND | wx.TOP, 5)
+        master_sizer.Add(optional_static_box_sizer, 0, wx.EXPAND | wx.TOP, 5)
+
+        self.SetSizer(master_sizer)
+        # master_sizer.Fit(self)