troca na rota de registration

Author: jonnypaulino

src/Components/Layout/layout.tsx

@@ -1,22 +1,28 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Column, Row } from "../../Styles/styles";
 import Menu from "../Menu";
 import TopBar from "./TopBar";
 
 const Layout = ({ children }: { children: React.ReactNode }) => {
-    const [viewdMenu, setViewdMenu] = useState(true)
+  const [viewdMenu, setViewdMenu] = useState(true);
 
-    return (
-        <Column style={{ height: "100%" }}>
-            <Row style={{ height: "100%" }}>
-                <Menu viewdMenu={viewdMenu} />
-                <Column style={{ width: "100%" }}>
-                    <TopBar setViewdMenu={setViewdMenu} viewdMenu={viewdMenu} />
-                    <div style={{ overflowY: "auto",  height: "100%" }}>{children}</div>
-                </Column>
-            </Row>
+  useEffect(() => {
+    if (window.innerWidth < 1020) {
+      setViewdMenu(false);
+    }
+  }, []);
+
+  return (
+    <Column style={{ height: "100%" }}>
+      <Row style={{ height: "100%" }}>
+        <Menu viewdMenu={viewdMenu} />
+        <Column style={{ width: "100%" }}>
+          <TopBar setViewdMenu={setViewdMenu} viewdMenu={viewdMenu} />
+          <div style={{ overflowY: "auto", height: "100%" }}>{children}</div>
         </Column>
-    )
-}
+      </Row>
+    </Column>
+  );
+};
 
-export default Layout;
+export default Layout;

src/Context/Classroom/Registration/state.tsx

@@ -6,9 +6,8 @@ import { useFetchRequestClassroomRegistrationOne } from "../../../Services/PreRe
 import { formatarData, Status } from "../../../Controller/controllerGlobal";
 export const RegistrationClassroomState = () => {
   const { idRegistration } = useParams();
-  const { data: registrationRequest, isLoading } = useFetchRequestClassroomRegistrationOne(
-    parseInt(idRegistration!)
-  );
+  const { data: registrationRequest, isLoading } =
+    useFetchRequestClassroomRegistrationOne(parseInt(idRegistration!));
 
   const { requestPreRegistrationMutation } = ControllerUpdateRegistration();
 
@@ -44,34 +43,48 @@ export const RegistrationClassroomState = () => {
     return color.find((props) => props.id === color_race);
   };
 
-  const date = new Date(registration?.birthday!);
+  const date = new Date(registration?.registration.birthday!);
 
   const status = [
     { id: Status.APPROVED, name: "Aprovado" },
     { id: Status.REPROVED, name: "Reprovado" },
     { id: Status.PENDING, name: "Pedente" },
-  ]
+  ];
 
   const getStatus = (id: string) => {
-    return status.find(props => props.id === id)
-  }
+    return status.find((props) => props.id === id);
+  };
   const initialValue = {
-    name: registration?.name,
-    sex: VerifySex(registration?.sex!),
-    cpf: registration?.cpf,
-    color_race: VerifyColor(registration?.color_race!),
-    birthday: !isNaN(date.getTime()) ? formatarData(registration?.birthday!) : registration?.birthday,
-    deficiency: registration?.deficiency
+    name: registration?.registration.name,
+    sex: VerifySex(registration?.registration.sex!),
+    cpf: registration?.registration.cpf,
+    color_race: VerifyColor(registration?.registration.color_race!),
+    birthday: !isNaN(date.getTime())
+      ? formatarData(registration?.registration.birthday!)
+      : registration?.registration.birthday,
+    deficiency: registration?.registration.deficiency
       ? { name: "Sim", id: true }
       : { name: "Não", id: false },
-    responsable_name: registration?.responsable_name,
-    responsable_cpf: registration?.responsable_cpf,
-    responsable_telephone: registration?.responsable_telephone,
+    responsable_name: registration?.registration.responsable_name,
+    responsable_cpf: registration?.registration.responsable_cpf,
+    responsable_telephone: registration?.registration.responsable_telephone,
     status: getStatus(registration?.status!),
   };
 
   const handleUpdateRegistration = (data: UpdateRegister, id: number) => {
-    requestPreRegistrationMutation.mutate({ data: { ...data, birthday: registration?.birthday, responsable_telephone: data?.responsable_telephone?.replace(/[^a-zA-Z0-9]/g, ''), responsable_cpf: data?.responsable_cpf?.replace(/[^a-zA-Z0-9]/g, '') }, id: id });
+    requestPreRegistrationMutation.mutate({
+      data: {
+        ...data,
+        registration_classroom_id: registration?.id,
+        birthday: registration?.registration.birthday,
+        responsable_telephone: data?.responsable_telephone?.replace(
+          /[^a-zA-Z0-9]/g,
+          ""
+        ),
+        responsable_cpf: data?.responsable_cpf?.replace(/[^a-zA-Z0-9]/g, ""),
+      },
+      id: id,
+    });
   };
 
   return {
@@ -80,6 +93,6 @@ export const RegistrationClassroomState = () => {
     typesex,
     color,
     handleUpdateRegistration,
-    isLoading
+    isLoading,
   };
 };

src/Context/Classroom/Registration/type.tsx

@@ -35,21 +35,32 @@ export interface UpdateRegister
     responsable_cpf: string | undefined;
     responsable_telephone: string | undefined;
     status: {id: string, name: string} | undefined;
+    registration_classroom_id?: number
 }
-
 export interface RegistrationType {
-  id: number;
-  classroom_fk?: number;
-  name?: string;
-  birthday?: string;
-  cpf?: string;
-  sex?: number;
-  color_race?: number;
-  deficiency?: boolean;
-  deficiency_description?: string | null;
-  responsable_name?: string;
-  responsable_cpf?: string;
-  responsable_telephone?: string;
-  zone?: number;
-  status?: string;
+  id: number
+  registration_fk: number
+  classroom_fk: number
+  status: string
+  createdAt: string
+  updatedAt: string
+  registration: Registration
+}
+
+export interface Registration {
+  id: number
+  name: string
+  birthday: string
+  cpf: string
+  sex: number
+  color_race: number
+  deficiency: boolean
+  deficiency_description: any
+  responsable_name: string
+  responsable_cpf: string
+  responsable_telephone: string
+  zone: number
+  status: string
+  createdAt: string
+  updatedAt: string
 }

src/Context/Classroom/RegistrationsList/type.tsx

@@ -16,7 +16,8 @@ export interface RegistrationType {
   classroom_fk: number
   createdAt: string
   updatedAt: string
-  registration: Registration
+  registration: Registration,
+  status: string
 }
 
 export interface Registration {

src/Pages/Classroom/ClassroomOne/RegistrationList/Registration/index.tsx

@@ -27,7 +27,7 @@ const RegistrationPage = () => {
     RegistrationDetailsContext
   ) as RegistrationDetailsTypes;
 
-  const { idRegistration, id } = useParams();
+  const { id } = useParams();
   const { data: classroom } = useFetchRequestClassroomOne(parseInt(id!));
 
   if (props.isLoading) return <Loading />;
@@ -42,7 +42,7 @@ const RegistrationPage = () => {
           onSubmit={(values) => {
             props.handleUpdateRegistration(
               { ...values },
-              parseInt(idRegistration!)
+              props.registration?.registration_fk!
             );
           }}
         >

src/Pages/Classroom/ClassroomOne/RegistrationList/index.tsx

@@ -37,7 +37,7 @@ const RegistrationListPage = () => {
         {props.registrations?.map((item, index) => {
           return (
             <div className="col-12 md:col-6 lg:col-4" key={index}>
-              <CardRegistration title={item.registration.id.toString()} subtitle={item.registration.name} idRegistration={item.registration.id} status={item.registration.status} />
+              <CardRegistration title={item.registration.id.toString()} subtitle={item.registration.name} idRegistration={item.id} status={item.status} />
             </div>
           );
         })}

src/Services/PreRegistration/request.tsx

@@ -69,7 +69,7 @@ export const requestClassroomRegistration = (id: number) => {
 };
 
 export const requestClassroomRegistrationOne = (id: number) => {
-  let path = "/registration/" + id;
+  let path = "/registration-token-bff/one?idRegistrationClassroom=" + id;
   return http
     .get(path)
     .then(response => response.data)