KYLIN 2396 GUI for Percentile pre aggregation implementation Signed-off-by: lidongsjtu <lid...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b56bc622 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b56bc622 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b56bc622 Branch: refs/heads/master-hbase1.x Commit: b56bc622086495f7d0047d01af57efc919b2ecce Parents: 28673a8 Author: luguosheng <550175...@qq.com> Authored: Mon Jan 23 11:24:39 2017 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Mon Jan 23 11:32:46 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeMeasures.js | 2 ++ webapp/app/partials/cubeDesigner/measures.html | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b56bc622/webapp/app/js/controllers/cubeMeasures.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js index 7c155fe..91c38f2 100644 --- a/webapp/app/js/controllers/cubeMeasures.js +++ b/webapp/app/js/controllers/cubeMeasures.js @@ -355,6 +355,8 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes $scope.newMeasure.function.parameter.type= 'column'; $scope.newMeasure.function.returntype = "extendedcolumn(100)"; return; + }else if($scope.newMeasure.function.expression=='PERCENTILE'){ + $scope.newMeasure.function.parameter.type= 'column'; }else{ $scope.nextParameterInit(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/b56bc622/webapp/app/partials/cubeDesigner/measures.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html index 4a48843..b7475b6 100755 --- a/webapp/app/partials/cubeDesigner/measures.html +++ b/webapp/app/partials/cubeDesigner/measures.html @@ -116,7 +116,7 @@ <div class="row"> <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default"><b>Param Type</b></label> <div class="col-xs-12 col-sm-6"> - <select class="form-control" ng-if="newMeasure.function.expression != 'COUNT'" + <select class="form-control" ng-if="newMeasure.function.expression != 'COUNT'&&newMeasure.function.expression != 'PERCENTILE'" ng-init="newMeasure.function.parameter.type=(!!newMeasure.function.parameter.type)?newMeasure.function.parameter.type: 'column' " chosen ng-model="newMeasure.function.parameter.type" required ng-change="measureReturnTypeUpdate();" @@ -124,8 +124,8 @@ <option value=""></option> </select> <span class="font-color-default" - ng-if="newMeasure.function.expression == 'COUNT'" - ng-init="newMeasure.function.parameter.type= 'constant' "><b> constant</b> + ng-if="newMeasure.function.expression == 'COUNT'||newMeasure.function.expression == 'PERCENTILE'" + ><b>{{newMeasure.function.parameter.type}}</b> </span> </div> </div>
