boha_admin/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

fix: monthly cards and table show same +/- using prorated fund for current month

Browse Source 
Backend: per-user missing/overtime in current month now calculated
against bizDaysToDate (working days up to today), not full month.

Frontend: monthly card percentage and fulfilled check also use
fund_to_date for current month.

Now both the yearly summary table and the monthly cards agree.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
BOHA
2026-03-24 19:14:28 +01:00
parent 9724a7b2e9
commit 03e830f97b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/admin/pages/AttendanceBalances.tsx
View File

@@ -458,8 +458,9 @@ export default function AttendanceBalances() {
{fundData.users && fundData.users.map(user => { {fundData.users && fundData.users.map(user => {
const us = monthData.users?.[String(user.id)] const us = monthData.users?.[String(user.id)]
if (!us) return null if (!us) return null
const pct = monthData.fund > 0 ? Math.min(100, (us.covered / monthData.fund) * 100) : 0 const effectiveFund = (monthData as any).fund_to_date ?? monthData.fund
const isFulfilled = us.covered >= monthData.fund const pct = effectiveFund > 0 ? Math.min(100, (us.covered / effectiveFund) * 100) : 0
const isFulfilled = us.covered >= effectiveFund
return ( return (
<div key={user.id}> <div key={user.id}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', fontSize: '12px' }}> <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', fontSize: '12px' }}>

2
src/services/attendance.service.ts
View File

@@ -406,7 +406,7 @@ export async function getWorkfund(year: number) {
} }
} }
const userFund = Math.max(0, (bizDays - holidayDays) * 8); const userFund = Math.max(0, (bizDaysToDate - holidayDays) * 8);
const workedRound = Math.round(worked * 10) / 10; const workedRound = Math.round(worked * 10) / 10;
const leaveHours = vacationHours + sickHours; const leaveHours = vacationHours + sickHours;
const covered = Math.round((worked + leaveHours) * 10) / 10; const covered = Math.round((worked + leaveHours) * 10) / 10;