fix: editar turma coordenadores, status turmas e label tema do encontro

ipti · Jan 7, 2025 · 03cf740 · 03cf740
1 parent f07136c
commit 03cf740
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git 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/
+# REACT_APP_API_PATH=http://localhost:3000/
+REACT_APP_API_PATH=https://br-ipti-beneficiarios.azurewebsites.net/
diff --git a/src/Components/Card/CardClassroom/index.tsx b/src/Components/Card/CardClassroom/index.tsx
@@ -92,11 +92,11 @@ const CardClassroom = ({
               <Row style={{ fontSize: "10px" }}>
                 Status: {" "}<Padding padding="2px" />
                 {status === Status.PENDING ? (
-                  <p style={{ fontWeight: "600" }}> Pendente</p>
+                  <p style={{ fontWeight: "600" }}> Em andamento</p>
                 ) : status === Status.APPROVED ? (
                   <p style={{ fontWeight: "600" }}> Finalizado</p>
-                ) : status === Status.REPROVED ? (
-                  <p style={{ fontWeight: "600" }}> Reprovado</p>
+                ) : status === Status.CANCELED ? (
+                  <p style={{ fontWeight: "600" }}> Cancelada</p>
                 ) : null}
               </Row>
             </Row>

diff --git a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/DataMeeting/index.tsx
@@ -90,9 +90,10 @@ const DataMeeting = () => {
             <Padding padding="16px" />
             <div className="grid">
               <div className="col-12 md:col-6">
-                <label></label>
+                <label>Tema</label>
                 <TextInput
                   name="theme"
+                  placeholder="Tema do encontro"
                   value={values.theme}
                   disabled={!edit}
                   onChange={handleChange}

diff --git a/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx b/src/Pages/Classroom/ClassroomOne/MeetingList/Meeting/index.tsx
@@ -68,8 +68,8 @@ const MeetingPage = () => {
                 />
               </div>
             </Column>
-            {props.meeting.justification &&
-              propsAplication.user?.role === ROLE.REAPPLICATORS && (
+            {(props.meeting.justification &&
+              propsAplication.user?.role === ROLE.REAPPLICATORS) && (
                 <div className="col-12 md:col-6">
                   <label>Justificativa</label>
                   <Padding />

diff --git a/src/Pages/Classroom/ClassroomOne/index.tsx b/src/Pages/Classroom/ClassroomOne/index.tsx
@@ -103,8 +103,8 @@ const ClassroomOnePage = () => {
           <Row id="end">
             <Row>
               <Padding />
-              {propsAplication.user?.role ===
-                (ROLE.ADMIN || ROLE.COORDINATORS) && (
+              {(propsAplication.user?.role ===
+                ROLE.ADMIN || propsAplication.user?.role === ROLE.COORDINATORS) && (
                   <Button
                     text
                     label="Editar"
@@ -113,8 +113,8 @@ const ClassroomOnePage = () => {
                   />
                 )}
             </Row>
-            {propsAplication.user?.role ===
-              (ROLE.ADMIN || ROLE.COORDINATORS) && (
+            {(propsAplication.user?.role ===
+                ROLE.ADMIN || propsAplication.user?.role === ROLE.COORDINATORS) && (
                 <Button
                   text
                   label="Tranferir turma"