Replace pie chart with number for unlimited quotas

When quotas are unlimited hide the pie chart and replace with a number for
quickly glancing how much of 'x' is running

Change-Id: I3586323536ebbf330a4f5dc4529feed5e7987ec8
Closes-bug: 1435811
This commit is contained in:
Bradley Jones 2015-04-30 09:24:05 +01:00
parent 8c1f43c030
commit fadcd009d3
2 changed files with 26 additions and 6 deletions

View File

@ -74,13 +74,20 @@ horizon.d3_pie_chart_usage = {
self.chart = d3.selectAll(".d3_pie_chart_usage");
for (var i = 0; i < pie_chart_data.length; i++) {
var used = Math.min(parseInt($(pie_chart_data[i]).data("used")), 100);
self.data = [{"percentage":used}, {"percentage":100 - used}];
self.pieChart(i);
var data = $(pie_chart_data[i]).data("used");
// When true is passed in only show the number, not the actual pie chart
if (data[1] === true) {
self.data = data[0];
self.pieChart(i, false);
} else {
var used = Math.min(parseInt(data), 100);
self.data = [{"percentage":used}, {"percentage":100 - used}];
self.pieChart(i, true);
}
}
},
// Draw a pie chart
pieChart: function(i) {
pieChart: function(i, fill) {
var self = this;
var vis = create_vis(self.chart[0][i]);
var arc = create_arc();
@ -135,7 +142,20 @@ horizon.d3_pie_chart_usage = {
});
};
animate(self.data);
var show_numbers = function() {
vis.append("text")
.style("fill", "black")
.style("font-size","28px")
.attr('text-anchor', 'middle')
.attr('dominant-baseline', 'central')
.text(self.data);
};
if (fill) {
animate(self.data);
} else {
show_numbers(self.data);
}
}
};

View File

@ -157,7 +157,7 @@ def quotapercent(used, limit):
if used >= limit or limit == 0:
return 100
elif limit == float("inf"):
return 0
return '[%s, true]' % used
else:
return round((float(used) / float(limit)) * 100)