Make strings and dates displayable

rafal-szypulka · Feb 5, 2018 · 961ee98 · 961ee98
1 parent 21e8266
commit 961ee98
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -29,7 +29,6 @@ class IPMDatasource {
     var self = this;
     var rangeFrom = moment(options.range.from).utc().utcOffset(self.tzOffset).format('YYYYMMDDTHHmmss');
     var rangeTo = moment(options.range.to).utc().utcOffset(self.tzOffset).format('YYYYMMDDTHHmmss');
-
     //this.alertSrv.set("date range",rangeFrom + ' -- ' + rangeTo + ' -- ' + self.tzOffset,"error");
 
     var requests = _.map(options.targets, target => {
@@ -255,13 +254,21 @@ class IPMDatasource {
     if (target || target == 0) {
       items.forEach(function (item) {
         if (item.properties[2].value == target) {
-          series.push([parseFloat(item.properties[0][item.valueAttribute]), moment(item.properties[1].value + tzOffset).valueOf()]);
-        }
+            if (item.properties[0].valueType == "string" || item.properties[0].valueType == "isodatetime") {
+                series.push([item.properties[0][item.valueAttribute], moment(item.properties[1].value + tzOffset).valueOf()]);
+            } else {
+                series.push([parseFloat(item.properties[0][item.valueAttribute]), moment(item.properties[1].value + tzOffset).valueOf()]);
+          }
+      }
       });
     } else {
       items.forEach(function (item) {
-        series.push([parseFloat(item.properties[0][item.valueAttribute]), moment(item.properties[1].value + tzOffset).valueOf()]);
-      });
+           if (item.properties[0].valueType == "string" || item.properties[0].valueType == "isodatetime") {
+                series.push([item.properties[0][item.valueAttribute], moment(item.properties[1].value + tzOffset).valueOf()]);
+          } else {
+                series.push([parseFloat(item.properties[0][item.valueAttribute]), moment(item.properties[1].value + tzOffset).valueOf()]);
+            }
+       });
     }
     return series;
   }
@@ -289,7 +296,6 @@ class IPMDatasource {
       url: request.url,
       params: request.params,
       data: request.data,
-
     };
     var urlReplaced = request.url.search(/\/items/) >= 0;