From b7563a227484fe6e3c08e202da74f44b7f364e0a Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 16 Oct 2025 01:43:14 +0200 Subject: [PATCH] fixed bug where wrong month was selected in estimate_by_month --- src/lib/server/database.ts | 4 ++-- src/lib/server/docstore.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts index 7e7a42f..fc62494 100644 --- a/src/lib/server/database.ts +++ b/src/lib/server/database.ts @@ -361,9 +361,9 @@ export class User { get_estimate_by_month(year: number, month: number): number { const query = this._database.query(ESTIMATES_DATABASE_GET_QUART); - const res = query.get({ year: year, quarter: Math.floor(month / 4 + 1) }) as EstimatesEntry; + const res = query.get({ year: year, quarter: Math.floor((month-1) / 3) }) as EstimatesEntry; - return res?.[`estimate_${month % 3}`] ?? NaN; + return res?.[`estimate_${(month - 1) % 3}`] ?? NaN; } insert_estimate(year: number, quarter: number, estimate_0: number, estimate_1: number, estimate_2: number) { diff --git a/src/lib/server/docstore.ts b/src/lib/server/docstore.ts index 19408d0..9dcf233 100644 --- a/src/lib/server/docstore.ts +++ b/src/lib/server/docstore.ts @@ -235,7 +235,7 @@ async function _genLatexRec(user: User, file_pref: string, year: number, month: } const records = user.get_entries_by_month(year, month); - const estimate = user.get_estimate_by_month(year, month-1); + const estimate = user.get_estimate_by_month(year, month); const hr_sum = (() => { let s = 0; records.forEach((r) => { s += calculateDuration(r.start, r.end) }); return s; })() if (estimate == null || isNaN(estimate)) { -- 2.40.1