ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-1870 WIP on agg functions.
Date Mon, 09 Nov 2015 09:47:23 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 048fca3b1 -> 6f9ca9719


IGNITE-1870 WIP on agg functions.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f9ca971
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f9ca971
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f9ca971

Branch: refs/heads/ignite-843-rc1
Commit: 6f9ca9719a18188392c92b95db637c132043e032
Parents: 048fca3
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Nov 9 16:47:40 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Nov 9 16:47:40 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js                  | 4 ++++
 .../src/main/js/public/stylesheets/style.scss                  | 6 ++++++
 .../src/main/js/views/sql/chart-settings.jade                  | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6f9ca971/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index c2fcbf8..4048f9e 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -34,6 +34,8 @@ consoleModule.controller('sqlController',
 
     $scope.timeLineSpans = ['1', '5', '10', '15', '30'];
 
+    $scope.aggregateFxs = ['FIRST', 'LAST', 'MIN', 'MAX', 'AVG', 'SUM', 'COUNT'];
+
     $scope.modes = $common.mkOptions(['PARTITIONED', 'REPLICATED', 'LOCAL']);
 
     $scope.timeUnit = [
@@ -112,6 +114,8 @@ consoleModule.controller('sqlController',
             if (valCols.length == MAX_VAL_COLS - 1)
                 valCols.shift();
 
+            item.aggFx = $scope.aggregateFxs[0];
+
             valCols.push(item);
 
             _chartApplySettings(paragraph, true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/6f9ca971/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 9e0e243..7c1f8a3 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1627,6 +1627,12 @@ a {
     cursor: move;
 }
 
+.btn-chart-column-agg-fx {
+    border: 0;
+    margin-left: 10px;
+    padding: 0 !important;
+}
+
 .page-loading-overlay {
     background-color: rgba(255, 255, 255, 1) !important;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6f9ca971/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
index dfd6e10..f0943e3 100644
--- a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
+++ b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
@@ -36,5 +36,5 @@
                 ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='chartAcceptValColumn(paragraph,
item)')
                     li(ng-repeat='col in paragraph.chartValCols track by $index')
                         .btn.btn-default.btn-chart-column(ng-style='chartColor($index)')
{{col.label}}
+                            button.btn-chart-column-agg-fx.select-toggle(ng-show='paragraphTimeSpanVisible(paragraph)'
ng-style='chartColor($index)' ng-model='col.aggFx' placeholder='...' bs-select bs-options='item
for item in aggregateFxs' data-container='false' tabindex='-1')
                             i.fa.fa-close(ng-click='chartRemoveValColumn(paragraph, $index)')
-


Mime
View raw message