Skip to content

fix: correct heatmap year filtering #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChristosBouronikos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct heatmap year filtering #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/Stats.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,15 +2253,29 @@ const monthComparedChartData = computed(() => {

// prepare data for single date matrix charts
const dateChartData = computed(() => {
const end = startOfToday();
let rd = Object.entries(display.value.dateData ? display.value.dateData.received : []);
let r = preferences.sections.activity.year == (new Date().getFullYear())
? rd.filter(e => new Date(e[0]) > new Date(new Date().setYear(end.getFullYear() - 1)))
: rd.filter(e => e[0].substring(0,4) == preferences.sections.activity.year);
let sd = Object.entries(display.value.dateData ? display.value.dateData.sent : []);
let s = preferences.sections.activity.year == (new Date().getFullYear())
? sd.filter(e => new Date(e[0]) > new Date(new Date().setYear(end.getFullYear() - 1)))
: sd.filter(e => e[0].substring(0,4) == preferences.sections.activity.year);
const year = preferences.sections.activity.year;
// Generate all dates for the full year (Jan 1 to Dec 31)
const startDate = new Date(year, 0, 1);
const endDate = new Date(year, 11, 31);

// Build lookup maps from actual data
const receivedMap = Object.fromEntries(
Object.entries(display.value.dateData?.received || {})
.filter(e => e[0].substring(0, 4) == year)
);
const sentMap = Object.fromEntries(
Object.entries(display.value.dateData?.sent || {})
.filter(e => e[0].substring(0, 4) == year)
);

// Generate full year data with 0 for empty days
let r = [], s = [];
for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) {
const key = d.toISOString().slice(0, 10);
r.push([key, receivedMap[key] || 0]);
s.push([key, sentMap[key] || 0]);
}

// TODO: handle options.startOfWeek
return {
received: { label: t("stats.mailsReceived"), data: r },
Expand Down
Loading