You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/02/24 09:35:04 UTC
kylin git commit: KYLIN-1433 sort auto merge time range increasingly
by default
Repository: kylin
Updated Branches:
refs/heads/2.x-staging 5085a4d30 -> 460b8abc0
KYLIN-1433 sort auto merge time range increasingly by default
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/460b8abc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/460b8abc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/460b8abc
Branch: refs/heads/2.x-staging
Commit: 460b8abc08e26ca5a3f74da3b8e10667820a5c9d
Parents: 5085a4d
Author: janzhongi <ji...@ebay.com>
Authored: Wed Feb 24 16:33:53 2016 +0800
Committer: janzhongi <ji...@ebay.com>
Committed: Wed Feb 24 16:33:53 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeAdvanceSetting.js | 61 ------------------
webapp/app/js/controllers/cubeRefresh.js | 68 ++++++++++++++++++++
.../partials/cubeDesigner/refresh_settings.html | 4 +-
3 files changed, 70 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/460b8abc/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index dc1a868..178df6d 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -21,34 +21,6 @@
KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfig,MetaModel,cubesManager,CubeDescModel) {
$scope.cubesManager = cubesManager;
- //edit model
- if($scope.state.mode==="edit") {
- $scope.metaModel = MetaModel;
- if(!$scope.cubeMetaFrame.auto_merge_time_ranges){
- $scope.cubeMetaFrame.auto_merge_time_ranges = [];
- }
- $scope._auto_merge_time_ranges = [];
- angular.forEach($scope.cubeMetaFrame.auto_merge_time_ranges,function(item){
- var _day = Math.floor(item/86400000);
- var _hour = (item%86400000)/3600000;
-
- var rangeObj = {
- type:'days',
- range:0,
- mills:0
- }
- if(_day==0){
- rangeObj.type = 'hours';
- rangeObj.range = _hour;
- rangeObj.mills = rangeObj.range*3600000;
- }else{
- rangeObj.type = 'days';
- rangeObj.range = _day;
- rangeObj.mills = rangeObj.range*86400000;
- }
- $scope._auto_merge_time_ranges.push(rangeObj);
- })
- }
//rowkey
$scope.convertedRowkeys = [];
@@ -70,39 +42,6 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
})
- $scope.addNewMergeTimeRange = function(){
- $scope._auto_merge_time_ranges.push({
- type:'days',
- range:0,
- mills:0
- })
- $scope.updateAutoMergeRange();
- }
-
- $scope.removeTimeRange = function(arr,index,item){
- if (index > -1) {
- arr.splice(index, 1);
- }
- $scope.cubeMetaFrame.auto_merge_time_ranges.splice(index,1);
- }
-
-
- $scope.refreshAutoMergeTimeRanges = function(list,index,item){
- if(item.type=='hours'){
- item.mills = item.range*3600000;
- }else{
- item.mills = item.range*86400000;
- }
- $scope.cubeMetaFrame.auto_merge_time_ranges[index] = item.mills;
- }
-
- $scope.updateAutoMergeRange = function(){
- $scope.cubeMetaFrame.auto_merge_time_ranges = [];
- angular.forEach($scope._auto_merge_time_ranges,function(item){
- $scope.cubeMetaFrame.auto_merge_time_ranges.push(item.mills);
- })
- }
-
$scope.refreshRowKey = function(list,index,item){
var encoding = "dict";
var column = item.column;
http://git-wip-us.apache.org/repos/asf/kylin/blob/460b8abc/webapp/app/js/controllers/cubeRefresh.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeRefresh.js b/webapp/app/js/controllers/cubeRefresh.js
index 23cab43..d0de50a 100644
--- a/webapp/app/js/controllers/cubeRefresh.js
+++ b/webapp/app/js/controllers/cubeRefresh.js
@@ -20,4 +20,72 @@
KylinApp.controller('CubeRefreshCtrl', function ($scope, $modal,cubeConfig,MetaModel,UserService) {
$scope.userService = UserService;
+
+ //edit model
+ if($scope.state.mode==="edit") {
+ $scope.metaModel = MetaModel;
+ if(!$scope.cubeMetaFrame.auto_merge_time_ranges){
+ $scope.cubeMetaFrame.auto_merge_time_ranges = [];
+ }
+ $scope._auto_merge_time_ranges = [];
+ angular.forEach($scope.cubeMetaFrame.auto_merge_time_ranges,function(item){
+ var _day = Math.floor(item/86400000);
+ var _hour = (item%86400000)/3600000;
+
+ var rangeObj = {
+ type:'days',
+ range:0,
+ mills:0
+ }
+ if(_day==0){
+ rangeObj.type = 'hours';
+ rangeObj.range = _hour;
+ rangeObj.mills = rangeObj.range*3600000;
+ }else{
+ rangeObj.type = 'days';
+ rangeObj.range = _day;
+ rangeObj.mills = rangeObj.range*86400000;
+ }
+ $scope._auto_merge_time_ranges.push(rangeObj);
+ })
+ }
+
+ $scope.addNewMergeTimeRange = function(){
+ $scope._auto_merge_time_ranges.push({
+ type:'days',
+ range:0,
+ mills:0
+ })
+ $scope.updateAutoMergeRange();
+ }
+
+ $scope.removeTimeRange = function(arr,index,item){
+ if (index > -1) {
+ arr.splice(index, 1);
+ }
+ $scope.cubeMetaFrame.auto_merge_time_ranges.splice(index,1);
+ }
+
+
+ $scope.refreshAutoMergeTimeRanges = function(list,index,item){
+ if(item.type=='hours'){
+ item.mills = item.range*3600000;
+ }else{
+ item.mills = item.range*86400000;
+ }
+ $scope.cubeMetaFrame.auto_merge_time_ranges[index] = item.mills;
+ }
+
+ $scope.updateAutoMergeRange = function(){
+ $scope.cubeMetaFrame.auto_merge_time_ranges = [];
+ angular.forEach($scope._auto_merge_time_ranges,function(item){
+ $scope.cubeMetaFrame.auto_merge_time_ranges.push(item.mills);
+ })
+ }
+
+ if ($scope.state.mode == 'edit') {
+ $scope.$on('$destroy', function () {
+ $scope.cubeMetaFrame.auto_merge_time_ranges.sort(function(a, b){return a-b});;
+ });
+ }
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/460b8abc/webapp/app/partials/cubeDesigner/refresh_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/refresh_settings.html b/webapp/app/partials/cubeDesigner/refresh_settings.html
index d77a5d7..f371c33 100755
--- a/webapp/app/partials/cubeDesigner/refresh_settings.html
+++ b/webapp/app/partials/cubeDesigner/refresh_settings.html
@@ -16,7 +16,7 @@
* limitations under the License.
-->
-<div ng-controller="CubeAdvanceSettingCtrl">
+<div ng-controller="CubeRefreshCtrl">
<ng-form name="forms.refresh_setting_form">
<div>
@@ -77,7 +77,7 @@
<div class="row" ng-if="state.mode=='view'">
<table class="table">
<tbody>
- <tr ng-repeat="timeRange in cubeMetaFrame.auto_merge_time_ranges track by $index">
+ <tr ng-repeat="timeRange in cubeMetaFrame.auto_merge_time_ranges | orderBy:'valueOf()' track by $index ">
<td>
{{timeRange | timeRangeFormat}}
</td>