KYLIN-1281 move partition_date_start from DataModelDesc to CubeDesc
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9ec4f9ec Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9ec4f9ec Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9ec4f9ec Branch: refs/heads/2.x-staging Commit: 9ec4f9ec455e2f5f9d3e9978633ee8016dad952e Parents: 026ecb5 Author: jian <zhongj...@apache.org> Authored: Thu Jan 7 16:53:37 2016 +0800 Committer: jian <zhongj...@apache.org> Committed: Thu Jan 7 17:00:23 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/cube/model/CubeDesc.java | 2 +- webapp/app/js/controllers/cubeEdit.js | 27 ++-- webapp/app/js/controllers/cubeSchema.js | 1 + webapp/app/js/controllers/modelEdit.js | 27 ---- webapp/app/js/controllers/modelSchema.js | 3 - webapp/app/js/model/cubeDescModel.js | 2 + webapp/app/js/model/metaModel.js | 7 - .../cubeDesigner/advanced_settings.html | 99 ------------- .../partials/cubeDesigner/refresh_settings.html | 146 +++++++++++++++++++ webapp/app/partials/jobs/job_submit.html | 9 +- .../modelDesigner/conditions_settings.html | 17 --- 11 files changed, 167 insertions(+), 173 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java index 2f37044..2c1e623 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java @@ -126,7 +126,7 @@ public class CubeDesc extends RootPersistentEntity { @JsonProperty("partition_date_start") private long partitionDateStart = 0L; @JsonProperty("partition_date_end") - private long partitionDateEnd = Long.MAX_VALUE; + private long partitionDateEnd = 3153600000000l; @JsonProperty("auto_merge_time_ranges") private long[] autoMergeTimeRanges; @JsonProperty("retention_range") http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/controllers/cubeEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index a2464b4..6efe5c1 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -167,6 +167,11 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio CubeDescService.query({cube_name: $routeParams.cubeName}, function (detail) { if (detail.length > 0) { $scope.cubeMetaFrame = detail[0]; + //convert GMT mills ,to make sure partition date show GMT Date + if($scope.cubeMetaFrame.partition_date_start) + { + $scope.cubeMetaFrame.partition_date_start+=new Date().getTimezoneOffset()*60000; + } $scope.metaModel = {}; //get model from API when page refresh @@ -217,22 +222,22 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio //generate rowkey reGenerateRowKey(); - if ($scope.metaModel.model.partition_desc.partition_date_column && ($scope.metaModel.model.partition_desc.partition_date_start | $scope.metaModel.model.partition_desc.partition_date_start == 0)) { - var dateStart = new Date($scope.metaModel.model.partition_desc.partition_date_start); + if ($scope.metaModel.model.partition_desc.partition_date_column && ($scope.cubeMetaFrame.partition_date_start | $scope.cubeMetaFrame.partition_date_start == 0)) { + var dateStart = new Date($scope.cubeMetaFrame.partition_date_start); dateStart = (dateStart.getFullYear() + "-" + (dateStart.getMonth() + 1) + "-" + dateStart.getDate()); //switch selected time to utc timestamp - $scope.metaModel.model.partition_desc.partition_date_start = new Date(moment.utc(dateStart, "YYYY-MM-DD").format()).getTime(); + $scope.cubeMetaFrame.partition_date_start = new Date(moment.utc(dateStart, "YYYY-MM-DD").format()).getTime(); - if ($scope.metaModel.model.partition_desc.partition_date_column.indexOf(".") == -1) { - $scope.metaModel.model.partition_desc.partition_date_column = $scope.metaModel.model.fact_table + "." + $scope.metaModel.model.partition_desc.partition_date_column; - } + //if ($scope.metaModel.model.partition_desc.partition_date_column.indexOf(".") == -1) { + // $scope.metaModel.model.partition_desc.partition_date_column = $scope.metaModel.model.fact_table + "." + $scope.metaModel.model.partition_desc.partition_date_column; + //} } //use cubedesc name as model name - if ($scope.metaModel.model.name === "" || angular.isUndefined($scope.metaModel.model.name)) { - $scope.metaModel.model.name = $scope.cubeMetaFrame.name; - } + //if ($scope.metaModel.model.name === "" || angular.isUndefined($scope.metaModel.model.name)) { + // $scope.metaModel.model.name = $scope.cubeMetaFrame.name; + //} //set model ref for cubeDesc if ($scope.cubeMetaFrame.model_name === "" || angular.isUndefined($scope.cubeMetaFrame.model_name)) { @@ -460,8 +465,8 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio // reverse the date $scope.saveCubeRollBack = function () { - if ($scope.metaModel.model && ($scope.metaModel.model.partition_desc.partition_date_start || $scope.metaModel.model.partition_desc.partition_date_start == 0)) { - $scope.metaModel.model.partition_desc.partition_date_start += new Date().getTimezoneOffset() * 60000; + if ($scope.metaModel.model && ($scope.cubeMetaFrame.partition_date_start || $scope.cubeMetaFrame.partition_date_start == 0)) { + $scope.cubeMetaFrame.partition_date_start += new Date().getTimezoneOffset() * 60000; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/controllers/cubeSchema.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js index fc65ea6..32a1d18 100755 --- a/webapp/app/js/controllers/cubeSchema.js +++ b/webapp/app/js/controllers/cubeSchema.js @@ -29,6 +29,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic {title: 'Cube Info', src: 'partials/cubeDesigner/info.html', isComplete: false,form:'cube_info_form'}, {title: 'Dimensions', src: 'partials/cubeDesigner/dimensions.html', isComplete: false,form:'cube_dimension_form'}, {title: 'Measures', src: 'partials/cubeDesigner/measures.html', isComplete: false,form:'cube_measure_form'}, + {title: 'Refresh Setting', src: 'partials/cubeDesigner/refresh_settings.html', isComplete: false,form:'refresh_setting_form'}, ]; if (UserService.hasRole("ROLE_ADMIN")) { $scope.wizardSteps.push({title: 'Advanced Setting', src: 'partials/cubeDesigner/advanced_settings.html', isComplete: false,form:'cube_setting_form'}); http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/controllers/modelEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index 70d4159..111ca91 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -83,14 +83,6 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati ProjectModel.setSelectedProject(modelsManager.selectedModel.project); TableModel.aceSrcTbLoaded(); } - - //use - //convert GMT mills ,to make sure partition date show GMT Date - //should run only one time - if(model.partition_desc&&model.partition_desc.partition_date_start) - { - MetaModel.converDateToGMT(); - } } }); //init project @@ -104,18 +96,6 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati $scope.prepareModel = function () { // generate column family - - if (modelsManager.selectedModel.partition_desc.partition_date_column!=null&&(modelsManager.selectedModel.partition_desc.partition_date_start|modelsManager.selectedModel.partition_desc.partition_date_start==0)) { - var dateStart = new Date(modelsManager.selectedModel.partition_desc.partition_date_start); - dateStart = (dateStart.getFullYear() + "-" + (dateStart.getMonth() + 1) + "-" + dateStart.getDate()); - //switch selected time to utc timestamp - modelsManager.selectedModel.partition_desc.partition_date_start = new Date(moment.utc(dateStart, "YYYY-MM-DD").format()).getTime(); - - - } - if(modelsManager.selectedModel.partition_desc.partition_date_column==null){ - modelsManager.selectedModel.partition_desc.partition_date_start=null; - } $scope.state.project = modelsManager.selectedModel.project; var _model = angular.copy(modelsManager.selectedModel); delete _model.project; @@ -221,13 +201,6 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati // reverse the date $scope.saveModelRollBack = function (){ - if(modelsManager.selectedModel.partition_desc.partition_date_start==0){ - modelsManager.selectedModel.partition_desc.partition_date_start = null; - } - if(modelsManager.selectedModel&&(modelsManager.selectedModel.partition_desc.partition_date_start||modelsManager.selectedModel.partition_desc.partition_date_start==0)) - { - modelsManager.selectedModel.partition_desc.partition_date_start+=new Date().getTimezoneOffset()*60000; - } }; $scope.removeTableDimensions = function(tableIndex){ http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/controllers/modelSchema.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelSchema.js b/webapp/app/js/controllers/modelSchema.js index 198b91a..2815ac7 100644 --- a/webapp/app/js/controllers/modelSchema.js +++ b/webapp/app/js/controllers/modelSchema.js @@ -252,9 +252,6 @@ KylinApp.controller('ModelSchemaCtrl', function ($scope, QueryService, UserServi }; $scope.check_model_setting = function () { var errors = []; - if (modelsManager.selectedModel.partition_desc.partition_date_column != null && modelsManager.selectedModel.partition_desc.partition_date_start == null) { - errors.push("Please indicate start date when partition date column selected."); - } var errorInfo = ""; angular.forEach(errors, function (item) { errorInfo += "\n" + item; http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/model/cubeDescModel.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js index 8f69fcc..4c69945 100644 --- a/webapp/app/js/model/cubeDescModel.js +++ b/webapp/app/js/model/cubeDescModel.js @@ -46,6 +46,8 @@ KylinApp.service('CubeDescModel', function () { }, "aggregation_groups": [] , + "partition_date_start":0, + "partition_date_end":undefined, "notify_list": [], "hbase_mapping": { "column_family": [] http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/js/model/metaModel.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/model/metaModel.js b/webapp/app/js/model/metaModel.js index e2d93b2..008337f 100644 --- a/webapp/app/js/model/metaModel.js +++ b/webapp/app/js/model/metaModel.js @@ -67,13 +67,6 @@ KylinApp.service('MetaModel',function(){ this.model.fact_table =fact_table; }; - - this.converDateToGMT = function(){ - if(this.model.partition_desc&&this.model.partition_desc.partition_date_start){ - this.model.partition_desc.partition_date_start+=new Date().getTimezoneOffset()*60000; - } - }; - // this.createNew = function () { var metaModel = { name: '', http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/partials/cubeDesigner/advanced_settings.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html index 332d62f..57abb75 100755 --- a/webapp/app/partials/cubeDesigner/advanced_settings.html +++ b/webapp/app/partials/cubeDesigner/advanced_settings.html @@ -19,105 +19,6 @@ <div ng-controller="CubeAdvanceSettingCtrl"> <ng-form name="forms.cube_setting_form"> <div> - - <div class="form-group"> - - <table style="margin-left:42px; width:92%" - class="table table-hover list"> - <tr> - <td> - <!--Cube Size--> - <div class="form-group"> - <div class="row"> - <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Auto Merge Time - Ranges(days)</b></label> - - <div class="col-xs-12 col-sm-6"> - <!--retention range is store in CubeInstance, will convert to cubeMetaFrame for front end--> - <div class="row" ng-if="state.mode=='edit'"> - <table class="table"> - <tbody> - <tr ng-repeat="timeRange in _auto_merge_time_ranges track by $index"> - <td class="col-xs-4"> - <select ng-if="timeRange.type=='hours'" - chosen ng-model="timeRange.range" - ng-options="rangeTypes as rangeTypes for rangeTypes in [0.5,1,2,4,8] " - ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" - style="width: 100% !important;" - data-placeholder="hours range" - class="chosen-select"> - </select> - <input type="text" ng-if="timeRange.type=='days'" - ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" - class="form-control input-sm" placeholder="days range" ng-model="timeRange.range"> - </td> - <td class="col-xs-4"> - <select chosen ng-model="timeRange.type" - ng-options="rangeTypes as rangeTypes for rangeTypes in ['hours','days'] " - ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" - style="width: 200px !important;" - data-placeholder="select a project" - class="chosen-select"> - </select> - </td> - <td> - <button class="btn btn-xs btn-info" ng-show="state.mode=='edit'" - ng-click="removeTimeRange(_auto_merge_time_ranges,$index, timeRange)"> - <i class="fa fa-minus"></i> - </button> - </td> - </tr> - </tbody> - </table> - <button class="btn btn-xs btn-info" ng-show="state.mode=='edit'" - ng-click="addNewMergeTimeRange()"> - New Merge Range<i class="fa fa-plus"></i> - </button> - </div> - <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"> - <td> - {{timeRange | timeRangeFormat}} - </td> - </tr> - </tbody> - </table> - </div> - - </div> - </div> - </div> - </td> - </tr> - - <tr> - <td> - <!--Cube Size--> - <div class="form-group"> - <div class="row"> - <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Retention - Range(days)</b></label> - - <div class="col-xs-12 col-sm-6"> - <!--retention range is store in CubeInstance, will convert to cubeMetaFrame for front end--> - <input type="text" retention-format class="form-control ng-scope ng-pristine ng-valid" - placeholder="how many days cube retention" ng-model="cubeMetaFrame.retention_range" - ng-if="state.mode=='edit'"> - <small class="help-block text-red" ng-show="state.mode=='edit'">(by default it's '0',which will keep - all historic cube segments ,or will keep latest [Retention Range] days cube segments ) - </small> - <span ng-if="state.mode=='view'">{{cubeMetaFrame.retention_range | millisecondsToDay}}</span> - </div> - </div> - </div> - </td> - </tr> - </table> - - </div> - <div class="form-group"> <h4 style="margin-left:42px">Aggregation Groups</h4> <table style="margin-left:42px; width:92%" http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/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 new file mode 100755 index 0000000..7b9e079 --- /dev/null +++ b/webapp/app/partials/cubeDesigner/refresh_settings.html @@ -0,0 +1,146 @@ +<!-- +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +--> + +<div ng-controller="CubeAdvanceSettingCtrl"> + <ng-form name="forms.refresh_setting_form"> + <div> + + <div class="form-group"> + + <table style="margin-left:42px; width:92%" + class="table table-hover list"> + <tr> + <td> + <!--Cube Size--> + <div class="form-group"> + <div class="row"> + <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Auto Merge Time + Ranges(days)</b></label> + + <div class="col-xs-12 col-sm-6"> + <!--retention range is store in CubeInstance, will convert to cubeMetaFrame for front end--> + <div class="row" ng-if="state.mode=='edit'"> + <table class="table"> + <tbody> + <tr ng-repeat="timeRange in _auto_merge_time_ranges track by $index"> + <td class="col-xs-4"> + <select ng-if="timeRange.type=='hours'" + chosen ng-model="timeRange.range" + ng-options="rangeTypes as rangeTypes for rangeTypes in [0.5,1,2,4,8] " + ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" + style="width: 100% !important;" + data-placeholder="hours range" + class="chosen-select"> + </select> + <input type="text" ng-if="timeRange.type=='days'" + ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" + class="form-control input-sm" placeholder="days range" ng-model="timeRange.range"> + </td> + <td class="col-xs-4"> + <select chosen ng-model="timeRange.type" + ng-options="rangeTypes as rangeTypes for rangeTypes in ['hours','days'] " + ng-change="refreshAutoMergeTimeRanges(_auto_merge_time_ranges,$index,timeRange)" + style="width: 200px !important;" + data-placeholder="select a project" + class="chosen-select"> + </select> + </td> + <td> + <button class="btn btn-xs btn-info" ng-show="state.mode=='edit'" + ng-click="removeTimeRange(_auto_merge_time_ranges,$index, timeRange)"> + <i class="fa fa-minus"></i> + </button> + </td> + </tr> + </tbody> + </table> + <button class="btn btn-xs btn-info" ng-show="state.mode=='edit'" + ng-click="addNewMergeTimeRange()"> + New Merge Range<i class="fa fa-plus"></i> + </button> + </div> + <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"> + <td> + {{timeRange | timeRangeFormat}} + </td> + </tr> + </tbody> + </table> + </div> + + </div> + </div> + </div> + </td> + </tr> + + <tr> + <td> + <!--Cube Size--> + <div class="form-group"> + <div class="row"> + <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Retention + Range(days)</b></label> + + <div class="col-xs-12 col-sm-6"> + <!--retention range is store in CubeInstance, will convert to cubeMetaFrame for front end--> + <input type="text" retention-format class="form-control ng-scope ng-pristine ng-valid" + placeholder="how many days cube retention" ng-model="cubeMetaFrame.retention_range" + ng-if="state.mode=='edit'"> + <small class="help-block text-red" ng-show="state.mode=='edit'">(by default it's '0',which will keep + all historic cube segments ,or will keep latest [Retention Range] days cube segments ) + </small> + <span ng-if="state.mode=='view'">{{cubeMetaFrame.retention_range | millisecondsToDay}}</span> + </div> + </div> + </div> + </td> + </tr> + <tr> + <td> + <div class="form-group"> + <div class="row"> + <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Start Date</b></label> + + <div class="col-xs-12 col-sm-6" + ng-class="metaModel.model.partition_desc.partition_date_column!=null&& cubeMetaFrame.partition_date_start==null?'has-error':''"> + <!--edit model will convert –>--> + <input type="text" class="form-control" datepicker-popup="yyyy-MM-dd" + ng-model="cubeMetaFrame.partition_date_start" ng-if="state.mode=='edit'" + placeholder="Click to choose start date..." is-open="opened"/> + <small class="help-block" + ng-show="metaModel.model.partition_desc.partition_date_column!=null&& cubeMetaFrame.partition_date_start==null"> + Please input start date when partition date column is defined in model. + </small> + <!--vier model will convert use filter--> + <span ng-if="state.mode=='view'&&metaModel.model.partition_desc.partition_date_column">{{(cubeMetaFrame.partition_date_start)|reverseToGMT0 }}</span> + </div> + </div> + </div> + </td> + </tr> + </table> + + </div> + + </div> + </ng-form> +</div> http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/partials/jobs/job_submit.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/jobs/job_submit.html b/webapp/app/partials/jobs/job_submit.html index 1036dee..49790ba 100644 --- a/webapp/app/partials/jobs/job_submit.html +++ b/webapp/app/partials/jobs/job_submit.html @@ -38,7 +38,7 @@ <!--no need convert UTC again--> <div ng-if="cube.segments.length == 0"> {{jobBuildRequest.startTime = - (!!metaModel.model.partition_desc.partition_date_start)?metaModel.model.partition_desc.partition_date_start:0 + (!!cube.detail.partition_date_start)?cube.detail.partition_date_start:0 | reverseToGMT0 }} </div> <div ng-if="cube.segments.length > 0"> @@ -46,13 +46,6 @@ <div ng-if="metaModel.model.partition_desc.partition_type=='APPEND'"> {{ jobBuildRequest.startTime = cube.segments[cube.segments.length-1].date_range_end| reverseToGMT0 }} </div> - <!--<div ng-if="metaModel.model.partition_desc.cube_partition_type=='UPDATE_INSERT'">--> - <!--<!–<datepicker ng-model="jobBuildRequest.startTime" show-weeks="true"–>--> - <!--<!–required class="well well-sm"></datepicker>–>--> - <!--<input type="text" datepicker-popup="yyyy-MM-dd" class="input-sm" style="width: 98%"--> - <!--ng-model="jobBuildRequest.startTime"--> - <!--placeholder="Click to choose START date..." is-open="opened" />--> - <!--</div>--> </div> </td> </tr> http://git-wip-us.apache.org/repos/asf/kylin/blob/9ec4f9ec/webapp/app/partials/modelDesigner/conditions_settings.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html index 6ee805c..5500f61 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -57,23 +57,6 @@ </div> </div> - <!--Data Range Start--> - <div class="form-group"> - <div class="row"> - <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Start Date</b></label> - <div class="col-xs-12 col-sm-6" ng-class="modelsManager.selectedModel.partition_desc.partition_date_column!=null&& modelsManager.selectedModel.partition_desc.partition_date_start==null?'has-error':''"> - <!--edit model will convert in MetaModel.converDateToGMT--> - <input type="text" class="form-control" datepicker-popup="yyyy-MM-dd" - ng-model="modelsManager.selectedModel.partition_desc.partition_date_start" ng-if="state.mode=='edit'" - placeholder="Click to choose start date..." is-open="opened" /> - <small class="help-block" ng-show="modelsManager.selectedModel.partition_desc.partition_date_column!=null&& modelsManager.selectedModel.partition_desc.partition_date_start==null">Please input start date when partition date column selected.</small> - <!--vier model will convert use filter--> - <span ng-if="state.mode=='view'&&modelsManager.selectedModel.partition_desc.partition_date_column">{{(modelsManager.selectedModel.partition_desc.partition_date_start)|reverseToGMT0 }}</span> - </div> - </div> - </div> - - <!--Date Format--> <div class="form-group"> <div class="row">
