Merge pull request #8 from ipti/new/registration

card icons, data registration,

src/Components/Card/CardClassroom/index.tsx

@@ -11,6 +11,9 @@ import Icon from "../../Icon";
 import pessoas from "../../../Assets/images/pessoasgray.svg"
 import meeting from "../../../Assets/images/school_teacher.svg"
 import styles from "../../../Styles";
+import { AplicationContext } from "../../../Context/Aplication/context";
+import { PropsAplicationContext } from "../../../Types/types";
+import { ROLE } from "../../../Controller/controllerGlobal";
 
 
 const CardClassroom = ({
@@ -27,6 +30,10 @@ const CardClassroom = ({
   const history = useNavigate();
   const [visible, setVisible] = useState(false);
 
+  const propsAplication = useContext(
+    AplicationContext
+  ) as PropsAplicationContext;
+
   const props = useContext(ClassroomContext) as ClassroomTypes;
 
   return (
@@ -42,15 +49,16 @@ const CardClassroom = ({
               <h3>{title}</h3>
             </Column>
           </Row>
-          <div
-            className="cursor-pointer"
-            onClick={(e) => {
-              e.stopPropagation();
-              setVisible(true);
-            }}
-          >
-            <Icon icon="pi pi-trash" color={styles.colors.colorGrayElephant} size="1rem" fontWeight="900" />
-          </div>
+          {(propsAplication.user?.role === ROLE.ADMIN ||
+            propsAplication.user?.role === ROLE.COORDINATORS) && <div
+              className="cursor-pointer"
+              onClick={(e) => {
+                e.stopPropagation();
+                setVisible(true);
+              }}
+            >
+              <Icon icon="pi pi-trash" color={styles.colors.colorGrayElephant} size="1rem" fontWeight="900" />
+            </div>}
         </Row>
         < Padding padding="8px" />
         <Row style={{ gap: 16 }}>

src/Components/Card/CardProject/index.tsx

@@ -1,37 +1,28 @@
 import { ConfirmDialog } from "primereact/confirmdialog";
 import { useContext, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import { ClassroomContext } from "../../../Context/Classroom/context";
 import { ClassroomTypes } from "../../../Context/Classroom/type";
 import { Column, Padding, Row } from "../../../Styles/styles";
-import IconClassroom from "./../../../Assets/images/cardturmas.svg";
+import IconClassroom from "./../../../Assets/images/project_card.svg";
 import { Container } from "./style";
-import Icon from "../../Icon";
-
-import pessoas from "../../../Assets/images/pessoasgray.svg"
-import meeting from "../../../Assets/images/school_teacher.svg"
-import styles from "../../../Styles";
 
 
 const CardProject = ({
   title,
-  meetingCount,
-  registrationCount,
   id,
 }: {
   title: string;
   meetingCount?: number;
   registrationCount?: number,
   id: number;
 }) => {
-  const history = useNavigate();
   const [visible, setVisible] = useState(false);
 
   const props = useContext(ClassroomContext) as ClassroomTypes;
 
   return (
     <>
-      <Container className="card" onClick={() => {}}>
+      <Container className="card" onClick={() => { }}>
         <Row id="space-between">
           <Row >
             <div className={`boxQuantity`}>

src/Components/Card/CardRegistration/index.tsx

@@ -6,10 +6,12 @@ import IconClasMedia from "../../../Assets/images/iconClasMedia.svg";
 import IconNotActive from "../../../Assets/images/notactiveRegistration.svg";
 import { RegistrationClassroomContext } from "../../../Context/Classroom/RegistrationsList/context";
 import { RegistrationClassroomTypes } from "../../../Context/Classroom/RegistrationsList/type";
-import { Status } from "../../../Controller/controllerGlobal";
+import { ROLE, Status } from "../../../Controller/controllerGlobal";
 import { Column, Padding, Row } from "../../../Styles/styles";
 import Icon from "../../Icon";
 import { Container } from "./style";
+import { AplicationContext } from "../../../Context/Aplication/context";
+import { PropsAplicationContext } from "../../../Types/types";
 
 const CardRegistration = ({
   title,
@@ -29,31 +31,38 @@ const CardRegistration = ({
 
   const { id } = useParams();
 
+  const propsAplication = useContext(
+    AplicationContext
+  ) as PropsAplicationContext;
+
   const props = useContext(
     RegistrationClassroomContext
   ) as RegistrationClassroomTypes;
 
-  console.log(idRegistration);
   return (
     <>
       <Container
         className="card cursor-pointer"
         onClick={(e) => {
           e.stopPropagation();
-          history(`/turma/${id}/aluno/${idRegistration}`);
+          if ((propsAplication.user?.role === ROLE.ADMIN ||
+            propsAplication.user?.role === ROLE.COORDINATORS)) {
+            history(`/turma/${id}/aluno/${idRegistration}`);
+          }
         }}
       >
         <Row id="space-between">
           <h3>{subtitle}</h3>
-          <div
-            className="cursor-pointer"
-            onClick={(e) => {
-              e.stopPropagation();
-              setVisible(true);
-            }}
-          >
-            <Icon icon="pi pi-trash" size="1rem" />
-          </div>
+          {(propsAplication.user?.role === ROLE.ADMIN ||
+            propsAplication.user?.role === ROLE.COORDINATORS) && <div
+              className="cursor-pointer"
+              onClick={(e) => {
+                e.stopPropagation();
+                setVisible(true);
+              }}
+            >
+              <Icon icon="pi pi-trash" size="1rem" />
+            </div>}
         </Row>
         <Padding padding="8px" />
         <Row>
@@ -64,10 +73,10 @@ const CardRegistration = ({
                   status === statuGlobal.APPROVED
                     ? IconActive
                     : status === statuGlobal.PENDING
-                    ? IconClasMedia
-                    : status === statuGlobal.REPROVED
-                    ? IconNotActive
-                    : ""
+                      ? IconClasMedia
+                      : status === statuGlobal.REPROVED
+                        ? IconNotActive
+                        : ""
                 }
                 alt=""
                 style={{ height: 40 }}
@@ -84,10 +93,10 @@ const CardRegistration = ({
               {status === statuGlobal.APPROVED
                 ? "Aprovado"
                 : status === statuGlobal.PENDING
-                ? "Pendente"
-                : status === statuGlobal.REPROVED
-                ? "Reprovado"
-                : ""}
+                  ? "Pendente"
+                  : status === statuGlobal.REPROVED
+                    ? "Reprovado"
+                    : ""}
             </div>
           </Column>
         </Row>

src/Components/Card/CardTs/index.tsx

@@ -1,33 +1,29 @@
 import { ConfirmDialog } from "primereact/confirmdialog";
 import { useContext, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import { ClassroomContext } from "../../../Context/Classroom/context";
 import { ClassroomTypes } from "../../../Context/Classroom/type";
 import { Column, Padding, Row } from "../../../Styles/styles";
-import IconClassroom from "./../../../Assets/images/cardturmas.svg";
+import IconClassroom from "./../../../Assets/images/ts_card.svg";
 import { Container } from "./style";
 
 
 
 const CardTs = ({
   title,
-  meetingCount,
-  registrationCount,
   id,
 }: {
   title: string;
   meetingCount?: number;
   registrationCount?: number,
   id: number;
 }) => {
-  const history = useNavigate();
   const [visible, setVisible] = useState(false);
 
   const props = useContext(ClassroomContext) as ClassroomTypes;
 
   return (
     <>
-      <Container className="card" onClick={() => {}}>
+      <Container className="card" onClick={() => { }}>
         <Row id="space-between">
           <Row >
             <div className={`boxQuantity`}>

src/Components/Menu/index.tsx

@@ -21,15 +21,18 @@ import { Container } from "./style";
 import turmasHover from "../../Assets/images/turmasPessoas.svg";
 
 import turmas from "../../Assets/images/peoples.svg";
-import home from "../../Assets/images/iconsMenu/home.svg";
-import homeHover from "../../Assets/images/iconsMenu/home_active.svg";
+// import home from "../../Assets/images/iconsMenu/home.svg";
+// import homeHover from "../../Assets/images/iconsMenu/home_active.svg";
 
 import tecnologia from "../../Assets/images/iconsMenu/digital_wellbeing.svg";
 
 import tecnologia_hover from "../../Assets/images/iconsMenu/digital_wellbeing_active.svg";
 import projeto from "../../Assets/images/iconsMenu/note_add.svg";
 import projeto_hover from "../../Assets/images/iconsMenu/note_add_active.svg";
 
+import beneficiaries from "../../Assets/images/iconsMenu/diversity_4.svg";
+import beneficiaries_hover from "../../Assets/images/iconsMenu/diversity_hover.svg";
+
 // import ajuda from "../../Assets/images/question_mark.svg";
 
 import user from "../../Assets/images/iconsMenu/person.svg";
@@ -130,11 +133,11 @@ const Menu = ({ viewdMenu }: { viewdMenu: boolean }) => {
             }}
             active={active === 5 ? true : false}
             path={"/beneficiarios"}
-            icon={active === 5 ? turmasHover : turmas}
+            icon={active === 5 ? beneficiaries_hover : beneficiaries}
           />
           <Padding />
           {props.user?.role === ROLE.ADMIN ||
-          props.user?.role === ROLE.COORDINATORS ? (
+            props.user?.role === ROLE.COORDINATORS ? (
             <Item
               text={"Usuarios"}
               funcActiv={() => {

src/Context/Aplication/state.tsx

@@ -25,7 +25,6 @@ const AplicationState = () => {
                 idTs(projects[0]?.id?.toString())
             }
 
-
         }
         if (userRequest) {
             setuser(userRequest)

src/Context/Beneficiaries/BeneficiaresEdit/state.tsx

@@ -6,6 +6,7 @@ import {
 } from "../../../Services/PreRegistration/query";
 import { Registration } from "./type";
 import {
+  converterData,
   formatarData,
   getStatus,
   VerifyColor,
@@ -36,9 +37,9 @@ export const BeneficiariesEditState = () => {
 
   useEffect(() => {
     if (classroomsFetch) {
-        setClassrooms(classroomsFetch)
+      setClassrooms(classroomsFetch)
     }
-}, [classroomsFetch, project])
+  }, [classroomsFetch, project])
 
   useEffect(() => {
     if (registrationsRequests) {
@@ -77,7 +78,7 @@ export const BeneficiariesEditState = () => {
     requestPreRegistrationMutation.mutate({
       data: {
         ...data,
-        birthday: data?.birthday,
+        birthday: converterData(data?.birthday?.toString()!),
         responsable_telephone: data?.responsable_telephone?.replace(
           /[^a-zA-Z0-9]/g,
           ""

src/Context/Classroom/Registration/state.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
-import { VerifyColor, VerifySex, formatarData, getStatus } from "../../../Controller/controllerGlobal";
+import { VerifyColor, VerifySex, converterData, formatarData, getStatus } from "../../../Controller/controllerGlobal";
 import { ControllerUpdateRegistration } from "../../../Services/PreRegistration/controller";
 import { useFetchRequestClassroomRegistrationOne } from "../../../Services/PreRegistration/query";
 import { RegistrationType, UpdateRegister } from "./type";
@@ -43,7 +43,7 @@ export const RegistrationClassroomState = () => {
       data: {
         ...data,
         registration_classroom_id: registration?.id,
-        birthday: registration?.registration.birthday,
+        birthday: converterData(data.birthday?.toString()!),
         responsable_telephone: data?.responsable_telephone?.replace(
           /[^a-zA-Z0-9]/g,
           ""

src/Controller/controllerGlobal.tsx

@@ -17,6 +17,21 @@ export function formatarData(data: string): string {
   return dataEdit;
 }
 
+export function converterData(data: string) {
+  // Divide a string pelo separador "/"
+  const partes = data.split('/');
+
+  // As partes serão: partes[0] = dia, partes[1] = mês, partes[2] = ano
+  const dia = partes[0];
+  const mes = partes[1];
+  const ano = partes[2];
+
+  // Reorganiza no formato YYYY-MM-DD
+  const dataFormatada = `${ano}-${mes}-${dia}`;
+
+  return dataFormatada;
+}
+
 export function somarNumeros(num1: number, num2: number): number {
   console.log(num1 + num2);
   console.log(num1, num2);