simonfranken/timetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement client targets v2 (weekly/monthly periods, working days, pro-ration) #8

Merged
simonfranken merged 2 commits from client-targets-v2 into main 2026-02-24 20:29:24 +00:00
Conversation 0 Commits 2 Files Changed 8 +12 -1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a58dfcfa4a - Show all commits

13
backend/src/services/clientTarget.service.ts
View File

@@ -506,8 +506,19 @@ export class ClientTargetService {
const elapsedWorkingDays = countWorkingDays(effectiveStart, elapsedEnd, workingDays); const elapsedWorkingDays = countWorkingDays(effectiveStart, elapsedEnd, workingDays);
const expectedHours = elapsedWorkingDays * dailyRateHours; const expectedHours = elapsedWorkingDays * dailyRateHours;
// Only count corrections up to and including today — future corrections
// within the ongoing period must not be counted until those days have elapsed,
// otherwise a +8h correction for tomorrow inflates the balance immediately.
const correctionHoursToDate = target.corrections.reduce((sum, c) => {
const d = c.date.toISOString().split('T')[0];
if (cmpDate(d, effectiveStart) >= 0 && cmpDate(d, today) <= 0) {
return sum + c.hours;
}
return sum;
}, 0);
balanceSeconds = Math.round( balanceSeconds = Math.round(
(trackedSeconds + correctionHours * 3600) - expectedHours * 3600, (trackedSeconds + correctionHoursToDate * 3600) - expectedHours * 3600,
); );
extra = { extra = {