From a667368ce33d6c3e18e50ec82186355ae44f5d29 Mon Sep 17 00:00:00 2001
From: Sidney <sidney201900@users.noreply.github.com>
Date: Wed, 6 May 2026 21:58:04 -0300
Subject: [PATCH] fix: portal now reads attendance and lessons from school_data
 JSON; restore amber color for justified absences

---
 portal/server.selfhosted.js     | 26 ++++++--------------------
 portal/src/pages/Frequencia.tsx |  6 +++---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/portal/server.selfhosted.js b/portal/server.selfhosted.js
index a1c3a6e..df74dc3 100644
--- a/portal/server.selfhosted.js
+++ b/portal/server.selfhosted.js
@@ -290,21 +290,11 @@ app.get('/api/portal/notas', authMiddleware, async (req, res) => {
   }
 });
 
-// GET /api/portal/frequencia (Relacional)
+// GET /api/portal/frequencia (Leitura direta do school_data — mesma fonte do Manager)
 app.get('/api/portal/frequencia', authMiddleware, async (req, res) => {
   try {
-    const { rows: dbAttendance } = await pool.query(
-      'SELECT id, aluno_id as "studentId", turma_id as "classId", data as "rawDate", foto as "photo", verificado as "verified", tipo as "type", justificativa as "justification", justificativa_aceita as "justificationAccepted" FROM frequencias WHERE aluno_id = $1',
-      [req.user.studentId]
-    );
-    // Converter datas para ISO string COM timezone (formato idêntico ao Manager JSON)
-    // O pg driver retorna TIMESTAMPTZ como Date objects do JS, e toISOString() preserva o UTC correto.
-    // O browser então faz new Date(isoString) e converte para hora local automaticamente.
-    const attendance = dbAttendance.map(row => ({
-      ...row,
-      date: row.rawDate instanceof Date ? row.rawDate.toISOString() : (row.rawDate || ''),
-      rawDate: undefined
-    }));
+    const schoolData = await getSchoolData();
+    const attendance = (schoolData.attendance || []).filter(a => a.studentId === req.user.studentId);
     res.json({ attendance });
   } catch (err) {
     console.error('Frequencia error:', err);
@@ -424,21 +414,17 @@ app.get('/api/portal/config', (req, res) => {
   });
 });
 
-// GET /api/portal/aulas
+// GET /api/portal/aulas (Leitura direta do school_data — mesma fonte do Manager)
 app.get('/api/portal/aulas', authMiddleware, async (req, res) => {
   try {
     const schoolData = await getSchoolData();
     const student = (schoolData.students || []).find(s => s.id === req.user.studentId);
     if (!student) return res.json({ lessons: [] });
 
-    const { rows: turmasData } = await pool.query(
-      'SELECT DISTINCT turma_id FROM frequencias WHERE aluno_id = $1',
-      [req.user.studentId]
-    );
-    
+    // Obter turmas do aluno a partir do JSON (mesma lógica do Manager)
     const studentClassIds = new Set([
       student.classId,
-      ...turmasData.map(r => r.turma_id)
+      ...(schoolData.attendance || []).filter(a => a.studentId === req.user.studentId).map(a => a.classId)
     ].filter(Boolean));
 
     const parseDateHelper = (dStr) => {
diff --git a/portal/src/pages/Frequencia.tsx b/portal/src/pages/Frequencia.tsx
index f691f56..1d181fe 100644
--- a/portal/src/pages/Frequencia.tsx
+++ b/portal/src/pages/Frequencia.tsx
@@ -548,8 +548,8 @@ export default function Frequencia() {
                             <CheckCircle2 size={16} /> Presente
                           </span>
                         ) : isJustificationAccepted ? (
-                          <span style={{ display: 'flex', alignItems: 'center', gap: 6, color: 'var(--color-success)', fontWeight: 600 }}>
-                            <CheckCircle2 size={16} /> Falta Justificada
+                          <span style={{ display: 'flex', alignItems: 'center', gap: 6, color: '#f59e0b', fontWeight: 600 }}>
+                            <AlertTriangle size={16} /> Falta Justificada
                           </span>
                         ) : hasJustification ? (
                           <span style={{ display: 'flex', alignItems: 'center', gap: 6, color: '#f59e0b', fontWeight: 500 }}>
@@ -603,7 +603,7 @@ export default function Frequencia() {
                       </td>
                       <td>
                         {justText ? (
-                          <span style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: '0.8125rem', color: isJustificationAccepted ? 'var(--color-success)' : '#f59e0b', fontWeight: isJustificationAccepted ? 600 : 500 }}>
+                          <span style={{ display: 'flex', alignItems: 'center', gap: 6, fontSize: '0.8125rem', color: '#f59e0b', fontWeight: 600 }}>
                             <FileText size={14} color="currentColor" />
                             {isJustificationAccepted ? 'Justificativa Aceita' : 'Em Análise'}
                           </span>