From c957de56556a1c545af3c7a58ab891a012492579 Mon Sep 17 00:00:00 2001 From: TI JONNY Date: Wed, 26 Jun 2024 17:08:28 -0300 Subject: [PATCH 1/4] new component in pages for title and description and kiship --- src/Components/ContentPage/index.tsx | 16 +++++ .../BeneficiaresCreate/state.tsx | 3 +- .../Beneficiaries/BeneficiaresCreate/type.ts | 1 + .../Beneficiaries/BeneficiaresEdit/state.tsx | 3 +- .../Beneficiaries/BeneficiaresEdit/type.ts | 1 + src/Context/Classroom/Registration/state.tsx | 3 +- src/Context/Classroom/Registration/type.tsx | 2 + src/Context/Register/type.tsx | 1 + src/Controller/controllerGlobal.tsx | 15 +++++ .../BeneficiariesCreate/index.tsx | 37 ++++++++--- .../ModalCreateRegisterClassroom/index.tsx | 2 +- .../Beneficiaries/BeneficiariesEdit/index.tsx | 14 ++++ .../Beneficiaries/BeneficiariesList/index.tsx | 8 +-- src/Pages/Classroom/ClassroomCriar/index.tsx | 61 +++++++++++++++++ .../MeetingList/CreateMeeting/index.tsx | 12 ++-- .../ClassroomOne/MeetingList/index.tsx | 18 ++--- .../RegistrationList/Registration/index.tsx | 16 ++--- .../ClassroomOne/RegistrationList/index.tsx | 8 +-- src/Pages/Classroom/ClassroomOne/index.tsx | 12 ++-- src/Pages/Classroom/FormClassroom/index.tsx | 65 ------------------- src/Pages/Classroom/ListClassroom/index.tsx | 21 +++--- src/Pages/Help/index.tsx | 8 +-- src/Pages/InitialPage/index.tsx | 11 ++-- src/Pages/Projects/CreateProjects/index.tsx | 14 ++-- src/Pages/Projects/ProjectOne/index.tsx | 14 ++-- src/Pages/Projects/ProjectsList/index.tsx | 10 ++- .../Wizard/Steps/StepTwo/UnderAge/index.tsx | 30 +++++++-- .../CreateTechnologySocial/index.tsx | 10 +-- .../TecnologySocialList/index.tsx | 12 ++-- .../TecnologySocialOne/index.tsx | 15 +++-- src/Pages/Users/CreateUser/index.tsx | 8 +-- src/Pages/Users/ListUsers.tsx | 10 +-- src/Router/router.tsx | 2 +- 33 files changed, 272 insertions(+), 191 deletions(-) create mode 100644 src/Components/ContentPage/index.tsx create mode 100644 src/Pages/Classroom/ClassroomCriar/index.tsx delete mode 100644 src/Pages/Classroom/FormClassroom/index.tsx diff --git a/src/Components/ContentPage/index.tsx b/src/Components/ContentPage/index.tsx new file mode 100644 index 0000000..4d7fc97 --- /dev/null +++ b/src/Components/ContentPage/index.tsx @@ -0,0 +1,16 @@ +import { ReactNode } from "react"; +import { Container, Padding } from "../../Styles/styles" + +const ContentPage = ({ description, title, children }: { title: string, description: string, children: ReactNode }) => { + return ( + +

{title}

+ +

{description}

+ + {children} + + ) +} + +export default ContentPage; \ No newline at end of file diff --git a/src/Context/Beneficiaries/BeneficiaresCreate/state.tsx b/src/Context/Beneficiaries/BeneficiaresCreate/state.tsx index 2ec8d22..68386c2 100644 --- a/src/Context/Beneficiaries/BeneficiaresCreate/state.tsx +++ b/src/Context/Beneficiaries/BeneficiaresCreate/state.tsx @@ -47,7 +47,8 @@ export const BeneficiariesCreateState = () => { project: undefined, status: "", classroom: 0, - deficiency_description: "" + deficiency_description: "", + kinship: "" }; return { initialValue, diff --git a/src/Context/Beneficiaries/BeneficiaresCreate/type.ts b/src/Context/Beneficiaries/BeneficiaresCreate/type.ts index e47d87c..1c35190 100644 --- a/src/Context/Beneficiaries/BeneficiaresCreate/type.ts +++ b/src/Context/Beneficiaries/BeneficiaresCreate/type.ts @@ -17,6 +17,7 @@ export interface BeneficiariesCreateType { zone: number | undefined, project: number | undefined, deficiency_description: string | undefined + kinship: string }; tsOne: Tsone | undefined; project: any | undefined; diff --git a/src/Context/Beneficiaries/BeneficiaresEdit/state.tsx b/src/Context/Beneficiaries/BeneficiaresEdit/state.tsx index c6f7566..fd0a8b4 100644 --- a/src/Context/Beneficiaries/BeneficiaresEdit/state.tsx +++ b/src/Context/Beneficiaries/BeneficiaresEdit/state.tsx @@ -64,7 +64,8 @@ export const BeneficiariesEditState = () => { responsable_cpf: registrations?.responsable_cpf, responsable_telephone: registrations?.responsable_telephone, status: getStatus(registrations?.status!), - deficiency_description: registrations?.deficiency_description + deficiency_description: registrations?.deficiency_description, + kinship: registrations?.kinship }; diff --git a/src/Context/Beneficiaries/BeneficiaresEdit/type.ts b/src/Context/Beneficiaries/BeneficiaresEdit/type.ts index 6e4cb83..2559110 100644 --- a/src/Context/Beneficiaries/BeneficiaresEdit/type.ts +++ b/src/Context/Beneficiaries/BeneficiaresEdit/type.ts @@ -32,6 +32,7 @@ export interface Registration { createdAt: string; updatedAt: string; register_classroom: RegisterClassroom[]; + kinship: string } export interface RegisterClassroom { diff --git a/src/Context/Classroom/Registration/state.tsx b/src/Context/Classroom/Registration/state.tsx index 8662077..bfe4f8c 100644 --- a/src/Context/Classroom/Registration/state.tsx +++ b/src/Context/Classroom/Registration/state.tsx @@ -36,7 +36,8 @@ export const RegistrationClassroomState = () => { responsable_cpf: registration?.registration.responsable_cpf, responsable_telephone: registration?.registration.responsable_telephone, status: getStatus(registration?.status!), - deficiency_description: registration?.registration.deficiency_description + deficiency_description: registration?.registration.deficiency_description, + kinship: registration?.registration.kinship }; diff --git a/src/Context/Classroom/Registration/type.tsx b/src/Context/Classroom/Registration/type.tsx index d3c3553..a42c11a 100644 --- a/src/Context/Classroom/Registration/type.tsx +++ b/src/Context/Classroom/Registration/type.tsx @@ -29,6 +29,7 @@ export interface UpdateRegister status: {id: string, name: string} | undefined; registration_classroom_id?: number deficiency_description: any + kinship: string | undefined } export interface RegistrationType { id: number @@ -56,4 +57,5 @@ export interface Registration { status: string createdAt: string updatedAt: string + kinship: string } diff --git a/src/Context/Register/type.tsx b/src/Context/Register/type.tsx index 532d1f0..cb95491 100644 --- a/src/Context/Register/type.tsx +++ b/src/Context/Register/type.tsx @@ -35,6 +35,7 @@ export interface Registration { responsable_name?: string; responsable_cpf?: string; responsable_telephone?: string; + kinship?: string; zone: number | null; } diff --git a/src/Controller/controllerGlobal.tsx b/src/Controller/controllerGlobal.tsx index 1aec06b..1131a44 100644 --- a/src/Controller/controllerGlobal.tsx +++ b/src/Controller/controllerGlobal.tsx @@ -87,6 +87,21 @@ export const ROLE = { COORDINATORS: "COORDINATORS", }; +export const kinship = [ + { id: "CONJUGE", name: 'Cônjuge' }, + { id: "FILHO_A", name: 'Filho(a)' }, + { id: "ENTEADO_A", name: 'Enteado(a)' }, + { id: "NETO_A", name: 'Neto(a)' }, + { id: "PAI", name: 'Pai' }, + { id: "MAE", name: 'Mãe' }, + { id: "SOGRO_A", name: 'Sogro(a)' }, + { id: "IRMAO_A", name: 'Irmão(a)' }, + { id: "GENRO", name: 'Genro' }, + { id: "NORA", name: 'Nora' }, + { id: "OUTRO", name: 'Outro' }, + { id: "NAO_PARENTE", name: 'Não Parente' } +] + export const loadImageFileAsBase64 = (imagePath: string): Promise => { return new Promise((resolve, reject) => { fetch(imagePath) diff --git a/src/Pages/Beneficiaries/BeneficiariesCreate/index.tsx b/src/Pages/Beneficiaries/BeneficiariesCreate/index.tsx index 6142306..37152c6 100644 --- a/src/Pages/Beneficiaries/BeneficiariesCreate/index.tsx +++ b/src/Pages/Beneficiaries/BeneficiariesCreate/index.tsx @@ -1,20 +1,21 @@ import { Form, Formik } from "formik"; import { Button } from "primereact/button"; import { useContext } from "react"; +import * as Yup from "yup"; +import CalendarComponent from "../../../Components/Calendar"; +import ContentPage from "../../../Components/ContentPage"; import DropdownComponent from "../../../Components/Dropdown"; import MaskInput from "../../../Components/InputMask"; import Loading from "../../../Components/Loading"; +import RadioButtonComponent from "../../../Components/RadioButton"; import TextInput from "../../../Components/TextInput"; import BeneficiariesCreateProvider, { BeneficiariesCreateContext, } from "../../../Context/Beneficiaries/BeneficiaresCreate/context"; import { BeneficiariesCreateType } from "../../../Context/Beneficiaries/BeneficiaresCreate/type"; -import { color_race, typesex } from "../../../Controller/controllerGlobal"; -import { Column, Container, Padding, Row } from "../../../Styles/styles"; -import CalendarComponent from "../../../Components/Calendar"; -import * as Yup from "yup"; +import { color_race, kinship, typesex } from "../../../Controller/controllerGlobal"; import { validaCPF } from "../../../Controller/controllerValidCPF"; -import RadioButtonComponent from "../../../Components/RadioButton"; +import { Column, Padding, Row } from "../../../Styles/styles"; const BeneficiariesCreate = () => { return ( @@ -59,8 +60,7 @@ const RegistrationPage = () => { if (false) return ; return ( - -

Criar Beneficiario

+ {true ? ( { placeholder="Telefone para contato" /> {errors.responsable_telephone && - touched.responsable_telephone ? ( + touched.responsable_telephone ? (
{errors.responsable_telephone}
@@ -288,6 +288,25 @@ const RegistrationPage = () => { ) : null} +
+ +
+ +
+ + {errors.kinship && touched.kinship ? ( +
+ {errors.kinship} +
+ ) : null} +
{" "}

Matricula *

@@ -381,7 +400,7 @@ const RegistrationPage = () => { }} ) : null} - + ); }; export default BeneficiariesCreate; diff --git a/src/Pages/Beneficiaries/BeneficiariesEdit/ModalCreateRegisterClassroom/index.tsx b/src/Pages/Beneficiaries/BeneficiariesEdit/ModalCreateRegisterClassroom/index.tsx index 7973a6d..0427bc8 100644 --- a/src/Pages/Beneficiaries/BeneficiariesEdit/ModalCreateRegisterClassroom/index.tsx +++ b/src/Pages/Beneficiaries/BeneficiariesEdit/ModalCreateRegisterClassroom/index.tsx @@ -38,7 +38,7 @@ const ModalCreateRegisterClassroom = ({
- + { onChange={handleChange} />
+
+ + + +
+
{" "}

Matriculas

diff --git a/src/Pages/Beneficiaries/BeneficiariesList/index.tsx b/src/Pages/Beneficiaries/BeneficiariesList/index.tsx index 3d706c7..0d2565b 100644 --- a/src/Pages/Beneficiaries/BeneficiariesList/index.tsx +++ b/src/Pages/Beneficiaries/BeneficiariesList/index.tsx @@ -7,6 +7,7 @@ import { InputText } from "primereact/inputtext"; import { Paginator } from "primereact/paginator"; import { useContext, useState } from "react"; import { useNavigate } from "react-router-dom"; +import ContentPage from "../../../Components/ContentPage"; import BeneficiariesListProvider, { BeneficiariesListContext, } from "../../../Context/Beneficiaries/BeneficiariesList/context"; @@ -16,7 +17,7 @@ import { somarNumeros, } from "../../../Controller/controllerGlobal"; import color from "../../../Styles/colors"; -import { Container, Padding, Row } from "../../../Styles/styles"; +import { Padding, Row } from "../../../Styles/styles"; import ModalFilter from "./ModalFilter"; const BeneficiariesList = () => { @@ -89,8 +90,7 @@ const BeneficiariesListPage = () => { return ( <> - -

Beneficiários

+ {props.nameFilter?.length! > 0 && ( @@ -139,7 +139,7 @@ const BeneficiariesListPage = () => { }} rows={props.limite} /> - + setVisible(false)} diff --git a/src/Pages/Classroom/ClassroomCriar/index.tsx b/src/Pages/Classroom/ClassroomCriar/index.tsx new file mode 100644 index 0000000..bb02898 --- /dev/null +++ b/src/Pages/Classroom/ClassroomCriar/index.tsx @@ -0,0 +1,61 @@ +import { Form, Formik } from "formik"; +import { Button } from "primereact/button"; +import { useContext } from "react"; +import { useParams } from "react-router-dom"; +import ContentPage from "../../../Components/ContentPage"; +import Loading from "../../../Components/Loading"; +import TextInput from "../../../Components/TextInput"; +import ClassroomProvider, { ClassroomContext } from "../../../Context/Classroom/context"; +import { ClassroomTypes } from "../../../Context/Classroom/type"; +import { getYear } from "../../../Services/localstorage"; +import { Padding, Row } from "../../../Styles/styles"; + +const FormClassroom = () => { + return ( + + + + ) +} + +const FormClassroomPage = () => { + + const { id } = useParams() + + const initialValues = { + name: "" + } + + const props = useContext(ClassroomContext) as ClassroomTypes + + if (props.isLoading) return ; + + + return ( + + + { props.CreateClassroom({ ...values, project: parseInt(id!), year: parseInt(getYear()!) }) }}> + {({ values, errors, handleChange, touched }) => { + return ( + + + + + + {errors.name && touched.name ? ( +
{errors.name}
+ ) : null} + + +