Merge

Author: Francisco Arrieta

odmtools/controller/NewFlagValuesController.py

@@ -41,7 +41,10 @@ def on_ok(self, event):
             text = self.text_textbox.GetValue()
 
             annotation = self.series_service.create_annotation(code, text)
-            self.record_service.flag(annotation.AnnotationID)
+        else:
+            code = selection.split(':')[0]
+            annotation = self.series_service.get_annotation_by_code(code)
+        self.record_service.flag(annotation.AnnotationID)
 
         self.on_cancel(event)
 

odmtools/odmdata/memory_database.py

@@ -156,11 +156,18 @@ def chunking(self, data):
     #break into chunks to get around sqlite's restriction. allowing user to send in only 999 arguments at once
     #TODO update to work with odm2
     def updateFlag(self, ids, value):
-        chunks=self.chunking(ids)
-        for c in chunks:
-            # add entry in the Timeseriesresultvalueannotations table
-            self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))\
-                .update({TSRV.qualifier_id: value}, False)
+        import pandas as pd
+
+        flags = pd.DataFrame()
+        if "dates" not in flags.columns:
+            flags.dates = ids
+            flags.AnnotationID = value
+
+        # chunks=self.chunking(ids)
+        # for c in chunks:
+        #     # add entry in the Timeseriesresultvalueannotations table
+        #     self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))\
+        #         .update({TSRV.qualifier_id: value}, False)
 
 
 

odmtools/odmdata/series.py

@@ -1069,7 +1069,7 @@ def get_quality_code(self):
         return self.read.getCVs(type="Quality Code")
 
     def get_annotation_by_code(self, code):
-        return self.read.getAnnotations(type=code)
+        return self.read.getAnnotations(codes=[code])[0]
 
     def get_all_annotations(self):
         return self.read.getAnnotations(type=None)