update annotation creation

Author: sreeder

odmtools/controller/logicEditTools.py

@@ -60,9 +60,6 @@ def fill_gap(self, gap, fill):
             Publisher.sendMessage("scroll")
 
 
-
-
-
     def data_gaps(self, value, time_period):
         self._edit_service.data_gaps(value, time_period)
         self.refresh_selection()

odmtools/odmdata/memory_database.py

@@ -10,6 +10,7 @@
 # ODM = SeriesService.ODM
 from odm2api.ODM2.models import TimeSeriesResultValues as TSRV
 from odm2api.ODM2.models import setSchema
+import pandas as pd
 
 
 logger =logging.getLogger('main')
@@ -37,10 +38,10 @@ def __init__(self, taskserver=None):
         #else:
 
         self.taskserver = taskserver
+        self.annotation_list = pd.DataFrame[], columns =['ResultID', 'ValueDateTime', 'ValueID', 'AnnotationID']
         #send in engine
 
 
-
     def reset_edit(self):
         sm = ServiceManager()
         self.mem_service = sm.get_series_service(conn_string="sqlite:///:memory:")
@@ -150,14 +151,15 @@ 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)
+        # 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)
+        self.annotation_list.append(ids)
 
-            
 
 
     def delete(self, ids):
@@ -243,8 +245,6 @@ def initEditValues(self, seriesID):
                 logger.debug("done loading database")
 
 
-
-
     def changeSeriesIDs(self, result):
         """
 

odmtools/odmservices/edit_service.py

@@ -236,8 +236,6 @@ def data_gaps(self, value, time_period):
         self.filtered_dataframe= df[df.index.isin(newdf.drop_duplicates().dropna())]
 
 
-
-
     def change_value_threshold(self, value, operator):
 
         df = self._test_filter_previous()

odmtools/odmservices/series_service.py

@@ -113,7 +113,6 @@ def get_variables_by_site_code(self, site_code):
                        .filter(Results.FeatureActionID == FeatureActions.FeatureActionID)
                        .filter(FeatureActions.SamplingFeatureID == SamplingFeatures.SamplingFeatureID)
                        .filter(SamplingFeatures.SamplingFeatureCode == site_code).all()
-
             ]
         except:
             var_ids = None
@@ -471,7 +470,7 @@ def get_plot_values(self, seriesID, noDataValue, startDate=None, endDate=None):
         :param endDate:
         :return:
         """
-
+        setSchema(self._session_factory.engine)
         Values = self.get_values(seriesID)
         data = Values[['datavalue', 'censorcodecv', 'valuedatetime']]
         # data = data[data['datavalue'] != noDataValue]