Fix activity calendar for desktop widget

This commit is contained in:
Satsuki Yanagi 2019-07-20 06:29:27 +09:00
parent 5e36f75f8a
commit 6d44263ae7
No known key found for this signature in database
GPG Key ID: F68E0DDD49AF6FB6

View File

@ -1,11 +1,11 @@
<template> <template>
<svg viewBox="0 0 21 7"> <svg :viewBox="`0 0 ${weeks} 7`">
<rect v-for="record in data" class="day" <rect v-for="record in data" class="day"
width="1" height="1" width="1" height="1"
:x="record.x" :y="record.date.weekday" :x="record.x" :y="record.date.weekday"
rx="1" ry="1" rx="1" ry="1"
fill="transparent"> fill="transparent">
<title>{{ record.date.year }}/{{ record.date.month }}/{{ record.date.day }}</title> <title>{{ record.date.year }}/{{ record.date.month + 1 }}/{{ record.date.day }}</title>
</rect> </rect>
<rect v-for="record in data" class="day" <rect v-for="record in data" class="day"
:width="record.v" :height="record.v" :width="record.v" :height="record.v"
@ -28,6 +28,11 @@ import Vue from 'vue';
export default Vue.extend({ export default Vue.extend({
props: ['data'], props: ['data'],
data() {
return {
weeks: 21
};
},
created() { created() {
for (const d of this.data) { for (const d of this.data) {
d.total = d.notes + d.replies + d.renotes; d.total = d.notes + d.replies + d.renotes;
@ -38,18 +43,19 @@ export default Vue.extend({
const year = now.getFullYear(); const year = now.getFullYear();
const month = now.getMonth(); const month = now.getMonth();
const day = now.getDate(); const day = now.getDate();
if (now.getDay() == 6) this.weeks = 20;
let x = 0; let x = this.weeks - 1;
this.data.slice().reverse().forEach((d, i) => { this.data.slice().forEach((d, i) => {
d.x = x; d.x = x;
const date = new Date(year, month, day - i); const date = new Date(year, month, day - i);
d.date = { d.date = {
year: date.getFullYear(), year: date.getFullYear(),
month: date.getMonth(), month: date.getMonth(),
day: date.getDate() day: date.getDate(),
weekday: date.getDay()
}; };
d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay();
d.v = peak == 0 ? 0 : d.total / (peak / 2); d.v = peak == 0 ? 0 : d.total / (peak / 2);
if (d.v > 1) d.v = 1; if (d.v > 1) d.v = 1;
@ -58,7 +64,7 @@ export default Vue.extend({
const cl = 15 + ((1 - d.v) * 80); const cl = 15 + ((1 - d.v) * 80);
d.color = `hsl(${ch}, ${cs}%, ${cl}%)`; d.color = `hsl(${ch}, ${cs}%, ${cl}%)`;
if (d.date.weekday == 6) x++; if (d.date.weekday == 0) x--;
}); });
} }
}); });