Thresholds not working in table #39

Rello · Apr 29, 2020 · 2a76b05 · 2a76b05
1 parent 1abcc84
commit 2a76b05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/app.js b/js/app.js
@@ -122,10 +122,10 @@ OCA.Analytics.UI = {
             },
         };
 
-        thresholds = thresholds.filter(p => p.dimension1 === data['dimension1'] || p.dimension1 === '*');
+        thresholds = thresholds.filter(p => p.dimension1 === data[0] || p.dimension1 === '*');
 
         for (let threshold of thresholds) {
-            const comparison = operators[threshold['option']](parseFloat(data['dimension3']), parseFloat(threshold['dimension3']));
+            const comparison = operators[threshold['option']](parseFloat(data[2]), parseFloat(threshold['dimension3']));
             threshold['severity'] = parseInt(threshold['severity']);
             if (comparison === true) {
                 if (threshold['severity'] === 2) {

diff --git a/lib/Db/ThresholdMapper.php b/lib/Db/ThresholdMapper.php
@@ -48,7 +48,7 @@ public function createThreshold($datasetId, $dimension1, $dimension3, $option, $
 
     public function getThresholdsByDataset($datasetId)
     {
-        $SQL = 'SELECT * FROM `*PREFIX*analytics_threshold` WHERE `dataset` = ?';
+        $SQL = 'SELECT `id`, `dimension1`, `dimension2`, `dimension3`, `option`, `severity` FROM `*PREFIX*analytics_threshold` WHERE `dataset` = ?';
         //$this->logger->error($SQL);
         $stmt = $this->db->prepare($SQL);
         $stmt->execute(array($datasetId));