upate saving functions

Author: stephanie

odmtools/controller/frmSeriesSelector.py

@@ -188,8 +188,8 @@ def OnTableRightDown(self, event):
         # TODO @jmeline needs to fix edit, it doesn't unedit when a plot is being edited
         self.Bind(wx.EVT_MENU, self.onRightEdit, editItem)
         # TODO @jmeline will refresh and clear selected as an enhancement
-        #self.Bind(wx.EVT_MENU, self.onRightRefresh, popup_menu.Append(popup_series_refresh, 'Refresh'))
-        #self.Bind(wx.EVT_MENU, self.onRightClearSelected, popup_menu.Append(popup_series_refresh, 'Clear Selected'))
+
+
 
         popup_menu.AppendSeparator()
         self.Bind(wx.EVT_MENU, self.onRightExData, popup_menu.Append(popup_export_data, 'Export Data'))

odmtools/odmservices/edit_service.py

@@ -487,6 +487,7 @@ def save(self,  result=None):
         if not result:
             result = self.memDB.series_service.get_series(series_id = values['resultid'][0])
         # update result
+        result.ValueCount = 0
         self.updateResult(result)
         # upsert values
         self.memDB.series_service.upsert(values)
@@ -508,23 +509,38 @@ def saveAppend(self,  result, overwrite=True):
         # count = overlap calc
         count = self.overlapcalc()
         # set value count = res.vc+valuecount-count
+        result.ValueCount = result.ValueCount+ vc -count
         # insert values
         self.memDB.series_service.upsert_values(values)
         # save new annotations
         self.add_annotations(self.memDB.annotation_list)
         return result
 
 
+    def saveExisting(self, result):
+        values = self.memdB.df
+        # get save result
+
+        # set in df
+        values["resultid"]=result.ResultID
+
+        # save(values)
+        self.save(result)
+        #self.memDB.series_service.upsert_values(values)
+
+        return result
+
     def saveAs(self, variable, method, proc_level, action, action_by):
+        #save as new series
         values = self.memDB.df
         # get all annotations for series
         annolist= self.memDB.series_service.get_annotations_by_result(values["resultid"][0])
         annolist['valueid']
 
         # create series
-        result= self.getResult(variable, method, proc_level)
-        # update result
-        self.updateResult(result)
+        result = self.getResult(variable, method, proc_level)
+        result.ValueCount = 0
+
         # set in df
         values["resultid"] = result.ResultID
         # insert values
@@ -538,18 +554,6 @@ def saveAs(self, variable, method, proc_level, action, action_by):
 
         return result
 
-    def saveExisting(self, result):
-        values = self.memdB.df
-        # get save result
-
-        # set in df
-        values["resultid"]=result.ResultID
-        # save(values)
-        self.memDB.series_service.upsert_values(values)
-        #insert new annotations
-        self.add_annotations(self.memDB.annotation_list)
-        return result
-
     def getResult(self, var, meth, proc, action, actionby):
 
         # copy old
@@ -580,18 +584,24 @@ def getResult(self, var, meth, proc, action, actionby):
             feature_action.SamplingFeatureID = sampling_feature.SamplingFeatureID
             feature_action.SamplingFeatureObj = sampling_feature
 
-            # create TimeSeriesResult - this should also contain all of the stuff for the Result
+            # create TimeSeriesResult - this should also contain all of the stuff for the Result  (hopefully the result will actually be of type, TimeSeriesResult)
             series = TimeSeriesResults()
 
 
 
         return self.updateResult(result)
 
+    form = "%Y-%m-%d %H:%M:%S"
     def updateResult(self, Result):
+        form = "%Y-%m-%d %H:%M:%S"
         # get pd
         values = self.memDB.df
-        # get result
+
         # update count, dates,
+        Action = Result.FeatureActionObj.ActionObj
+        Action.BeginDateTime= datetime.datetime.strptime(str(np.min(values['valuedatetime'])), form)
+        Action.EndDateTime = datetime.datetime.strptime(str(np.max(values["valuedatetime"])), form)
+        Result.ValueCount = len(values)
         return Result
 
     def overlapcalc(self):