Fixed bug with non pre-loaded estimated timeseries

UoMResearchIT · Jul 2, 2022 · 4a731d6 · 4a731d6
1 parent 195d662
commit 4a731d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mine_the_gap/static/js/main.js b/mine_the_gap/static/js/main.js
@@ -731,10 +731,12 @@ function get_csv(url, filename='data.csv', jsonParams={}){
 
 
 function getTimestampValue(data, timestamp) {
+    //alert(JSON.stringify(data) + '; ' + timestamp)
     for (var i=0; i<data.length; i++){
-        if(data[i]['timestamp'].trim() == timestamp.trim()){
+        if(data[i]['timestamp'].trim() == timestamp.toString().trim()){
             //alert('timestamp: ' + timestamp + '; dataItem: ' + data[i]['timestamp']);
-            return data[i]['score'];
+            //alert(JSON.stringify(data[i]));
+            return data[i]['value'];
         }
     }
     return null;
@@ -992,10 +994,12 @@ function getEstimatedTimeseries(measurement, method, regionId, ignoreSiteId, lis
         timeout: 300000,
         async: true,
         success: function (data) {
+            //alert(JSON.stringify(data));
             var estValues = [];
             for (var timestampIdx=0; timestampIdx<timestampList.length; timestampIdx++){
                 estValues.push(getTimestampValue(data, timestampList[timestampIdx]));
             };
+            //alert(JSON.stringify(estValues));
             listChart.data.datasets.push(
                     {
                         label: 'Estimated values',

diff --git a/mine_the_gap/views.py b/mine_the_gap/views.py
@@ -597,6 +597,7 @@ def estimates(request, method_name, measurement, timestamp_val=None, region_id=N
                                  'value': value,
                                  'percent_score': percentage_score,
                                  'z_score': z_score,
+                                 'value': value,
                                  'min': min_val,
                                  'max': max_val,
                                  'mean': mean_val,