flag form shows up on add point when selecting new annotation

Also set the default radio button for proc_level in save wizard.

Author: Francisco Arrieta

odmtools/controller/NewFlagValuesController.py

@@ -1,20 +1,24 @@
 import wx
 from odmtools.view.NewFlagValuesView import NewFlagValuesView
+import odmtools.controller.olvAddPoint
 
 
 class NewFlagValuesController(NewFlagValuesView):
     def __init__(self, parent, series_service, qualifier_choice, record_service):
 
         NewFlagValuesView.__init__(self, parent)
+        self.parent = parent
         self.series_service = series_service
         self.qualifer_choice = qualifier_choice
         self.record_service = record_service
         self.__new_annotation = "New Annontation"
 
-        annotations = self.series_service.get_all_annotations()
-        self.append_items_to_annotation(annotations)
-        self.annotation_combo.SetSelection(0)
+        if self.qualifer_choice:
+            annotations = self.series_service.get_all_annotations()
+            self.append_items_to_annotation(annotations)
+
         self.annotation_combo.Append(self.__new_annotation)
+        self.annotation_combo.SetSelection(0)
 
         self.cancel_button.Bind(wx.EVT_BUTTON, self.on_cancel)
         self.Bind(wx.EVT_CLOSE, self.on_cancel)
@@ -32,7 +36,9 @@ def append_items_to_annotation(self, annotations):
     def on_cancel(self, event):
         self.MakeModal(False)
         self.Destroy()
-        event.Skip()
+
+        if event:
+            event.Skip()
 
     def on_ok(self, event):
         selection = self.annotation_combo.GetValue()
@@ -46,6 +52,9 @@ def on_ok(self, event):
             annotation = self.series_service.get_annotation_by_code(code)
         self.record_service.flag(annotation.AnnotationID)
 
+        if isinstance(self.parent, odmtools.controller.olvAddPoint.OLVAddPoint):
+            self.parent.refresh_annotations()
+
         self.on_cancel(event)
 
 if __name__ == '__main__':

odmtools/controller/logicCellEdit.py

@@ -3,6 +3,7 @@
 import wx
 import wx.combo
 from wx.lib import masked
+from odmtools.controller.NewFlagValuesController import NewFlagValuesController
 
 __author__ = 'Jacob'
 
@@ -324,8 +325,27 @@ def setComboForTimeAggregationUnitIDCreator(self, olv, rowIndex, subItemIndex):
     def setComboForAnnotation(self, olv, rowIndex, subItemIndex):
         customCombo = CustomComboBox(olv, choices=self.annotationChoices, style=wx.CB_READONLY)
         customCombo.Bind(wx.EVT_KEY_DOWN, olv._HandleChar)
+        customCombo.Bind(wx.EVT_COMBOBOX, self.on_annotation_combo_change)
         return customCombo
 
+    def on_annotation_combo_change(self, event):
+        if not event:
+            return
+
+        combo = event.GetEventObject()
+        if combo.GetValue() == NEW:
+            self.__show_flag_controller()
+
+        event.Skip()
+
+    def __show_flag_controller(self):
+        add_flag_controller = NewFlagValuesController(self.parent, series_service=self.series_service,
+                                                      qualifier_choice=None,
+                                                      record_service=self.recordService)
+
+        add_flag_controller.collapsible_panel.expand_panel()
+        add_flag_controller.Show()
+
 
 class DatePicker(wx.DatePickerCtrl):
     """

odmtools/controller/olvAddPoint.py

@@ -107,6 +107,9 @@ def __init__(self, *args, **kwargs):
         self.oddRowsBackColor = wx.Colour(191, 239, 255)
         self.cellEditMode = self.CELLEDIT_DOUBLECLICK
 
+    def refresh_annotations(self):
+        self.cellEdit.annotationChoices = self.cellEdit.fetch_annotations()
+
     def buildOlv(self):
         columns = [
             ColumnDefn(title="DataValue",

odmtools/odmservices/edit_service.py

@@ -566,18 +566,17 @@ def getResult(self, var, meth, proc, action, action_by):
 
         if meth:
             action.MethodID = meth.MethodID
-            result.FeatureActionObj.ActionObj.MethodID = meth.MethodID
+            action.MethodObj = meth.MethodObj
 
         #if result does not exist
         if not self.memDB.series_service.resultExists(result):
             try:
                 #create Action
                 action.ActionID = None
-                #action.MethodObj = None
                 action.ActionTypeCV = "Derivation"
                 self.memDB.series_service.read._session.expunge(action.MethodObj.OrganizationObj)
                 self.memDB.series_service.read._session.expunge(action.MethodObj)
-                action = self.memDB.series_service.create.create(action)
+                action = self.memDB.series_service.create.createAction(action)  # it times out. find out why
                 print action
 
 

odmtools/view/NewFlagValuesView.py

@@ -17,15 +17,15 @@ def __init__(self, parent):
         content_panel.SetupScrolling()
 
         annotation_title = wx.StaticText(content_panel, label="Annotation")
-        collapsible_panel = CustomCollapsiblePanel(content_panel, title="Panel 1", expand=0, use_combo=True, combo_trigger_item="New Annontation")
-        self.annotation_combo = collapsible_panel.interactive_item
+        self.collapsible_panel = CustomCollapsiblePanel(content_panel, title="Panel 1", expand=0, use_combo=True, combo_trigger_item="New Annontation")
+        self.annotation_combo = self.collapsible_panel.interactive_item
 
-        code_title = wx.StaticText(collapsible_panel, label="Code")
-        self.code_textbox = wx.TextCtrl(collapsible_panel, size=(100, -1))
-        text_title = wx.StaticText(collapsible_panel, label="Text")
-        self.text_textbox = wx.TextCtrl(collapsible_panel)
-        link_text = wx.StaticText(collapsible_panel, label="Link")
-        self.link_textbox = wx.TextCtrl(collapsible_panel)
+        code_title = wx.StaticText(self.collapsible_panel, label="Code")
+        self.code_textbox = wx.TextCtrl(self.collapsible_panel, size=(100, -1))
+        text_title = wx.StaticText(self.collapsible_panel, label="Text")
+        self.text_textbox = wx.TextCtrl(self.collapsible_panel)
+        link_text = wx.StaticText(self.collapsible_panel, label="Link")
+        self.link_textbox = wx.TextCtrl(self.collapsible_panel)
 
         sizer = wx.BoxSizer(wx.VERTICAL)
         content_panel_sizer = wx.BoxSizer(wx.VERTICAL)
@@ -36,10 +36,10 @@ def __init__(self, parent):
         content_panel_sizer.Add(link_text, 0, wx.EXPAND | wx.ALL ^ wx.BOTTOM, 10)
         content_panel_sizer.Add(self.link_textbox, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 10)
 
-        collapsible_panel.finish_layout()
+        self.collapsible_panel.finish_layout()
 
         sizer.Add(annotation_title, 0, wx.EXPAND | wx.ALL ^ wx.BOTTOM, 10)
-        sizer.Add(collapsible_panel, 1, wx.EXPAND | wx.LEFT | wx.RIGHT, 10)
+        sizer.Add(self.collapsible_panel, 1, wx.EXPAND | wx.LEFT | wx.RIGHT, 10)
         content_panel.SetSizer(sizer)
 
         ##########################################

odmtools/view/WizardProcessLevelView.py

@@ -27,9 +27,9 @@ def __init__(self, parent):
         font = wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD)
         header_text.SetFont(font)
         self.SetupScrolling()
+        self.existing_process_radio.SetValue(True)
         self.existing_process_table.SetSingleStyle(wx.LC_SINGLE_SEL, add=True)
 
-
         # Add components to sizer
         table_sizer = wx.BoxSizer(wx.VERTICAL)
         table_sizer.Add(self.existing_process_table, 0, wx.EXPAND | wx.ALL, 0)