#27: use <select> for columns names

getredash · Oct 27, 2014 · cda82b7 · cda82b7
1 parent f2d8c20
commit cda82b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/rd_ui/app/scripts/visualizations/counter.js b/rd_ui/app/scripts/visualizations/counter.js
@@ -30,12 +30,6 @@
         $scope.visualization.options.rowNumber =
           $scope.visualization.options.rowNumber || 0;
 
-        $scope.visualization.options.counterColName =
-          $scope.visualization.options.counterColName || 'counter';
-
-        $scope.visualization.options.targetColName =
-          $scope.visualization.options.targetColName || 'target';
-
         $scope.$watch('queryResult && queryResult.getData() && visualization.options',
           function() {
             var queryData = $scope.queryResult.getData();
@@ -49,7 +43,7 @@
 
               if ($scope.targetValue) {
                 $scope.delta = $scope.counterValue - $scope.targetValue;
-                $scope.trendPositive = $scope.delta > 0;
+                $scope.trendPositive = $scope.delta >= 0;
               }
             }
           }, true);

diff --git a/rd_ui/app/views/visualizations/counter.html b/rd_ui/app/views/visualizations/counter.html
@@ -1,4 +1,4 @@
-<counter ng-class="{'positive': trendPositive, 'negative': !trendPositive}">
+<counter ng-class="{'positive': targetValue && trendPositive, 'negative': targetValue && !trendPositive}">
   <value>{{counterValue}}</value>
   <counter-target ng-if="targetValue">({{targetValue}})</counter-target>
   <counter-name>{{visualization.name}}</counter-name>

diff --git a/rd_ui/app/views/visualizations/counter_editor.html b/rd_ui/app/views/visualizations/counter_editor.html
@@ -8,13 +8,13 @@
   <div class="form-group">
     <label class="col-lg-6">Counter Column Name</label>
     <div class="col-lg-6">
-      <input type="text" ng-model="visualization.options.counterColName" class="form-control">
+      <select ng-options="name for name in queryResult.columnNames" ng-model="visualization.options.counterColName" class="form-control"></select>
     </div>
   </div>
   <div class="form-group">
     <label class="col-lg-6">Target Column Name</label>
     <div class="col-lg-6">
-      <input type="text" ng-model="visualization.options.targetColName" class="form-control">
+      <select ng-options="name for name in queryResult.columnNames" ng-model="visualization.options.targetColName" class="form-control"></select>
     </div>
   </div>
 </div>