You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/09/17 20:20:16 UTC
[44/51] [abbrv] flink git commit: [FLINK-2357] [web dashboard] Added
status counts for a job
[FLINK-2357] [web dashboard] Added status counts for a job
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7138cd55
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7138cd55
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7138cd55
Branch: refs/heads/master
Commit: 7138cd55f6e4ad124245bbc3b5f6dc508be54ea2
Parents: 749c0df
Author: Piotr Godek <pi...@gmail.com>
Authored: Thu Aug 27 21:56:21 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Sep 17 14:21:52 2015 +0200
----------------------------------------------------------------------
flink-runtime-web/web-dashboard/app/partials/jobs/job.jade | 5 +++--
flink-runtime-web/web-dashboard/web/partials/jobs/job.html | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7138cd55/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
index 083e921..b264c72 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
@@ -28,7 +28,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main(ng-if="job")
.navbar-info.first.last
.label-group
- bs-label(status="{{status}}" ng-repeat="(status, value) in job.tasks") {{value}}
+ bs-label(status="{{status}}" ng-repeat="(status, value) in job['status-counts']") {{value}}
.navbar-info.first.last.hidden-xs.hidden-sm
| {{ job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
@@ -47,7 +47,8 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="job")
li(ui-sref-active='active')
a(ui-sref=".statistics") Job Accumulators / Statistics
- li(ui-sref-active='active' ng-if="job['end-time'] > -1")
+ //- li(ui-sref-active='active' ng-if="job['end-time'] > -1")
+ li(ui-sref-active='active')
a(ui-sref=".timeline") Timeline
li(ui-sref-active='active')
http://git-wip-us.apache.org/repos/asf/flink/blob/7138cd55/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
index 3f09b53..ed10feb 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
@@ -25,7 +25,7 @@ limitations under the License.
<div class="navbar-info first last hidden-xs hidden-sm">{{ job.jid }}</div>
<div class="navbar-info first last">
<div class="label-group">
- <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
+ <bs-label status="{{status}}" ng-repeat="(status, value) in job['status-counts']">{{value}}</bs-label>
</div>
</div>
<div class="navbar-info first last hidden-xs hidden-sm">{{ job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}<span ng-if="job['end-time'] > -1">
@@ -37,7 +37,7 @@ limitations under the License.
<ul class="nav nav-tabs">
<li ui-sref-active="active"><a ui-sref=".plan">Plan</a></li>
<li ui-sref-active="active"><a ui-sref=".statistics">Job Accumulators / Statistics</a></li>
- <li ui-sref-active="active" ng-if="job['end-time'] > -1"><a ui-sref=".timeline">Timeline</a></li>
+ <li ui-sref-active="active"><a ui-sref=".timeline">Timeline</a></li>
<li ui-sref-active="active"><a ui-sref=".exceptions">Exceptions</a></li>
<li ui-sref-active="active"><a ui-sref=".config">Configuration</a></li>
</ul>