Bug fixes with add points and flag values

Author: Francisco Arrieta

odmtools/controller/NewFlagValuesController.py

@@ -9,32 +9,38 @@ def __init__(self, parent, series_service, qualifier_choice, record_service):
         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)
 
         self.cancel_button.Bind(wx.EVT_BUTTON, self.on_cancel)
+        self.Bind(wx.EVT_CLOSE, self.on_cancel)
         self.ok_button.Bind(wx.EVT_BUTTON, self.on_ok)
         self.MakeModal(True)
 
     def append_items_to_annotation(self, annotations):
-        self.annotation_combo.Append("[New Annontation]")
+        self.annotation_combo.Append(self.__new_annotation)
         if not isinstance(annotations, list):
             print "type(annotations) must be list of annotations"
             return
 
         for item in annotations:
-            self.annotation_combo.Append(item.AnnotationCode + item.AnnotationText)
+            self.annotation_combo.Append(str(item.AnnotationID))
 
     def on_cancel(self, event):
         self.MakeModal(False)
         self.Destroy()
         event.Skip()
 
     def on_ok(self, event):
-        code = self.code_textbox.GetValue()
-        text = self.text_textbox.GetValue()
+        selection = self.annotation_combo.GetValue()
+        if selection == self.__new_annotation:
+            code = self.code_textbox.GetValue()
+            text = self.text_textbox.GetValue()
+
+            annotation = self.series_service.create_annotation(code, text)
+            self.record_service.flag(annotation.AnnotationID)
 
-        self.series_service.create_annotation(code, text)
         self.on_cancel(event)

odmtools/controller/logicCellEdit.py

@@ -9,7 +9,7 @@
 #### Options ####
 utcOffSetBounds = (-12, 12)
 NULL = "NULL"
-NEW = "[New Qualifier]"
+NEW = "[New Annotation]"
 
 class CellEdit():
     def __init__(self, parent, serviceManager, recordService):
@@ -18,21 +18,22 @@ def __init__(self, parent, serviceManager, recordService):
         self.serviceManager = serviceManager
         if self.serviceManager:
             self.series_service = self.serviceManager.get_series_service()
-            self.qualifierChoices = OrderedDict((x.code + ':' + x.description, x.id)
-                                           for x in self.series_service.get_all_qualifiers() if x.code and x.description)
-            self.qualifierCodeChoices = [NULL] + self.qualifierChoices.keys() + [NEW]
-
+            self.annotationChoices = self.fetch_annotations()
+            self.censorCodeChoices = self.fetchCensorCodeChoices()
+            self.qualityCodeChoices = self.fetchQualityCodeChoices()
+            self.timeAggregationInterval = -1
+            self.timeAggretaionUnitChoices = self.fetchTimeUnitChoices()
         else:
             self.censorCodeChoices = [NULL] + ['SampleCensorCode1'] + ['SampleCensorCode2'] + ['SampleCensorCode3']
             self.labSampleChoices = [NULL] + ['SampleLabSample1'] + ['SampleLabSample2'] + ['SampleLabSample3']
             self.offSetTypeChoices = [NULL] + ['SampleOffsetType1'] + ['SampleOffsetType2'] + ['SampleOffsetType3']
-            self.qualifierCodeChoices = [NULL] + ['SampleQualifierCode1'] + ['SampleQualifierCode2'] + ['SampleQualifierCode3']
+            self.annotationChoices = [NULL] + ['SampleAnnotation1'] + ['SampleAnnotation2'] + ['SampleAnnotation3']
 
-        self.qualityCodeChoices = self.fetchQualityCodeChoices()
-        self.censorCodeChoices = self.fetchCensorCodeChoices()
-        self.timeAggregationInterval = -1
-        self.timeAggretaionUnitChoices = self.fetchTimeUnitChoices()
-        self.annotationChoices = [NULL]
+    def fetch_annotations(self):
+        qualifierChoices = OrderedDict((x.AnnotationCode + ':' + x.AnnotationText, x.AnnotationID)
+                                       for x in self.series_service.get_all_qualifiers() if x.AnnotationCode and x.AnnotationText)
+        qualifierCodeChoices = [NULL] + qualifierChoices.keys() + [NEW]
+        return qualifierCodeChoices
 
     def fetchCensorCodeChoices(self):
         if not self.serviceManager: