Skip to content

Commit f511dea

Browse files
author
TI JONNY
committed
card icons, data registration,
1 parent e9ccddc commit f511dea

File tree

22 files changed

+390
-335
lines changed

22 files changed

+390
-335
lines changed

‎src/Assets/images/iconsMenu/diversity_4.svg

Lines changed: 8 additions & 0 deletions
Loading

‎src/Assets/images/iconsMenu/diversity_hover.svg

Lines changed: 8 additions & 0 deletions
Loading

‎src/Assets/images/project_card.svg

Lines changed: 9 additions & 0 deletions
Loading

‎src/Assets/images/ts_card.svg

Lines changed: 9 additions & 0 deletions
Loading

‎src/Components/Card/CardClassroom/index.tsx

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import Icon from "../../Icon";
1111
import pessoas from "../../../Assets/images/pessoasgray.svg"
1212
import meeting from "../../../Assets/images/school_teacher.svg"
1313
import styles from "../../../Styles";
14+
import { AplicationContext } from "../../../Context/Aplication/context";
15+
import { PropsAplicationContext } from "../../../Types/types";
16+
import { ROLE } from "../../../Controller/controllerGlobal";
1417

1518

1619
const CardClassroom = ({
@@ -27,6 +30,10 @@ const CardClassroom = ({
2730
const history = useNavigate();
2831
const [visible, setVisible] = useState(false);
2932

33+
const propsAplication = useContext(
34+
AplicationContext
35+
) as PropsAplicationContext;
36+
3037
const props = useContext(ClassroomContext) as ClassroomTypes;
3138

3239
return (
@@ -42,15 +49,16 @@ const CardClassroom = ({
4249
<h3>{title}</h3>
4350
</Column>
4451
</Row>
45-
<div
46-
className="cursor-pointer"
47-
onClick={(e) => {
48-
e.stopPropagation();
49-
setVisible(true);
50-
}}
51-
>
52-
<Icon icon="pi pi-trash" color={styles.colors.colorGrayElephant} size="1rem" fontWeight="900" />
53-
</div>
52+
{(propsAplication.user?.role === ROLE.ADMIN ||
53+
propsAplication.user?.role === ROLE.COORDINATORS) && <div
54+
className="cursor-pointer"
55+
onClick={(e) => {
56+
e.stopPropagation();
57+
setVisible(true);
58+
}}
59+
>
60+
<Icon icon="pi pi-trash" color={styles.colors.colorGrayElephant} size="1rem" fontWeight="900" />
61+
</div>}
5462
</Row>
5563
< Padding padding="8px" />
5664
<Row style={{ gap: 16 }}>

‎src/Components/Card/CardProject/index.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
import { ConfirmDialog } from "primereact/confirmdialog";
22
import { useContext, useState } from "react";
3-
import { useNavigate } from "react-router-dom";
43
import { ClassroomContext } from "../../../Context/Classroom/context";
54
import { ClassroomTypes } from "../../../Context/Classroom/type";
65
import { Column, Padding, Row } from "../../../Styles/styles";
7-
import IconClassroom from "./../../../Assets/images/cardturmas.svg";
6+
import IconClassroom from "./../../../Assets/images/project_card.svg";
87
import { Container } from "./style";
9-
import Icon from "../../Icon";
10-
11-
import pessoas from "../../../Assets/images/pessoasgray.svg"
12-
import meeting from "../../../Assets/images/school_teacher.svg"
13-
import styles from "../../../Styles";
148

159

1610
const CardProject = ({
1711
title,
18-
meetingCount,
19-
registrationCount,
2012
id,
2113
}: {
2214
title: string;
2315
meetingCount?: number;
2416
registrationCount?: number,
2517
id: number;
2618
}) => {
27-
const history = useNavigate();
2819
const [visible, setVisible] = useState(false);
2920

3021
const props = useContext(ClassroomContext) as ClassroomTypes;
3122

3223
return (
3324
<>
34-
<Container className="card" onClick={() => {}}>
25+
<Container className="card" onClick={() => { }}>
3526
<Row id="space-between">
3627
<Row >
3728
<div className={`boxQuantity`}>

‎src/Components/Card/CardRegistration/index.tsx

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import IconClasMedia from "../../../Assets/images/iconClasMedia.svg";
66
import IconNotActive from "../../../Assets/images/notactiveRegistration.svg";
77
import { RegistrationClassroomContext } from "../../../Context/Classroom/RegistrationsList/context";
88
import { RegistrationClassroomTypes } from "../../../Context/Classroom/RegistrationsList/type";
9-
import { Status } from "../../../Controller/controllerGlobal";
9+
import { ROLE, Status } from "../../../Controller/controllerGlobal";
1010
import { Column, Padding, Row } from "../../../Styles/styles";
1111
import Icon from "../../Icon";
1212
import { Container } from "./style";
13+
import { AplicationContext } from "../../../Context/Aplication/context";
14+
import { PropsAplicationContext } from "../../../Types/types";
1315

1416
const CardRegistration = ({
1517
title,
@@ -29,31 +31,38 @@ const CardRegistration = ({
2931

3032
const { id } = useParams();
3133

34+
const propsAplication = useContext(
35+
AplicationContext
36+
) as PropsAplicationContext;
37+
3238
const props = useContext(
3339
RegistrationClassroomContext
3440
) as RegistrationClassroomTypes;
3541

36-
console.log(idRegistration);
3742
return (
3843
<>
3944
<Container
4045
className="card cursor-pointer"
4146
onClick={(e) => {
4247
e.stopPropagation();
43-
history(`/turma/${id}/aluno/${idRegistration}`);
48+
if ((propsAplication.user?.role === ROLE.ADMIN ||
49+
propsAplication.user?.role === ROLE.COORDINATORS)) {
50+
history(`/turma/${id}/aluno/${idRegistration}`);
51+
}
4452
}}
4553
>
4654
<Row id="space-between">
4755
<h3>{subtitle}</h3>
48-
<div
49-
className="cursor-pointer"
50-
onClick={(e) => {
51-
e.stopPropagation();
52-
setVisible(true);
53-
}}
54-
>
55-
<Icon icon="pi pi-trash" size="1rem" />
56-
</div>
56+
{(propsAplication.user?.role === ROLE.ADMIN ||
57+
propsAplication.user?.role === ROLE.COORDINATORS) && <div
58+
className="cursor-pointer"
59+
onClick={(e) => {
60+
e.stopPropagation();
61+
setVisible(true);
62+
}}
63+
>
64+
<Icon icon="pi pi-trash" size="1rem" />
65+
</div>}
5766
</Row>
5867
<Padding padding="8px" />
5968
<Row>
@@ -64,10 +73,10 @@ const CardRegistration = ({
6473
status === statuGlobal.APPROVED
6574
? IconActive
6675
: status === statuGlobal.PENDING
67-
? IconClasMedia
68-
: status === statuGlobal.REPROVED
69-
? IconNotActive
70-
: ""
76+
? IconClasMedia
77+
: status === statuGlobal.REPROVED
78+
? IconNotActive
79+
: ""
7180
}
7281
alt=""
7382
style={{ height: 40 }}
@@ -84,10 +93,10 @@ const CardRegistration = ({
8493
{status === statuGlobal.APPROVED
8594
? "Aprovado"
8695
: status === statuGlobal.PENDING
87-
? "Pendente"
88-
: status === statuGlobal.REPROVED
89-
? "Reprovado"
90-
: ""}
96+
? "Pendente"
97+
: status === statuGlobal.REPROVED
98+
? "Reprovado"
99+
: ""}
91100
</div>
92101
</Column>
93102
</Row>

‎src/Components/Card/CardTs/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
import { ConfirmDialog } from "primereact/confirmdialog";
22
import { useContext, useState } from "react";
3-
import { useNavigate } from "react-router-dom";
43
import { ClassroomContext } from "../../../Context/Classroom/context";
54
import { ClassroomTypes } from "../../../Context/Classroom/type";
65
import { Column, Padding, Row } from "../../../Styles/styles";
7-
import IconClassroom from "./../../../Assets/images/cardturmas.svg";
6+
import IconClassroom from "./../../../Assets/images/ts_card.svg";
87
import { Container } from "./style";
98

109

1110

1211
const CardTs = ({
1312
title,
14-
meetingCount,
15-
registrationCount,
1613
id,
1714
}: {
1815
title: string;
1916
meetingCount?: number;
2017
registrationCount?: number,
2118
id: number;
2219
}) => {
23-
const history = useNavigate();
2420
const [visible, setVisible] = useState(false);
2521

2622
const props = useContext(ClassroomContext) as ClassroomTypes;
2723

2824
return (
2925
<>
30-
<Container className="card" onClick={() => {}}>
26+
<Container className="card" onClick={() => { }}>
3127
<Row id="space-between">
3228
<Row >
3329
<div className={`boxQuantity`}>

‎src/Components/Menu/index.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,18 @@ import { Container } from "./style";
2121
import turmasHover from "../../Assets/images/turmasPessoas.svg";
2222

2323
import turmas from "../../Assets/images/peoples.svg";
24-
import home from "../../Assets/images/iconsMenu/home.svg";
25-
import homeHover from "../../Assets/images/iconsMenu/home_active.svg";
24+
// import home from "../../Assets/images/iconsMenu/home.svg";
25+
// import homeHover from "../../Assets/images/iconsMenu/home_active.svg";
2626

2727
import tecnologia from "../../Assets/images/iconsMenu/digital_wellbeing.svg";
2828

2929
import tecnologia_hover from "../../Assets/images/iconsMenu/digital_wellbeing_active.svg";
3030
import projeto from "../../Assets/images/iconsMenu/note_add.svg";
3131
import projeto_hover from "../../Assets/images/iconsMenu/note_add_active.svg";
3232

33+
import beneficiaries from "../../Assets/images/iconsMenu/diversity_4.svg";
34+
import beneficiaries_hover from "../../Assets/images/iconsMenu/diversity_hover.svg";
35+
3336
// import ajuda from "../../Assets/images/question_mark.svg";
3437

3538
import user from "../../Assets/images/iconsMenu/person.svg";
@@ -130,11 +133,11 @@ const Menu = ({ viewdMenu }: { viewdMenu: boolean }) => {
130133
}}
131134
active={active === 5 ? true : false}
132135
path={"/beneficiarios"}
133-
icon={active === 5 ? turmasHover : turmas}
136+
icon={active === 5 ? beneficiaries_hover : beneficiaries}
134137
/>
135138
<Padding />
136139
{props.user?.role === ROLE.ADMIN ||
137-
props.user?.role === ROLE.COORDINATORS ? (
140+
props.user?.role === ROLE.COORDINATORS ? (
138141
<Item
139142
text={"Usuarios"}
140143
funcActiv={() => {

‎src/Context/Aplication/state.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const AplicationState = () => {
2525
idTs(projects[0]?.id?.toString())
2626
}
2727

28-
2928
}
3029
if (userRequest) {
3130
setuser(userRequest)

‎src/Context/Beneficiaries/BeneficiaresEdit/state.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from "../../../Services/PreRegistration/query";
77
import { Registration } from "./type";
88
import {
9+
converterData,
910
formatarData,
1011
getStatus,
1112
VerifyColor,
@@ -36,9 +37,9 @@ export const BeneficiariesEditState = () => {
3637

3738
useEffect(() => {
3839
if (classroomsFetch) {
39-
setClassrooms(classroomsFetch)
40+
setClassrooms(classroomsFetch)
4041
}
41-
}, [classroomsFetch, project])
42+
}, [classroomsFetch, project])
4243

4344
useEffect(() => {
4445
if (registrationsRequests) {
@@ -77,7 +78,7 @@ export const BeneficiariesEditState = () => {
7778
requestPreRegistrationMutation.mutate({
7879
data: {
7980
...data,
80-
birthday: data?.birthday,
81+
birthday: converterData(data?.birthday?.toString()!),
8182
responsable_telephone: data?.responsable_telephone?.replace(
8283
/[^a-zA-Z0-9]/g,
8384
""

‎src/Context/Classroom/Registration/state.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useEffect, useState } from "react";
22
import { useParams } from "react-router-dom";
3-
import { VerifyColor, VerifySex, formatarData, getStatus } from "../../../Controller/controllerGlobal";
3+
import { VerifyColor, VerifySex, converterData, formatarData, getStatus } from "../../../Controller/controllerGlobal";
44
import { ControllerUpdateRegistration } from "../../../Services/PreRegistration/controller";
55
import { useFetchRequestClassroomRegistrationOne } from "../../../Services/PreRegistration/query";
66
import { RegistrationType, UpdateRegister } from "./type";
@@ -43,7 +43,7 @@ export const RegistrationClassroomState = () => {
4343
data: {
4444
...data,
4545
registration_classroom_id: registration?.id,
46-
birthday: registration?.registration.birthday,
46+
birthday: converterData(data.birthday?.toString()!),
4747
responsable_telephone: data?.responsable_telephone?.replace(
4848
/[^a-zA-Z0-9]/g,
4949
""

‎src/Controller/controllerGlobal.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ export function formatarData(data: string): string {
1717
return dataEdit;
1818
}
1919

20+
export function converterData(data: string) {
21+
// Divide a string pelo separador "/"
22+
const partes = data.split('/');
23+
24+
// As partes serão: partes[0] = dia, partes[1] = mês, partes[2] = ano
25+
const dia = partes[0];
26+
const mes = partes[1];
27+
const ano = partes[2];
28+
29+
// Reorganiza no formato YYYY-MM-DD
30+
const dataFormatada = `${ano}-${mes}-${dia}`;
31+
32+
return dataFormatada;
33+
}
34+
2035
export function somarNumeros(num1: number, num2: number): number {
2136
console.log(num1 + num2);
2237
console.log(num1, num2);

0 commit comments

Comments
 (0)