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

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

@ -68,40 +68,46 @@ export default function Dashboard() {
const overduePayments = data?.payments?.filter(p => p.status === 'overdue') || []; const overduePayments = data?.payments?.filter(p => p.status === 'overdue') || [];
const totalPending = pendingPayments.reduce((s, p) => s + (p.amount - (p.discount || 0)), 0); const totalPending = pendingPayments.reduce((s, p) => s + (p.amount - (p.discount || 0)), 0);
// Synchronized Frequency Calculation (Matches Frequencia.tsx & Manager) // Synchronized Frequency Calculation (Matches Frequencia.tsx & Manager)
let presencesCount = 0; let presencesCount = 0;
let validLessonsCount = 0; let validLessonsCount = 0;
if (data?.lessons && data?.attendance) { if (data?.lessons && data?.attendance) {
const deduplicatedLessons = data.lessons.filter((lesson, index, self) => const deduplicatedLessons = data.lessons.filter((lesson, index, self) =>
index === self.findIndex((t) => ( index === self.findIndex((t) => (
t.date === lesson.date && t.startTime === lesson.startTime t.date === lesson.date && t.startTime === lesson.startTime
)) ))
); );
deduplicatedLessons.forEach(lesson => { deduplicatedLessons.forEach(lesson => {
if (lesson.status === 'cancelled') return; if (lesson.status === 'cancelled') return;
validLessonsCount++;
// Construir janela de tempo EXATAMENTE como o Manager faz // Mesma lógica de status da página de Frequência
const lessonStart = new Date(lesson.date + 'T' + (lesson.startTime || '00:00') + ':00'); const { isCompleted } = getLessonTimeStatus(lesson, now);
const lessonEnd = new Date(lesson.date + 'T' + (lesson.endTime || '23:59') + ':00');
const presenceStartWindow = new Date(lessonStart.getTime() - 30 * 60 * 1000);
const att = data.attendance.find(a => { // Construir janela de tempo EXATAMENTE como o Manager faz
if (!a.date || typeof a.date !== 'string') return false; const lessonStart = new Date(lesson.date + 'T' + (lesson.startTime || '00:00') + ':00');
if ((a as any).lessonId === lesson.id) return true; const lessonEnd = new Date(lesson.date + 'T' + (lesson.endTime || '23:59') + ':00');
if (a.date === `${lesson.date}T${lesson.startTime || '00:00'}:00`) return true; const presenceStartWindow = new Date(lessonStart.getTime() - 30 * 60 * 1000);
const recordTime = new Date(a.date);
return recordTime >= presenceStartWindow && recordTime <= lessonEnd; const att = data.attendance.find(a => {
if (!a.date || typeof a.date !== 'string') return false;
if ((a as any).lessonId === lesson.id) return true;
if (a.date === `${lesson.date}T${lesson.startTime || '00:00'}:00`) return true;
const recordTime = new Date(a.date);
return recordTime >= presenceStartWindow && recordTime <= lessonEnd;
});
// 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++;
}
}); });
}
const isPresent = att && (att.type === 'presence' || (!att.type && !(att as any).isVirtual) || att.verified === true); const frequencyPercent = validLessonsCount > 0 ? Math.round((presencesCount / validLessonsCount) * 100) : 0;
if (isPresent) presencesCount++;
});
}
const totalAttendance = data?.attendance?.length || 0;
const frequencyPercent = validLessonsCount > 0 ? Math.round((presencesCount / validLessonsCount) * 100) : 0;
const nextDue = pendingPayments const nextDue = pendingPayments
.sort((a, b) => new Date(a.dueDate).getTime() - new Date(b.dueDate).getTime())[0]; .sort((a, b) => new Date(a.dueDate).getTime() - new Date(b.dueDate).getTime())[0];