update data values query

Author: sreeder

src/Examples/Sample 1.1.py

@@ -74,11 +74,17 @@
 
     print
     print "************************************************"
-    print "\t\tData Values: get_all_series()"
+    print "\t\tSeries: get_all_series()"
     print "************************************************"
     print
 
-    pp.pprint(odm1service.get_series_by_id(1))
+    ser = odm1service.get_series_by_id(1)
+    pp.pprint(ser)
+    ser = odm1service.get_series_by_id(173)
+    pp.pprint(ser)
+    if ser:
+        print ser.variable
+
 
     print
     print "************************************************"
@@ -87,6 +93,7 @@
     print
 
     pp.pprint(odm1service.get_values_by_series(1))
+    pp.pprint(odm1service.get_values_by_series(173))
     print "The end"
 
 

src/api/ODM1_1_1/services/series_service.py

@@ -406,11 +406,12 @@ def get_plot_values(self, seriesID, noDataValue, startDate = None, endDate = Non
         :return:
         """
         series = self.get_series_by_id(seriesID)
+        values = self.get_values_by_series(seriesID)
 
         DataValues = [
             (dv.data_value, dv.local_date_time, dv.censor_code, dv.local_date_time.strftime('%m'),
                 dv.local_date_time.strftime('%Y'))
-            for dv in series.data_values
+            for dv in values
             if dv.data_value != noDataValue if dv.local_date_time >= startDate if dv.local_date_time <= endDate
         ]
         data = pd.DataFrame(DataValues, columns=["DataValue", "LocalDateTime", "CensorCode", "Month", "Year"])