diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index 74d84d51f9..2cfd32f7b3 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -1170,7 +1170,12 @@ export default color: '#ff5850' }); } - + scope.graph_data = graph_data; + var total_count = 0, gd_obj; + for (gd_obj in graph_data) { + total_count += graph_data[gd_obj].value; + } + scope.total_count_for_graph = total_count; // Adjust the size width = $('#job-summary-container .job_well').width(); height = $('#job-summary-container .job_well').height() - $('#summary-well-top-section').height() - $('#graph-section .header').outerHeight() - 15; @@ -1187,7 +1192,7 @@ export default } svg = d3.select("#graph-section").append("svg").attr("width", svg_width).attr("height", svg_height); svg.append("g").attr("id","completedHostsDonut"); - Donut3D.draw("completedHostsDonut", graph_data, Math.floor(svg_width / 2), Math.floor(svg_height / 2), Math.floor(svg_radius * 0.50), Math.floor(svg_radius * 0.25), 18, 0.4); + Donut3D.draw("completedHostsDonut", graph_data, Math.floor(svg_width / 2), Math.floor(svg_height / 2) - 35, Math.floor(svg_radius * 0.50), Math.floor(svg_radius * 0.25), 18, 0.4); $('#graph-section .header .legend').show(); } } diff --git a/awx/ui/static/less/job-details.less b/awx/ui/static/less/job-details.less index 076ace0962..b221ce06c2 100644 --- a/awx/ui/static/less/job-details.less +++ b/awx/ui/static/less/job-details.less @@ -545,6 +545,12 @@ height: 20px; } + .host_summary_row { + margin-top: 15px; + margin-bottom: -15px; + margin-left: 0; + } + @media (max-width: 767px) { #job-detail-container { #job-status-form { diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index e1e4b2fdf3..371b143ab3 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -257,7 +257,31 @@ {{ task.name }} -
{{ task.successfulCount }}
{{ task.changedCount }}
{{ task.skippedCount }}
{{ task.failedCount }}
{{ task.unreachableCount }}
{{ task.missingCount }}
No matching hosts
+ +
+
+ {{ task.successfulCount }} +
+
+ {{ task.changedCount }} +
+
+ {{ task.skippedCount }} +
+
+ {{ task.failedCount }} +
+
+ {{ task.unreachableCount }} +
+
+ {{ task.missingCount }} +
+
+ No matching hosts +
+
+ Waiting... @@ -401,10 +425,10 @@ {{ host.name }} - {{ host.ok }} - {{ host.changed }} - {{ host.unreachable }} - {{ host.failed }} + {{ host.ok }} + {{ host.changed }} + {{ host.unreachable }} + {{ host.failed }} @@ -423,9 +447,14 @@ +
+
Host Summary
+
+ {{ (graph_data_object.value/total_count_for_graph) * 100 | number : 1 }}% of hosts {{ graph_data_object.label }}.
+
+
-
Host Summary