Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: melhorias #22

Merged
merged 5 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions functions/src/controller/report/fetchForConsultation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ interface StudentReport {
school: string | undefined;
classroom: string | undefined;
student_name: string;
birthday: string;
points: number;
}

Expand All @@ -26,6 +27,7 @@ const generateRowReport = async (schools: SchoolData[], classrooms: ClassroomDat
school: school?.object.name,
classroom: classroom?.object.name,
student_name: student.object.name,
birthday: student.object.birthday,
points: student.object.points,
};

Expand Down
3 changes: 3 additions & 0 deletions src/Pdf/PdfForConsultation/relatorioEncaminhadosConsulta.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const MyDocument = () => {
<TableHeader style={{ textAlign: "center" }}>Nome da escola</TableHeader>
<TableHeader style={{ textAlign: "center" }}>Turma</TableHeader>
<TableHeader style={{ textAlign: "center" }}>Nome do Estudante</TableHeader>
<TableHeader style={{ textAlign: "center" }}>Data de Nascimento</TableHeader>
<TableHeader style={{ textAlign: "center" }}>Prioridade</TableHeader>
</tr>
</thead>
Expand All @@ -107,6 +108,7 @@ const MyDocument = () => {
<TableData><Skeleton height={20} /></TableData>
<TableData><Skeleton height={20} /></TableData>
<TableData><Skeleton height={20} /></TableData>
<TableData><Skeleton height={20} /></TableData>
</tr>
) : (
// Renderizar os dados do relatório
Expand All @@ -116,6 +118,7 @@ const MyDocument = () => {
<TableData style={{ textAlign: "center" }}>{item.school}</TableData>
<TableData style={{ textAlign: "center" }}>{item.classroom}</TableData>
<TableData style={{ textAlign: "center" }}>{item.student_name}</TableData>
<TableData style={{ textAlign: "center" }}>{item.birthday}</TableData>
<TableData style={{ textAlign: "center" }}>{item.points < 5 ? "Prioridade minima" : (item.points >= 5 && item.points < 9) ? "Prioridade média" : item.points >= 10 ? "Prioridade máxima" : ""}</TableData>
</tr>
))
Expand Down
Loading
Loading