diff --git a/.env b/.env index 77602a0..7c3a28b 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -REACT_APP_API_PATH=http://localhost:3000/ -# REACT_APP_API_PATH=https://br-ipti-beneficiarios.azurewebsites.net/ \ No newline at end of file +# REACT_APP_API_PATH=http://localhost:3000/ +REACT_APP_API_PATH=https://br-ipti-beneficiarios.azurewebsites.net/ \ No newline at end of file diff --git a/src/Assets/images/lateralFile.svg b/src/Assets/images/lateralFile.svg new file mode 100644 index 0000000..16d4b96 --- /dev/null +++ b/src/Assets/images/lateralFile.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/images/thplogo.svg b/src/Assets/images/thplogo.svg new file mode 100644 index 0000000..0cb2e5e --- /dev/null +++ b/src/Assets/images/thplogo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/Pages/Classroom/ClassroomOne/Report/Pdf/index.tsx b/src/Pages/Classroom/ClassroomOne/Report/Pdf/index.tsx index f4aa3c8..af22a7d 100644 --- a/src/Pages/Classroom/ClassroomOne/Report/Pdf/index.tsx +++ b/src/Pages/Classroom/ClassroomOne/Report/Pdf/index.tsx @@ -7,6 +7,8 @@ import { ReportClassroomType, } from "../../../../../Services/Classroom/type"; import { useEffect, useRef, useState } from "react"; +import img from "../../../../../Assets/images/thplogo.svg"; +import imgLateral from "../../../../../Assets/images/lateralFile.svg"; import html2canvas from "html2canvas"; import jsPDF from "jspdf"; @@ -75,63 +77,68 @@ const ReportClassroom = () => { data-pr-tooltip="PDF" /> - - - - - {/*

- TS: {report?.project.social_technology.name} -

*/} -

{report?.project.name}

- - - - -
- - - -

Relatório de frequência

- - - - - - - - - -
{report?.name}
- - - - - - - - - - - {report?.register_classroom?.map( - (item: RegisterClassroom, index: number) => { - return ( - - - - - - - ); - } - )} - - {/* Adicione as linhas para os demais alunos aqui */} - -
BeneficiariosEncontrosFaltasFrequência
{item.registration.name}{report.meeting.length}{bodyTotal(item).count}{bodyTotal(item).percentage}%
- - + + + + + + + + + + + + +

THE HUMAN PROJECT - THP

+

+ {report?.project.name.toUpperCase()} +

+ + + + +

Relatório de frequência

+ + + + + + + + + + +
Facilitador: Turma: {report?.name}
+ + + + + + + + + + + + {report?.register_classroom?.map( + (item: RegisterClassroom, index: number) => { + return ( + + + + + + + ); + } + )} + +
BeneficiariosEncontrosFaltasFrequência
{item.registration.name}{report.meeting.length}{bodyTotal(item).count}{bodyTotal(item).percentage}%
+ + + + + ); }; diff --git a/src/Pages/Classroom/ClassroomOne/Report/Pdf/style.ts b/src/Pages/Classroom/ClassroomOne/Report/Pdf/style.ts index 34caad0..9be8d76 100644 --- a/src/Pages/Classroom/ClassroomOne/Report/Pdf/style.ts +++ b/src/Pages/Classroom/ClassroomOne/Report/Pdf/style.ts @@ -1,13 +1,11 @@ import styled from "styled-components"; import styles from "../../../../../Styles"; - export const Container = styled.div` - font-family: ${styles.typography.types.inter}; - - - font-size: 3vh; - + font-family: ${styles.typography.types.inter}; + width: 100%; + height: 100%; + font-size: 3vh; `; export const Table = styled.table` @@ -25,4 +23,4 @@ export const Td = styled.td` border: 1px solid #ddd; padding: 8px; -`; \ No newline at end of file +`; diff --git a/src/Router/privaterouternotlayout.tsx b/src/Router/privaterouternotlayout.tsx index 199593c..d0a0e32 100644 --- a/src/Router/privaterouternotlayout.tsx +++ b/src/Router/privaterouternotlayout.tsx @@ -8,7 +8,9 @@ const PrivateRouteNotLayout = ({ Component }: { Component: React.ReactNode }) => return isAuthenticated() ? +
{Component} +
: }