begin adding saving functionality, add commit to editing db for temp fix)

Author: stephanie

odmtools/gui/wizSave.py

@@ -452,8 +452,12 @@ def on_wizard_finished(self, event):
                 result = self.record_service.saveAs(Variable, Method, QCL, True)
             '''
 
+
+            TODO: move all of this stuff into the edit_service file
             # Create action
             new_result = self.series_service.createResult(var=variable, meth=method, proc=proc_level)
+            #TODO create a timeseriesresult
+            #TODO create a featureaction
             # action = self.series_service.create.createAction(action)
 
             affiliation = self.action_page.get_affiliation()

odmtools/odmdata/memory_database.py

@@ -29,6 +29,7 @@ def __init__(self, taskserver=None):
         # Memory_service handles in memory database
         sm = ServiceManager()
         self.mem_service = sm.get_series_service(conn_string="sqlite:///:memory:")
+
         setSchema(self.mem_service._session_factory.engine)
 
         # TODO clean up closing of program
@@ -68,13 +69,17 @@ def getDataValuesDF(self):
         #else:
         #    self.updateDF()
         '''
+        # TODO: fix me! this commit location is only temoporarily. should be flushing so that we can restore
+        self.mem_service._session.commit()
         setSchema(self.mem_service._session_factory.engine)
         self.updateDF()
         # pick up thread here before it is needed
         logging.debug("done updating memory dataframe")
         return self.df
 
     def getDataValues(self):
+        # TODO: fix me! this commit location is only temoporarily. should be flushing so that we can restore
+        self.mem_service._session.commit()
         setSchema(self.mem_service._session_factory.engine)
         return self.mem_service.get_all_values()
 
@@ -97,6 +102,7 @@ def getEditDataValuesforGraph(self):
 
     def commit(self):
         self.mem_service._session.commit()
+        # self.mem_service._session.commit()
 
     def rollback(self):
         self.mem_service._session.rollback()
@@ -143,6 +149,7 @@ def updateValue(self, ids, operator, value):
             q=self.mem_service._session.query(TSRV).filter(TSRV.ValueDateTime.in_(c))
             q.update({TSRV.DataValue: query}, False)
 
+
         #self.updateDF()
 
     def chunking(self, data):
@@ -175,6 +182,7 @@ def updateFlag(self, ids, value):
         frames = [self.annotation_list, flags]
         self.annotation_list=pd.concat(frames)
         print self.annotation_list
+        #todo: remove duplicates before saving
 
 
 
@@ -199,9 +207,12 @@ def addPoints(self, points):
             vals = {"datavalue": point[0], "valuedatetime": point[1],
                     "valuedatetimeutcoffset": point[3],
                     "censorcodecv": point[4], "qualitycodecv": point[5],
-                    "timeaggregationinterval": point[6], "timeaggregationintervalunitsid": point[7]
+                    "timeaggregationinterval": point[6], "timeaggregationintervalunitsid": point[7],
+                    "resultid":self.df["resultid"][0]
                     # todo: Add annotations
                     }
+            if point[8]:
+                self.updateFlag(point[1], self.series_service.get_annotation_by_code(point[8].split(':')[0]).AnnotationID)
 
             setSchema(self.mem_service._session_factory.engine)
             self.mem_service._session.execute(stmt, vals)