mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-19 01:04:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect fiscal year closing balance for partial-year queries

Browse Source
This commit is contained in:
MaysWind
2025-08-04 23:46:33 +08:00
parent be129cd3c6
commit 60108e26c7
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/__tests__/fiscal_year.data.json
+4 -4
View File
@@ -1504,7 +1504,7 @@
"expected": [ "expected": [
{ {
"year": 2024, "year": 2024,
"minUnixTime": 1704067200, "minUnixTime": 1688169600,
"maxUnixTime": 1719791999 "maxUnixTime": 1719791999
}, },
{ {
@@ -1520,7 +1520,7 @@
{ {
"year": 2027, "year": 2027,
"minUnixTime": 1782864000, "minUnixTime": 1782864000,
"maxUnixTime": 1798761599 "maxUnixTime": 1814399999
} }
] ]
}, },
@@ -1532,13 +1532,13 @@
"expected": [ "expected": [
{ {
"year": 2024, "year": 2024,
"minUnixTime": 1704067200, "minUnixTime": 1688169600,
"maxUnixTime": 1719791999 "maxUnixTime": 1719791999
}, },
{ {
"year": 2025, "year": 2025,
"minUnixTime": 1719792000, "minUnixTime": 1719792000,
"maxUnixTime": 1735689599 "maxUnixTime": 1751327999
} }
] ]
}, },
src/lib/datetime.ts
+2 -14
View File
@@ -513,22 +513,10 @@ export function getAllFiscalYearsStartAndEndUnixTimes(startYearMonth: Year0Based
const fiscalYear = getFiscalYearFromUnixTime(fiscalStartTime, fiscalYearStart.value); const fiscalYear = getFiscalYearFromUnixTime(fiscalStartTime, fiscalYearStart.value);
if (fiscalStartTime <= inputEndUnixTime && fiscalEndTime >= inputStartUnixTime) { if (fiscalStartTime <= inputEndUnixTime && fiscalEndTime >= inputStartUnixTime) {
let minUnixTime = fiscalStartTime;
let maxUnixTime = fiscalEndTime;
// Cap the min and max unix times to the input date range
if (minUnixTime < inputStartUnixTime) {
minUnixTime = inputStartUnixTime;
}
if (maxUnixTime > inputEndUnixTime) {
maxUnixTime = inputEndUnixTime;
}
const fiscalYearTime: FiscalYearUnixTime = { const fiscalYearTime: FiscalYearUnixTime = {
year: fiscalYear, year: fiscalYear,
minUnixTime: minUnixTime, minUnixTime: fiscalStartTime,
maxUnixTime: maxUnixTime, maxUnixTime: fiscalEndTime,
}; };
allFiscalYearTimes.push(fiscalYearTime); allFiscalYearTimes.push(fiscalYearTime);