update get_values

Author: stephanie

odmtools/common/taskServer.py

@@ -137,7 +137,7 @@ def worker(cls, dispatcher):
                 result = connection
             if task_type == "UpdateEditDF":
                 connection = task[1]
-                result = connection.get_all_values_df()
+                result = connection.get_values()
 
             result = (task_type, result)
 

odmtools/odmdata/memory_database.py

@@ -200,7 +200,7 @@ def updateDF(self):
             self.taskserver.processTasks()
         else:
         '''
-        self.df = self.mem_service.get_all_values_df()
+        self.df = self.mem_service.get_values()
         print self.mem_service._version
 
 
@@ -212,7 +212,7 @@ def initEditValues(self, seriesID):
         if not self.editLoaded:
             logger.debug("Load series from db")
 
-            self.df = self.series_service.get_values_by_series(seriesID)
+            self.df = self.series_service.get_values(seriesID)
             self.editLoaded = True
 
             '''

odmtools/odmservices/series_service.py

@@ -367,7 +367,7 @@ def get_variable_by_id(self, variable_id):
 #
 #
     #Data Value Methods
-    def get_values_by_series(self, series_id):
+    def get_values(self, series_id=None):
         '''
 
         :param series_id:  Series id
@@ -391,19 +391,23 @@ def get_values_by_series(self, series_id):
         # else:
         #     return None
 
-        q = self.read._session.query(TimeSeriesResultValues).filter_by(ResultID=series_id).order_by(TimeSeriesResultValues.ValueDateTime)
+        q = self.read._session.query(TimeSeriesResultValues)
+        if series_id:
+            q=q.filter_by(ResultID=series_id)
+        q= q.order_by(TimeSeriesResultValues.ValueDateTime)
         query = q.statement.compile(dialect=self._session_factory.engine.dialect)
         data = pd.read_sql_query(sql=query,
                                  con=self._session_factory.engine,
                                  params=query.params)
         data.set_index(data['valuedatetime'], inplace=True)
         return data
-#
-#     def get_all_values_df(self):
-#         """
-#
-#         :return: Pandas DataFrame object
-#         """
+
+    # def get_all_values_df(self):
+
+    #     """
+    #
+    #     :return: Pandas DataFrame object
+    #     """
 #         q = self._edit_session.query(DataValue).order_by(DataValue.local_date_time)
 #         query = q.statement.compile(dialect=self._session_factory.engine.dialect)
 #         data = pd.read_sql_query(sql=query, con=self._session_factory.engine,
@@ -416,6 +420,13 @@ def get_values_by_series(self, series_id):
 #
 #         data = data.ix[:, columns]
 #         return data.set_index(data['LocalDateTime'])
+#         q = self._edit_session.query(TimeSeriesResultValues).order_by(TimeSeriesResultValues.ValueDateTime)
+#         query = q.statement.compile(dialect = self._session_factory.engine.dialect)
+#         data = pd.read_sql_query(sql= query,
+#                                  con= self._session_factory.engine,
+#                                  params=query.params)
+#
+
 #
 #     def get_all_values_list(self):
 #         """
@@ -487,7 +498,7 @@ def get_plot_values(self, seriesID, noDataValue, startDate = None, endDate = Non
         # return data
 
 
-        Values = self.get_values_by_series(seriesID)
+        Values = self.get_values(seriesID)
         data = Values[['datavalue', 'censorcodecv', 'valuedatetime']]
         # data = data[data['datavalue'] != noDataValue]
         data = data[(data['datavalue'] != noDataValue) & (data['valuedatetime'] >= startDate) & (