vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix handling of dates in logs view

Browse source 
- Fixes #1742
- Also fixes the time zone on the aggregated logs API
This commit is contained in:
Joseph Schorr 2016-08-17 16:26:14 -04:00
parent 987bd53c2d
commit b459581637
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
static/js/graphing.js
View file

@ -1125,18 +1125,14 @@ LogUsageChart.prototype.buildData_ = function(aggregatedLogs) {
var aggregated = aggregatedLogs[i];
var title = this.titleMap_[aggregated.kind] || aggregated.kind;
var datetime = parseDate(aggregated.datetime);
var dateDay = datetime.getDate();
if (dateDay < 10) {
dateDay = '0' + dateDay;
}
var formatted = (datetime.getMonth() + 1) + '/' + dateDay;
var adjusted = new Date(datetime.getFullYear(), datetime.getMonth(), datetime.getDate());
var formatted = (datetime.getMonth() + 1) + '/' + datetime.getDate();
var justdate = new Date(datetime.getFullYear(), datetime.getMonth(), datetime.getDate());
var key = title + '_' + formatted;
var entry = {
'kind': aggregated.kind,
'title': title,
'adjusted': adjusted,
'justdate': justdate,
'formatted': datetime.getDate(),
'count': aggregated.count
};
@ -1162,11 +1158,11 @@ LogUsageChart.prototype.buildData_ = function(aggregatedLogs) {
}
found.values.push({
'x': entry.adjusted,
'x': entry.justdate,
'y': entry.count
});
dateMap[entry.adjusted.toString()] = entry.adjusted;
dateMap[entry.justdate.toString()] = entry.justdate;
}
// Note: nvd3 has a bug that causes d3 to fail if there is not an entry for every single
@ -1197,7 +1193,7 @@ LogUsageChart.prototype.buildData_ = function(aggregatedLogs) {
}
datum.values.sort(function(a, b) {
return a['x'].getDate() - b['x'].getDate();
return (a['x'].getDate() * 1) - (b['x'].getDate() * 1);
});
}