You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/25 08:23:43 UTC
ignite git commit: IGNITE-843 Tweak DnD chart columns.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 b29d0171e -> 24c9b1888
IGNITE-843 Tweak DnD chart columns.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24c9b188
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24c9b188
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24c9b188
Branch: refs/heads/ignite-843
Commit: 24c9b188808ad137365074949fc0ea81d52aa87a
Parents: b29d017
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 13:23:28 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 13:23:28 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 43 ++++++++++++--------
.../src/main/js/views/sql/chart-settings.jade | 6 +--
2 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/24c9b188/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 83ec8a3..975e191 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
@@ -24,12 +24,6 @@ controlCenterModule.controller('sqlController',
$scope.agentGoal = 'execute sql statements';
$scope.agentTestDriveOption = '--test-drive-sql';
- var chartSettingsParagraph = null;
-
- $scope.chartSettingsDragStart = function (paragraph) {
- chartSettingsParagraph = paragraph;
- };
-
$scope.removeKeyColumn = function (paragraph, index) {
paragraph.chartKeyCols.splice(index, 1);
@@ -42,25 +36,38 @@ controlCenterModule.controller('sqlController',
$scope.applyChartSettings(paragraph);
};
- function acceptColumn(cols, droppedCol) {
- var accepted = _.findIndex(cols, function (col) {
- return col.label == droppedCol.label;
- }) < 0;
+ function acceptableColumn(cols, newCol) {
+ return _.findIndex(cols, function (col) {
+ return col.label == newCol.label;
+ }) < 0;
+ }
+
+ $scope.acceptKeyColumn = function(paragraph, item) {
+ var accepted = acceptableColumn(paragraph.chartKeyCols, item);
- if (accepted)
+ if (accepted) {
$timeout(function () {
- $scope.applyChartSettings(chartSettingsParagraph);
+ $scope.applyChartSettings(paragraph);
});
- return accepted ? droppedCol : false;
- }
+ paragraph.chartKeyCols = [item];
+ }
- $scope.acceptKeyColumn = function(event, index, item, external, type, allowedType) {
- return acceptColumn(chartSettingsParagraph.chartKeyCols, item);
+ return false;
};
- $scope.acceptValColumn = function(event, index, item, external, type, allowedType) {
- return acceptColumn(chartSettingsParagraph.chartValCols, item);
+ $scope.acceptValColumn = function(paragraph, item) {
+ var accepted = acceptableColumn(paragraph.chartValCols, item);
+
+ if (accepted) {
+ $timeout(function () {
+ $scope.applyChartSettings(paragraph);
+ });
+
+ paragraph.chartValCols.push(item);
+ }
+
+ return false;
};
$scope.joinTip = $common.joinTip;
http://git-wip-us.apache.org/repos/asf/ignite/blob/24c9b188/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 11e896c..b2a549b 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
@@ -24,14 +24,14 @@
label All columns
ul.chart-settings-columns-list(dnd-list='paragraph.chartColumns' dnd-allowed-types='[]')
li(ng-repeat='col in paragraph.chartColumns track by $index')
- .btn.btn-default.btn-chart-column-movable(dnd-draggable='col' dnd-effect-allowed='copy' dnd-dragstart='chartSettingsDragStart(paragraph)') {{col.label}}
+ .btn.btn-default.btn-chart-column-movable(dnd-draggable='col' dnd-effect-allowed='copy') {{col.label}}
label X axis
- ul.chart-settings-columns-list(dnd-list='paragraph.chartKeyCols' dnd-disable-if='paragraph.chartKeyCols.length > 0' dnd-drop='acceptKeyColumn(event, index, item, external, type, allowedType)')
+ ul.chart-settings-columns-list(dnd-list='paragraph.chartKeyCols' dnd-drop='acceptKeyColumn(paragraph, item)')
li(ng-repeat='col in paragraph.chartKeyCols track by $index')
.btn.btn-info.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='removeKeyColumn(paragraph, $index)')
label Y axis
- ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='acceptValColumn(event, index, item, external, type, allowedType)')
+ ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='acceptValColumn(paragraph, item)')
li(ng-repeat='col in paragraph.chartValCols track by $index')
.btn.btn-success.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='removeValColumn(paragraph, $index)')