Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 889b60f94 -> 809d7032a
IGNITE-1595 WIP on charts with time line. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/809d7032 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/809d7032 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/809d7032 Branch: refs/heads/ignite-843-rc1 Commit: 809d7032aa6cbb7ae6063da300cdbe43e3c112b9 Parents: 889b60f Author: Alexey Kuznetsov <[email protected]> Authored: Wed Oct 14 10:45:35 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 14 10:45:35 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/metadata.json | 2 +- .../src/main/js/controllers/sql-controller.js | 4 ++++ .../src/main/js/views/sql/sql.jade | 18 ++++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/809d7032/modules/control-center-web/src/main/js/controllers/models/metadata.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json index 7b16285..af5eebf 100644 --- a/modules/control-center-web/src/main/js/controllers/models/metadata.json +++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json @@ -262,7 +262,7 @@ "onEnter": "loadMetadataNext()", "tip": [ "Password for connecting to database", - "Note, password would not be saved" + "Note, password would not be saved in preferences for security reasons" ] }, { http://git-wip-us.apache.org/repos/asf/ignite/blob/809d7032/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 467827a..9a59c14 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 @@ -840,6 +840,10 @@ consoleModule.controller('sqlController', return datum; } + $scope.paragraphTimeSpanVisible = function (paragraph) { + return paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled(); + }; + $scope.paragraphTimeLineSpan = function (paragraph) { if (paragraph && paragraph.timeLineSpan) return paragraph.timeLineSpan.toString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/809d7032/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 55a5d91..7fe9005 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -32,12 +32,15 @@ mixin btn-toolbar-data(btn, kind, tip) i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom') mixin chart-settings(mdl) - .chart-settings-link - i.fa.fa-chevron-circle-down - a(ng-show='paragraph.chart' ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings - label(style='margin-left: 20px') Show - button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') - label min + .chart-settings-link(ng-show='paragraph.chart') + .col-sm-2 + i.fa.fa-chevron-circle-down + a(ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings + .col-sm-3(ng-show='paragraphTimeSpanVisible(paragraph)') + label Show + button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') + label min + block container .row .col-sm-12(ng-init='noteId = "#{noteId}"') @@ -154,13 +157,12 @@ block container .sql-table.ag-bootstrap(ag-grid='paragraph.gridOptions') div(ng-show='paragraph.chart() && paragraph.nonEmpty()') div(ng-show='paragraph.queryExecute()') + +chart-settings div(ng-hide='paragraph.chartColumnsConfigured()') - +chart-settings .sql-empty-result Cannot display chart. Please configure axis using  b Chart settings div(ng-show='paragraph.chartColumnsConfigured()') div(ng-show='paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()') - +chart-settings div(ng-repeat='chart in paragraph.charts') nvd3(options='chart.options' data='chart.data' api='chart.api') .sql-empty-result(ng-show='!paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled()') Pie chart does not support 'TIME_LINE' column for X-axis
