graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 11:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug

Browse source
This commit is contained in:
syuilo 2018-08-19 00:42:09 +09:00
parent 0481de6629
commit f59c68022f
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/app/desktop/views/pages/admin/admin.notes-chart.chart.vue
View file

@ -53,14 +53,14 @@ export default Vue.extend({
if (peak != 0) {
const data = this.chart.slice().reverse().map(x => ({
normal: this.type == 'local' ? x.notes.local.diffs.normal : x.notes.remote.diffs.normal,
replies: this.type == 'local' ? x.notes.local.diffs.replies : x.notes.remote.diffs.replies,
renotes: this.type == 'local' ? x.notes.local.diffs.renotes : x.notes.remote.diffs.renotes,
reply: this.type == 'local' ? x.notes.local.diffs.reply : x.notes.remote.diffs.reply,
renote: this.type == 'local' ? x.notes.local.diffs.renote : x.notes.remote.diffs.renote,
total: this.type == 'local' ? x.notes.local.diff : x.notes.remote.diff
}));
this.pointsNote = data.map((d, i) => `${i},${(1 - (d.normal / peak)) * this.viewBoxY}`).join(' ');
this.pointsReply = data.map((d, i) => `${i},${(1 - (d.replies / peak)) * this.viewBoxY}`).join(' ');
this.pointsRenote = data.map((d, i) => `${i},${(1 - (d.renotes / peak)) * this.viewBoxY}`).join(' ');
this.pointsReply = data.map((d, i) => `${i},${(1 - (d.reply / peak)) * this.viewBoxY}`).join(' ');
this.pointsRenote = data.map((d, i) => `${i},${(1 - (d.renote / peak)) * this.viewBoxY}`).join(' ');
this.pointsTotal = data.map((d, i) => `${i},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ');
}
}

10
src/server/api/endpoints/admin/chart.ts
View file

@ -34,15 +34,15 @@ export default (params: any) => new Promise(async (res, rej) => {
const stat = stats.find(s => s.date.getTime() == day.getTime());
if (stat) {
chart.push(stat);
chart.unshift(stat);
} else { // 隙間埋め
const mostRecent = stats.find(s => s.date.getTime() < day.getTime());
if (mostRecent) {
chart.push(Object.assign({}, mostRecent, {
chart.unshift(Object.assign({}, mostRecent, {
date: day
}));
} else {
chart.push({
chart.unshift({
date: day,
users: {
local: {
@ -93,5 +93,9 @@ export default (params: any) => new Promise(async (res, rej) => {
}
}
chart.forEach(x => {
delete x.date;
});
res(chart);
});