You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/14 01:02:18 UTC
[06/47] incubator-kylin git commit: enhance query result page
enhance query result page
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7ce63f65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7ce63f65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7ce63f65
Branch: refs/heads/master
Commit: 7ce63f6534d014a94d480e1b2c31bd8c9ecbc16c
Parents: d83913c
Author: jiazhong <ji...@ebay.com>
Authored: Thu Mar 5 14:44:35 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Mar 5 14:44:35 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeEdit.js | 4 ----
webapp/app/partials/query/query.html | 4 ++--
webapp/app/partials/query/query_detail.html | 17 +++++++++--------
3 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ce63f65/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 21a666e..35df8a3 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -87,7 +87,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
$scope.cubeMetaFrame = detail[0];
ModelService.get({model_name: $scope.cubeMetaFrame.model_name}, function (model) {
if (model) {
-// $scope.metaModel = model;
MetaModel.setMetaModel(model);
$scope.metaModel = MetaModel;
@@ -105,9 +104,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
}
});
- //
- // $scope.metaModel = null;
-
} else {
$scope.cubeMetaFrame = CubeDescModel.createNew();
MetaModel.initModel();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ce63f65/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index 15fed72..d559103 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -96,7 +96,7 @@
<td>
<div>
<label>SQL Name:</label> <b style="font-size: 14px">{{query.name}}</b>
- <span style="color: #808080;line-height: 25px" class="pull-right">Saved At: {{query.createdDate}}</span>
+ <!--<span style="color: #808080;line-height: 25px" class="pull-right">Saved At: {{query.createdDate}}</span>-->
</div>
<div ng-if="query.project">
<label>Project: </label>
@@ -153,7 +153,7 @@
<tr ng-repeat="query in cachedQueries | reverse track by $index"
ng-if="$index >= (cachedQueries.curPage-1)*cachedQueries.perPage && $index < cachedQueries.curPage*cachedQueries.perPage">
<td>
- <span style="color: #808080;line-height: 25px">Queried At: {{query.savedAt | utcToConfigTimeZone}} <span ng-if="query.project">in Project: {{query.project}}</span></span>
+ <span style="color: #808080;line-height: 25px">Queried At: {{query.savedAt}} </span><span ng-if="query.project">in Project: {{query.project}}</span></span>
<div class="pull-right">
<button class="btn btn-default btn-xs" ng-click="submitQuery(query.sql, query.project)"><i class="fa fa-refresh"></i>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ce63f65/webapp/app/partials/query/query_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html
index 2cf8eb9..a4c11bf 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -18,12 +18,7 @@
<div class="query-content" ng-controller="QueryResultCtrl" ng-if="curQuery">
<div>
-<div ng-if="curQuery.result.partial" class="text-info">
- Note: Current results are partial, please click 'Show All' button to get all results.
- <button class="btn btn-default btn-xs" ng-click="reset(curQuery);curQuery.acceptPartial=false;query(curQuery)">
- Show All
- </button>
-</div>
+
<div class="pull-right">
<span style="color: #808080">
<span>Start Time: {{curQuery.startTime | utcToConfigTimeZone}}</span>
@@ -79,7 +74,13 @@
style="{{ui.fullScreen ? 'padding: 40px 40px 0px 40px':''}}">
<label>Results <span style="vertical-align:middle;color: grey;font-size: 15px"
ng-if="curQuery.status=='success'">(<strong>{{curQuery.result.results.length}})</strong></span></label>
-
+ <span ng-if="curQuery.result.partial" class="text-warning">
+ !Note: Current results are partial, please click 'Show All' button to get all results.
+ <button class="btn btn-success btn-xs" ng-click="reset(curQuery);curQuery.acceptPartial=false;query(curQuery)">
+ <i class="fa fa-download"></i>
+ Show All
+ </button>
+ </span>
<div class="pull-right" ng-if="curQuery.status=='success'">
<button class="btn btn-default btn-xs"
ng-click="curQuery.graph.show=!curQuery.graph.show;buildGraphMetadata(curQuery);resetGraph(curQuery);refreshGraphData(curQuery)">
@@ -269,4 +270,4 @@
<button class="btn btn-primary" ng-click="saveQuery(curQuery)" ng-disabled="save_query_form.$invalid">Save
</button>
</div>
-</script>
\ No newline at end of file
+</script>