External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 08:37:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Re-enabling a count of the possible hosts that should report status on each task. As live events happen increment a count stored on the play. Only increment when hosts are reporting for the first task of the play, and only increment if the host status is in: successful, changed, skipped or failed. Added the total to the plays list as 'Reporting Hosts'.
This commit is contained in:
Chris Houseknecht
2014-06-25 16:24:30 -04:00
parent 8c502478a0
commit 3516ad4b98
4 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
awx/ui/static/partials/job_detail.html
View File

@@ -23,15 +23,15 @@
<div class="form-horizontal" role="form" id="job-status-form">
<div class="form-group">
<label class="col-md-2 col-sm-2 col-xs-3 control-label">Status</label>
<div class="col-md-10 col-sm-10 col-xs-9">
<label class="col-lg-1 col-md-2 col-sm-2 col-xs-3 control-label">Status</label>
<div class="col-lg-11 col-md-10 col-sm-10 col-xs-9">
<i class="fa icon-job-{{ job_status.status }}"></i> {{ job_status.status }} {{ job_status.explanation }}
</div>
</div>
<div class="form-group">
<label class="col-md-2 col-sm-2 col-xs-3 control-label">Started</label>
<div class="col-md-10 col-sm-10 col-xs-9">
<label class="col-lg-1 col-md-2 col-sm-2 col-xs-3 control-label">Started</label>
<div class="col-lg-11 col-md-10 col-sm-10 col-xs-9">
<div ng-show="job_status.started" id="started-time">{{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}</div>
<div ng-show="job_status.finished" id="finished-time">Finished &nbsp;{{ job_status.finished | date:'MM/dd/yy HH:mm:ss' }}</div>
<div ng-show="job_status.finished" id="elapsed-time">Elapsed &nbsp;{{ job_status.elapsed }}</div>
@@ -39,22 +39,22 @@
</div>
<div class="form-group" ng-show="!lessStatus">
<label class="col-md-2 col-sm-2 col-xs-3 control-label">Template</label>
<div class="col-md-10 col-sm-10 col-xs-9">
<label class="col-lg-1 col-md-2 col-sm-2 col-xs-3 control-label">Template</label>
<div class="col-lg-11 col-md-10 col-sm-10 col-xs-9">
<a href="{{ job_template_url }}" aw-tool-tip="Edit the job template" data-placement="top">{{ job_template_name }}</a>
</div>
</div>
<div class="form-group" ng-show="!lessStatus">
<label class="col-md-2 col-sm-2 col-xs-3 control-label">Project</label>
<div class="col-md-10 col-sm-10 col-xs-9">
<label class="col-lg-1 col-md-2 col-sm-2 col-xs-3 control-label">Project</label>
<div class="col-lg-11 col-md-10 col-sm-10 col-xs-9">
<a href="{{ project_url }}" aw-tool-tip="Edit the project" data-placement="top">{{ project_name }}</a>
</div>
</div>
<div class="form-group" ng-show="!lessStatus">
<label class="col-md-2 col-sm-2 col-xs-3 control-label">Inventory</label>
<div class="col-md-10 col-sm-10 col-xs-9">
<label class="col-lg-1 col-md-2 col-sm-2 col-xs-3 control-label">Inventory</label>
<div class="col-lg-11 col-md-10 col-sm-10 col-xs-9">
<a href="{{ inventory_url }}" aw-tool-tip="Edit the inventory" data-placement="top">{{ inventory_name }}</a>
</div>
</div>
@@ -77,7 +77,8 @@
<div class="row">
<div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">Started</div>
<div class="col-lg-1 col-md-1 hidden-sm hidden-xs">Elapsed</div>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">Name</div>
<div class="col-lg-8 col-md-8 col-sm-10 col-xs-12">Name</div>
<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">Reporting Hosts</div>
</div>
</div>
<div id="plays-table-detail" aw-custom-scroll class="table-detail">
@@ -87,10 +88,11 @@
<div class="col-lg-1 col-md-1 hidden-sm hidden-xs" aw-tool-tip="Completed at {{ play.finished | date:'HH:mm:ss' }}"
data-placement="top">{{ play.elapsed }}
</div>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12 status-column" aw-tool-tip="Event Id: {{ play.id }}<br />Status: {{ play.status_text }}"
data-placement="top">
<div class="col-lg-8 col-md-8 col-sm-10 col-xs-12 status-column"
aw-tool-tip="Event Id: {{ play.id }}<br />Status: {{ play.status }}" data-placement="top">
<i class="fa icon-job-{{ play.status }}"></i> {{ play.name }}</span>
</div>
<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">{{ play.hostCount }}</div>
</div>
<div class="row" ng-show="playList.length == 0">
<div class="col-lg-12">