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/03/15 14:44:52 UTC
kylin git commit: KYLIN-1378 TOP_N ui tip update
Repository: kylin
Updated Branches:
refs/heads/master ee13b0568 -> acaaaaa5e
KYLIN-1378 TOP_N ui tip update
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/acaaaaa5
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/acaaaaa5
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/acaaaaa5
Branch: refs/heads/master
Commit: acaaaaa5edbce03025a1d5e84aaa757350cbbba8
Parents: ee13b05
Author: Jason <ji...@163.com>
Authored: Tue Mar 15 21:44:25 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue Mar 15 21:44:40 2016 +0800
----------------------------------------------------------------------
webapp/app/js/directives/directives.js | 4 ++--
webapp/app/partials/cubeDesigner/measures.html | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/acaaaaa5/webapp/app/js/directives/directives.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index 37c599d..2deb0aa 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -279,8 +279,8 @@ KylinApp.directive('kylinPagination', function ($parse, $q) {
nextpara: '='
},
template:
- '<li class="parent_li">Value:<b>{{nextpara.value}}</b>, Type:<b>{{ nextpara.type }}</b></li>' +
- '<li class="parent_li">Order By:<b>{{nextpara.next_parameter.value}}</b></li>',
+ '<li class="parent_li">SUM|ORDER BY:<b>{{nextpara.value}}</b></b></li>' +
+ '<li class="parent_li">GROUP BY:<b>{{nextpara.next_parameter.value}}</b></li>',
compile: function(tElement, tAttr, transclude) {
var contents = tElement.contents().remove();
var compiledContents;
http://git-wip-us.apache.org/repos/asf/kylin/blob/acaaaaa5/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index b58f200..6014a78 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -132,7 +132,14 @@
<!--Param Value-->
<div class="form-group">
<div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default"><b>Param Value</b></label>
+ <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default">
+ <b>Param Value</b>
+ <!--tip for top_n-->
+ <small ng-if="newMeasure.function.expression == 'TOP_N'" class="help-block" style="color:#b94a48">(SUM|ORDER BY Column for TOP_N)</small>
+ </label>
+
+
+
<div class="col-xs-12 col-sm-6">
<span class="font-color-default"
ng-if="newMeasure.function.parameter.type == 'constant'"
@@ -210,7 +217,7 @@
<table class="table table-hover table-bordered list" ng-if="nextParameters.length" ng-show="newMeasure.function.expression == 'TOP_N'">
<tr ng-repeat="n_parameter in nextParameters track by $index">
- <td><b>Order By Column</b></td>
+ <td><b>Group By Column</b></td>
<td>{{n_parameter.value}}</td>
<td>
<button class="btn btn-xs btn-info" ng-click="editNextParameter(n_parameter)">
@@ -225,11 +232,8 @@
</table>
- <button class="btn btn-sm btn-info" ng-click="addNextParameter()" ng-show="newMeasure.function.expression != 'TOP_N'"
- ng-show="state.mode=='edit'"><i class="fa fa-plus">Parameter</i>
- </button>
<button class="btn btn-sm btn-info" ng-click="addNextParameter()" ng-show="newMeasure.function.expression == 'TOP_N' && nextParameters.length==0"
- ng-show="state.mode=='edit'"><i class="fa fa-plus"> Order by Column</i>
+ ng-show="state.mode=='edit'"><i class="fa fa-plus"> Group by Column</i>
</button>
</div>
</div>
@@ -272,7 +276,7 @@
<script type="text/ng-template" id="nextParameter.html">
<div class="modal-header">
<h4 tooltip="submit" ng-if="newmea.measure&&newmea.measure.function.expression !== 'TOP_N'">Add Parameter</h4>
- <h4 tooltip="submit" ng-if="newmea.measure&&newmea.measure.function.expression == 'TOP_N'">Select Order By Column</h4>
+ <h4 tooltip="submit" ng-if="newmea.measure&&newmea.measure.function.expression == 'TOP_N'">Select Group By Column</h4>
</div>
<div class="modal-body" style="background-color: white">
@@ -319,7 +323,7 @@
</div>
<div ng-if="newmea.measure&&newmea.measure.function.expression == 'TOP_N'" ng-init="nextPara.type='column'" class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default"><b>Order By Column</b></label>
+ <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default"><b>Group By Column</b></label>
<!--COUNT_DISTINCT-->
<div class="col-xs-12 col-sm-6">
<select class="form-control" chosen