sidney
/
edumanagerpro2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: synchronize Dashboard frequency calculation with Frequency page

This commit is contained in:
Sidney 2026-05-14 14:10:05 -03:00
parent f1f1c0e84a
commit 4c72a9e20d
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
portal/src/pages/Dashboard.tsx
View File

@ -81,7 +81,9 @@ export default function Dashboard() {
deduplicatedLessons.forEach(lesson => { deduplicatedLessons.forEach(lesson => {
if (lesson.status === 'cancelled') return; if (lesson.status === 'cancelled') return;
validLessonsCount++;
// Mesma lógica de status da página de Frequência
const { isCompleted } = getLessonTimeStatus(lesson, now);
// Construir janela de tempo EXATAMENTE como o Manager faz // Construir janela de tempo EXATAMENTE como o Manager faz
const lessonStart = new Date(lesson.date + 'T' + (lesson.startTime || '00:00') + ':00'); const lessonStart = new Date(lesson.date + 'T' + (lesson.startTime || '00:00') + ':00');
@ -96,11 +98,15 @@ export default function Dashboard() {
return recordTime >= presenceStartWindow && recordTime <= lessonEnd; return recordTime >= presenceStartWindow && recordTime <= lessonEnd;
}); });
const isPresent = att && (att.type === 'presence' || (!att.type && !(att as any).isVirtual) || att.verified === true); // Só entra no cálculo se estiver concluída OU tiver um registro (biometria/falta/justificativa)
if (att || isCompleted) {
validLessonsCount++;
// Mesma lógica de presença da página de Frequência (exclui type: 'absence')
const isPresent = att && (att.type === 'presence' || (att.verified === true && att.type !== 'absence'));
if (isPresent) presencesCount++; if (isPresent) presencesCount++;
}
}); });
} }
const totalAttendance = data?.attendance?.length || 0;
const frequencyPercent = validLessonsCount > 0 ? Math.round((presencesCount / validLessonsCount) * 100) : 0; const frequencyPercent = validLessonsCount > 0 ? Math.round((presencesCount / validLessonsCount) * 100) : 0;
const nextDue = pendingPayments const nextDue = pendingPayments