External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-06 18:49:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2631 from kialam/fix/2533-dashboard-hover

Browse Source 
Fix Dashboard hover-over action so it shows the correct info

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-11-09 05:27:11 +00:00
committed by GitHub
parent 692b55311e 32bd8b6473
commit 2c5f209996
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
View File

@@ -91,7 +91,6 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, moment, gra
}); });
job_status_chart job_status_chart
.x(function(d,i) { return i; })
.useInteractiveGuideline(true) //We want nice looking tooltips and a guideline! .useInteractiveGuideline(true) //We want nice looking tooltips and a guideline!
.showLegend(false) //Show the legend, allowing users to turn on/off line series. .showLegend(false) //Show the legend, allowing users to turn on/off line series.
.showYAxis(true) //Show the y-axis .showYAxis(true) //Show the y-axis
@@ -104,15 +103,13 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, moment, gra
job_status_chart.xAxis job_status_chart.xAxis
.axisLabel(i18n._("TIME"))//.showMaxMin(true) .axisLabel(i18n._("TIME"))//.showMaxMin(true)
.tickFormat(function(d) { .tickFormat(function(d) {
const dx = graphData[0].values[d] && graphData[0].values[d].x || 0; if (d) {
const tickDate = new Date(Number(d + '000'));
if (!dx) { return moment(tickDate).format(timeFormat);
}
else {
return ''; return '';
} }
const tickDate = new Date(Number(dx + '000'));
return moment(tickDate).format(timeFormat);
}); });
job_status_chart.yAxis //Chart y-axis settings job_status_chart.yAxis //Chart y-axis settings