merge conflict

Author: stephanie

odmtools/odmservices/edit_service.py

@@ -481,6 +481,72 @@ def restore(self):
         self._populate_series()
         self.reset_filter()
 
+    def save(self, values, result=None):
+        # update result
+        # upsert values
+        # save series
+        # save new annotations
+        pass
+
+    def saveAppend(self, value, overwrite=True):
+        # get save result
+        # get value count
+        # set in df
+        # update result
+        # count = overlap calc
+        # set value count = res.vc+valuecount-count
+        # insert values
+        # save series
+        # save new annotations
+        pass
+
+    def saveAs(self, values):
+        # create series
+        # set in df
+        # insert values
+        # save_new_series
+        # get all annotations for series
+        # save all annotations
+
+        pass
+
+    def saveExisting(self, values):
+        # get save result
+        # set in df
+        # save(values, result)
+
+        pass
+
+        # new series
+
+    def createResult(self, var, meth, proc):
+        # also create an action
+        # copy old
+        # change var, meth proc, in df #intend ts, agg stat
+        Result = None
+
+        return self.updateResult(Result)
+
+    def updateResult(self, Result):
+        # get pd
+        # get result
+        # update count, dates,
+        return Result
+
+    def overlapcalc(self):
+        pass
+
+
+
+
+
+
+
+
+
+
+
+
     def updateSeries(self, result = None, is_new_series=False, overwrite = True, append = False):
         """
 

odmtools/odmservices/series_service.py

@@ -522,38 +522,6 @@ def get_all_plot_values(self):
 #####################
 
 
-    def save(self, values, result = None):
-        #update result
-        #upsert values
-        #save series
-        #save new annotations
-        pass
-    def saveAppend(self,value,  overwrite = True):
-        #get save result
-        #get value count
-        #set in df
-        #update result
-        #count = overlap calc
-        #set value count = res.vc+valuecount-count
-        #insert values
-        #save series
-        #save new annotations
-        pass
-    def saveAs(self, values):
-        #create series
-        #set in df
-        #insert values
-        #save_new_series
-        #get all annotations for series
-        #save all annotations
-
-        pass
-    def saveExisting(self, values):
-        #get save result
-        #set in df
-        #save(values, result)
-
-        pass
 
 #new series
     def createResult(self, var, meth, proc):
@@ -599,8 +567,6 @@ def updateResult(self, Result):
         #update count, dates,
         return Result
 
-    def overlapcalc(self):
-        pass
 
 
 #     def save_series(self, series, dvs):
@@ -651,6 +617,7 @@ def overlapcalc(self):
 #         logger.info("A new series was added to the database, series id: "+str(series.id))
 #         return True
 #
+
     def update_values(self, updates):
         '''
         updates : time series result values, pandas dataframe
@@ -670,6 +637,7 @@ def update_values(self, updates):
     def insert_annotations(self, annotations):
         annotations.to_sql(name="timeseriesresultvalueannotations", if_exists='append', con=self._session_factory.engine, index=False)
 
+
     def upsert_values(self, values):
         newvals= upsert.clean_df_db_dups(df = values, tablename="timeseriesresultvalues", engine = self._session_factory.engine,
                                          filter_continuous_col="valuedatetime", filter_categorical_col="resultid")