From a612a40fd39868e0369a054d78e0a3c6b03bd863 Mon Sep 17 00:00:00 2001 From: Raed BOUAFIF Date: Tue, 11 Jun 2024 16:44:29 +0100 Subject: [PATCH] fixed bug affectation delete and re affect in feature/affecting-zone --- .../assign_zone_project/CompleteAffectation.jsx | 11 ++++------- src/app/(dashboard)/assign_zone_project/page.jsx | 9 +++++++-- src/app/(dashboard)/place/page.jsx | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/app/(dashboard)/assign_zone_project/CompleteAffectation.jsx b/src/app/(dashboard)/assign_zone_project/CompleteAffectation.jsx index 8da3fc7..d59137a 100644 --- a/src/app/(dashboard)/assign_zone_project/CompleteAffectation.jsx +++ b/src/app/(dashboard)/assign_zone_project/CompleteAffectation.jsx @@ -136,11 +136,8 @@ const CompleteAffectation = ({ setIsOpen, listAffectationsState, affectations, f const handleMinusCollab = () =>{ setCollabsAttributed(collabsAttributed - 1) } - - console.log("collabsAttributed", collabsAttributed) - console.log("nbrCollabs", nbrCollabs) - console.log("places", places) - + console.log("projectss", affectations) + console.log("selected project", selectedProject) const handleAssignProject = async () => { @@ -149,7 +146,7 @@ const CompleteAffectation = ({ setIsOpen, listAffectationsState, affectations, f id_project: selectedProject.project.id, jour: selectedProject.jour, semaine: selectedProject.semaine, - nombre_personnes: nbrCollabs, + nombre_personnes: selectedProject.nombre_personnes, places_disponibles: (collabsAttributed > places.length) ? 0 : places.length - collabsAttributed, places_occuper: (collabsAttributed > places.length) ? places.length : collabsAttributed, places: (collabsAttributed > places.length) ? places.map( (element) => element.id) : places.map( (element, index) => index < collabsAttributed && element.id).filter(id => id !== false) @@ -207,7 +204,7 @@ const CompleteAffectation = ({ setIsOpen, listAffectationsState, affectations, f setLoading(false) } - + console.log(nbrCollabs) return (
diff --git a/src/app/(dashboard)/assign_zone_project/page.jsx b/src/app/(dashboard)/assign_zone_project/page.jsx index 57a58ec..c9a2606 100644 --- a/src/app/(dashboard)/assign_zone_project/page.jsx +++ b/src/app/(dashboard)/assign_zone_project/page.jsx @@ -66,7 +66,8 @@ const AffectingZoneProject = () => { project: project.id_project, semaine: project.semaine, jour: project.jour, - nbr_personnes_restant: project.nombre_personnes - project.places_occuper + nbr_personnes_restant: project.nombre_personnes - project.places_occuper, + nombre_personnes: project.nombre_personnes }; }); @@ -203,7 +204,8 @@ const AffectingZoneProject = () => { project: project.id_project, semaine: project.semaine, jour: project.jour, - nbr_personnes_restant: project.nombre_personnes - project.places_occuper + nbr_personnes_restant: project.nombre_personnes - project.places_occuper, + nombre_personnes: project.nombre_personnes }; }); @@ -215,6 +217,9 @@ const AffectingZoneProject = () => { setListProjectsSemiAffected(filterAndGroupProjects(passedData)) } + console.log("project semi affected", listProjectsSemiAffected) + console.log("project fully associated", listProjectsAffected) + return (
diff --git a/src/app/(dashboard)/place/page.jsx b/src/app/(dashboard)/place/page.jsx index a7d3269..074d6e8 100644 --- a/src/app/(dashboard)/place/page.jsx +++ b/src/app/(dashboard)/place/page.jsx @@ -9,12 +9,24 @@ import RowPlace from './RowPlace' import PlaceIcon from "@/static/image/svg/place.svg" - const Place = () => { const [places, setPlaces] = useState([]) const [isLoadingData, setIsLoadingData] = useState(true) const [tables, setTables] = useState([]) + + useEffect(() => { + const fetchIP = async () => { + try { + const response = await fetch("https://api.ipify.org?format=json") + const data = await response.json() + console.log(data) + } catch (error) { + console.log(error) + } + } + fetchIP() + }, []) // Fetch data from external API useEffect(() => { @@ -72,7 +84,7 @@ const Place = () => {

List des Places

-
+
-- GitLab