IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: graphs should go to zero for missing dates

Browse Source
This commit is contained in:
Arpit Jalan
2018-01-13 08:13:49 +05:30
parent 215c0d5569
commit b7ba490df7
6 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/models/report.js.es6
View File

@@ -1,6 +1,7 @@
import { ajax } from 'discourse/lib/ajax';
import round from "discourse/lib/round";
import { fmt } from 'discourse/lib/computed';
import { fillMissingDates } from 'discourse/lib/utilities';
const Report = Discourse.Model.extend({
reportUrl: fmt("type", "/admin/reports/%@"),
@@ -142,14 +143,13 @@ Report.reopenClass({
group_id: groupId
}
}).then(json => {
// Add a percent field to each tuple
let maxY = 0;
json.report.data.forEach(row => {
if (row.y > maxY) maxY = row.y;
});
if (maxY > 0) {
json.report.data.forEach(row => row.percentage = Math.round((row.y / maxY) * 100));
// Add zero values for missing dates
if (json.report.data.length > 0) {
const startDateFormatted = moment(json.report.start_date).format('YYYY-MM-DD');
const endDateFormatted = moment(json.report.end_date).format('YYYY-MM-DD');
json.report.data = fillMissingDates(json.report.data, startDateFormatted, endDateFormatted);
}
const model = Report.create({ type: type });
model.setProperties(json.report);
return model;

8
app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
View File

@@ -1,4 +1,5 @@
import { ajax } from 'discourse/lib/ajax';
import { fillMissingDates } from 'discourse/lib/utilities';
export default Discourse.Route.extend({
queryParams: {
@@ -15,6 +16,13 @@ export default Discourse.Route.extend({
search_type: params.searchType
}
}).then(json => {
// Add zero values for missing dates
if (json.term.data.length > 0) {
const startDate = (json.term.period === "all") ? moment(json.term.data[0].x).format('YYYY-MM-DD') : moment(json.term.start_date).format('YYYY-MM-DD');
const endDate = moment(json.term.end_date).format('YYYY-MM-DD');
json.term.data = fillMissingDates(json.term.data, startDate, endDate);
}
const model = Ember.Object.create({ type: "search_log_term" });
model.setProperties(json.term);
return model;