Merge branch 'master' into odm2_master

Author: stephanie

odmtools/controller/logicEditTools.py

@@ -123,7 +123,7 @@ def _dataframe2liststub(self, dataframe):
         result = None
         if isinstance(dataframe, pd.DataFrame):
             result = pd.DataFrame()
-
+#TODO update function recieves a dataframe  extract "datavalues" and "localdatetime" convert to dictionary call update function from memory database
 
         ## return dataframe
 

odmtools/odmservices/edit_service.py

@@ -271,7 +271,6 @@ def duplicate_value_filter(self):
         #self.filtered_dataframe= df[df.index.get_duplicates()]
         self.filtered_dataframe= df[df.index.isin(df.index.get_duplicates())]
         #self.filtered_dataframe = df[df['DataValue'] < value]
-        print "dup value worked"
 
 
     def select_points_tf(self, tf_list):
@@ -411,7 +410,6 @@ def interpolate(self):
 
     def drift_correction(self, gap_width):
 
-
         if self.isOneGroup():
             tmp_filter_list =self.get_filtered_points()
             startdate =tmp_filter_list.index[0]