From 17079a4409b13ef45d1478cf6ccdbbcc57e37e72 Mon Sep 17 00:00:00 2001
From: jonny paulino <jonnyzico10@gmail.com>
Date: Tue, 2 Apr 2024 11:43:16 -0300
Subject: [PATCH] justification meeting and status up registration

---
 .env                                          |  2 +-
 .../MeetingList/Meeting/DataMeeting/index.tsx |  2 -
 .../MeetingList/Meeting/index.tsx             | 18 +++++--
 .../RegistrationList/Registration/index.tsx   | 51 +++++++++++--------
 src/Pages/Login/Login.tsx                     |  1 +
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/.env b/.env
index 944eda8..f94d92f 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-REACT_APP_API_PATH=http://localhost:3000/
\ No newline at end of file
+REACT_APP_API_PATH=https://br-ipti-beneficiarios.azurewebsites.net/
\ No newline at end of file
diff --git a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx
index 22bec61..36e2706 100644
--- a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx
+++ b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx
@@ -102,8 +102,6 @@ const DataMeeting = () => {
                       options={status}
                     />
                   </div>
-                </div>
-                <div className="grid">
                   <div className="col-12 md:col-6">
                     <label>Justificativa</label>
                     <Padding />
diff --git a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx
index 2ab6f95..6b17b4a 100644
--- a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx
+++ b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx
@@ -4,12 +4,14 @@ import MeetingListRegistrationProvider, {
   MeetingListRegistrationContext,
 } from "../../../../../Context/Classroom/Meeting/MeetingListRegistration/context";
 import { MeetingListRegisterTypes } from "../../../../../Context/Classroom/Meeting/MeetingListRegistration/type";
-import { Status } from "../../../../../Controller/controllerGlobal";
+import { ROLE, Status } from "../../../../../Controller/controllerGlobal";
 import { Container, Padding } from "../../../../../Styles/styles";
 import AttendanceList from "./AttendanceListArchives";
 import Beneficiarios from "./Beneficiarios";
 import DataMeeting from "./DataMeeting";
 import UploadArchivesAttendanceList from "./UploadArchivesAttendanceList";
+import { AplicationContext } from "../../../../../Context/Aplication/context";
+import { PropsAplicationContext } from "../../../../../Types/types";
 
 const Meeting = () => {
   return (
@@ -23,8 +25,11 @@ const MeetingPage = () => {
   const props = useContext(
     MeetingListRegistrationContext
   ) as MeetingListRegisterTypes;
- 
-  
+
+  const propsAplication = useContext(
+    AplicationContext
+  ) as PropsAplicationContext;
+
   return (
     <Container>
       {props.meeting ? (
@@ -49,7 +54,12 @@ const MeetingPage = () => {
                 : "info"
             }
           />
-          <Padding padding="16px"  />
+          <Padding />
+          {props.meeting.justification &&
+            propsAplication.user?.role === ROLE.REAPPLICATORS && (
+              <h4>Justificativa: {props.meeting.justification}</h4>
+            )}
+          <Padding padding="16px" />
           <DataMeeting />
           <Padding padding="16px" />
           {true ? <UploadArchivesAttendanceList /> : <AttendanceList />}
diff --git a/src/Pages/Classroom/ClassroomOne/RegistrationList/Registration/index.tsx b/src/Pages/Classroom/ClassroomOne/RegistrationList/Registration/index.tsx
index e9485f0..2ee7d72 100644
--- a/src/Pages/Classroom/ClassroomOne/RegistrationList/Registration/index.tsx
+++ b/src/Pages/Classroom/ClassroomOne/RegistrationList/Registration/index.tsx
@@ -26,20 +26,47 @@ const RegistrationPage = () => {
     RegistrationDetailsContext
   ) as RegistrationDetailsTypes;
 
-  const { idRegistration, id } = useParams()
-  const { data: classroom } = useFetchRequestClassroomOne(parseInt(id!))
+  const { idRegistration, id } = useParams();
+  const { data: classroom } = useFetchRequestClassroomOne(parseInt(id!));
 
   return (
     <Container>
       <h2>{classroom?.name}</h2>
       <Padding padding="16px" />
       {props.registration ? (
-        <Formik initialValues={props.initialValue} onSubmit={(values) => { props.handleUpdateRegistration({ ...values }, parseInt(idRegistration!)) }}>
+        <Formik
+          initialValues={props.initialValue}
+          onSubmit={(values) => {
+            props.handleUpdateRegistration(
+              { ...values },
+              parseInt(idRegistration!)
+            );
+          }}
+        >
           {({ values, handleChange }) => {
             return (
               <Form>
                 <Button label="Salvar" />
                 <Padding padding="8px" />
+                <div className="grid">
+                  <div className="col-12 md:col-6">
+                    <label>Status</label>
+                    <Padding />
+                    <DropdownComponent
+                      value={values.status}
+                      onChange={handleChange}
+                      name="status"
+                      placerholder="Status"
+                      optionsLabel="name"
+                      options={[
+                        { id: Status.APPROVED, name: "Aprovado" },
+                        { id: Status.REPROVED, name: "Reprovado" },
+                        { id: Status.PENDING, name: "Pedente" },
+                      ]}
+                    />
+                  </div>
+                </div>{" "}
+                <Padding padding="8px" />
                 <h3>Dados basicos</h3>
                 <Padding />
                 <div className="grid">
@@ -115,24 +142,6 @@ const RegistrationPage = () => {
                     />
                   </div>
                 </div>{" "}
-                <div className="grid">
-                  <div className="col-12 md:col-6">
-                    <label>Status</label>
-                    <Padding />
-                    <DropdownComponent
-                      value={values.status}
-                      onChange={handleChange}
-                      name="status"
-                      placerholder="Status"
-                      optionsLabel="name"
-                      options={[
-                        {id: Status.APPROVED, name: "Aprovado"},
-                        {id: Status.REPROVED, name: "Reprovado"},
-                        {id: Status.PENDING, name: "Pedente"},
-                      ]}
-                    />
-                  </div>
-                </div>{" "}
                 <Padding padding="8px" />
                 <h3>Dados Responsavel</h3>
                 <Padding />
diff --git a/src/Pages/Login/Login.tsx b/src/Pages/Login/Login.tsx
index f073d2d..f8b63a3 100644
--- a/src/Pages/Login/Login.tsx
+++ b/src/Pages/Login/Login.tsx
@@ -77,6 +77,7 @@ const LoginPage = () => {
               height: "100%",
               width: "100%",
               position: "relative",
+              overflowY: "auto"
             }}
           >
             <div className="col-11 md:col-9">