feat(app,admin,api,lib): 3525 - Affichage des particularites access du PDR

admin/src/scenes/pointDeRassemblement/List.tsx

@@ -2,9 +2,8 @@ import React, { useState } from "react";
 import { BsDownload } from "react-icons/bs";
 import { useSelector } from "react-redux";
 import { useHistory, useParams, useLocation } from "react-router-dom";
-import { PointDeRassemblementType, ROLES, canCreateMeetingPoint, getDepartmentNumber } from "snu-lib";
+import { PointDeRassemblementType, ROLES, canCreateMeetingPoint, getDepartmentNumber, getParticularitesAcces } from "snu-lib";
 import BusSvg from "../../assets/icons/Bus";
-import Calendar from "../../assets/icons/Calendar";
 import ExternalLink from "../../assets/icons/ExternalLink";
 import Menu from "../../assets/icons/Menu";
 import Breadcrumbs from "../../components/Breadcrumbs";
@@ -336,7 +335,8 @@ const ListSessions = ({ user, defaultCohortName }) => {
                   Cohort: selectedCohort,
                   Nom: item.name,
                   Adresse: item.address,
-                  "Complément d'adresse": item?.complementAddress.find((e) => e.cohort === selectedCohort)?.complement || "",
+                  // TODO: à supprimer lorsque le PDR sera dissocié de la session
+                  "Complément d'adresse": getParticularitesAcces(item, selectedCohort) || "",
                   Ville: item.city,
                   "Code postal": item.zip,
                   Département: item.department,

admin/src/scenes/pointDeRassemblement/View.tsx

@@ -12,7 +12,6 @@ import {
   canViewMeetingPointId,
   isPdrEditionOpen,
   PointDeRassemblementType,
-  departmentToAcademy,
 } from "snu-lib";
 import { AddressForm } from "@snu/ds/common";
 // @ts-ignore
@@ -479,6 +478,7 @@ export default function View(props) {
                   <Field
                     label="Complément d’adresse"
                     onChange={(e) => handleChangeComplement(e.target.value)}
+                    // TODO: champ à supprimer une fois le PDR  dissocié de la cohort
                     value={pdr.complementAddress.find((c) => c.cohort === currentCohort)?.complement || ""}
                     readOnly={!editSession}
                   />

api/src/young/youngCertificateService.ts

@@ -1,11 +1,11 @@
 import { CohesionCenterModel, SessionPhase1Model, CohortModel, LigneBusModel, LigneToPointModel, PointDeRassemblementModel, DepartmentServiceModel } from "../models";
-import { YoungDto, PointDeRassemblementType, CohesionCenterType } from "snu-lib";
+import { YoungDto, PointDeRassemblementType, CohesionCenterType, getParticularitesAcces } from "snu-lib";
 
-export const getMeetingAddress = (young: YoungDto, meetingPoint: PointDeRassemblementType, center: CohesionCenterType) => {
-  if (young.deplacementPhase1Autonomous === "true" || !meetingPoint) return `${center.address} ${center.zip} ${center.city}`;
-  const complement = meetingPoint?.complementAddress.find((c) => c.cohort === young.cohort);
-  const complementText = complement?.complement ? ", " + complement.complement : "";
-  return meetingPoint.name + ", " + meetingPoint.address + " " + meetingPoint.zip + " " + meetingPoint.city + complementText;
+export const getMeetingAddress = (young: YoungDto, pdr: PointDeRassemblementType, centre: CohesionCenterType) => {
+  if (young.deplacementPhase1Autonomous === "true" || !pdr) return `${centre.address} ${centre.zip} ${centre.city}`;
+  const complement = getParticularitesAcces(pdr, young.cohort);
+  const complementText = complement ? ", " + complement : "";
+  return `${pdr.name}, ${pdr.address} ${pdr.zip} ${pdr.city}${complementText}`;
 };
 
 export const getCertificateTemplate = (young: YoungDto) => {

app/src/redux/auth/reducer.js → app/src/redux/auth/reducer.ts

@@ -1,5 +1,14 @@
+import { YoungType } from "snu-lib";
+
 import { authActions } from "./actions";
 
+export type AuthState = {
+  // TODO: use API route response
+  Auth: {
+    young: YoungType;
+  };
+};
+
 const initState = {
   young: null,
 };

app/src/scenes/phase1/components/modals/InfoConvocation.jsx → app/src/scenes/phase1/components/modals/InfoConvocation.tsx

@@ -2,20 +2,25 @@ import React from "react";
 import { FiMail } from "react-icons/fi";
 import { useSelector } from "react-redux";
 import { Modal } from "reactstrap";
-import Calendar from "../../../../assets/calendar";
-import ChevronDown from "../../../../assets/icons/ChevronDown";
-import Download from "../../../../assets/icons/Download";
-import api from "../../../../services/api";
-import downloadPDF from "../../../../utils/download-pdf";
-import { toastr } from "react-redux-toastr";
-import { getReturnDate, getReturnHour, translate } from "snu-lib";
-import { capture } from "../../../../sentry";
 import dayjs from "dayjs";
+import { toastr } from "react-redux-toastr";
+
+import { getParticularitesAcces, getReturnDate, getReturnHour, translate } from "snu-lib";
+
+import api from "@/services/api";
+import { capture } from "@/sentry";
+import { AuthState } from "@/redux/auth/reducer";
+import downloadPDF from "@/utils/download-pdf";
+
+import Calendar from "@/assets/calendar";
+import ChevronDown from "@/assets/icons/ChevronDown";
+import Download from "@/assets/icons/Download";
 
 export default function InfoConvocation({ isOpen, onCancel, title, meetingPoint, session, center, cohort }) {
-  const young = useSelector((state) => state.Auth.young) || {};
+  const young = useSelector((state: AuthState) => state.Auth.young) || {};
+
   const [selectOpen, setSelectOpen] = React.useState(false);
-  const refSelect = React.useRef(null);
+  const refSelect = React.useRef<HTMLDivElement>(null);
   const returnDate = getReturnDate(young, session, cohort, meetingPoint);
   const returnHour = getReturnHour(meetingPoint);
   const [loadingConvocation, setLoadingConvocation] = React.useState(false);
@@ -64,11 +69,11 @@ export default function InfoConvocation({ isOpen, onCancel, title, meetingPoint,
     if (young.deplacementPhase1Autonomous === "true" || !meetingPoint?.address) {
       return [center?.name, center?.address, center?.zip, center?.city, center?.department, center?.region].filter((e) => e).join(", ");
     } else {
-      let address = [meetingPoint.address];
+      const address = [meetingPoint.address];
 
-      let complement = meetingPoint.complementAddress ? meetingPoint.complementAddress.find((c) => c.cohort === young.cohort) : null;
-      if (complement && complement.complement) {
-        complement = complement.complement.trim();
+      let complement = getParticularitesAcces(meetingPoint, young.cohort) || null;
+      if (complement) {
+        complement = complement.trim();
         if (complement.length === 0) {
           complement = null;
         }

app/src/scenes/phase1/scenes/affected/components/Convocation.jsx → app/src/scenes/phase1/scenes/affected/components/Convocation.tsx

@@ -6,31 +6,32 @@ import dayjs from "dayjs";
 import { supportURL } from "../../../../../config";
 import api from "../../../../../services/api";
 import { translate } from "../../../../../utils";
-import { getMeetingHour, getReturnHour, transportDatesToString, htmlCleaner } from "snu-lib";
+import { getMeetingHour, getReturnHour, transportDatesToString, htmlCleaner, getParticularitesAcces, DepartmentServiceType } from "snu-lib";
 import useAuth from "@/services/useAuth";
 
 import Loader from "../../../../../components/Loader";
 import { Hero, Content } from "../../../../../components/Content";
 
 export default function Convocation({ center, meetingPoint, departureDate, returnDate }) {
-  const { young, isCLE } = useAuth();
   const history = useHistory();
-  const [service, setService] = useState();
+  const { young, isCLE } = useAuth();
+
+  const [service, setService] = useState<DepartmentServiceType>();
+
+  useEffect(() => {
+    if (young?.department && !service) getService();
+  }, [young]);
 
   const getService = async () => {
     const { data, code, ok } = await api.get(`/department-service/${young.department}`);
     if (!ok) return toastr.error("error", translate(code));
     setService(data);
   };
 
-  useEffect(() => {
-    if (young?.department && !service) getService();
-  }, [young]);
-
   const getMeetingAddress = () => {
     if (young.deplacementPhase1Autonomous === "true" || !meetingPoint) return `${center.address} ${center.zip} ${center.city}`;
-    const complement = meetingPoint?.complementAddress.find((c) => c.cohort === young.cohort);
-    const complementText = complement?.complement ? ", " + complement.complement : "";
+    const complement = getParticularitesAcces(meetingPoint, young.cohort);
+    const complementText = complement ? ", " + complement : "";
     return meetingPoint.name + ", " + meetingPoint.address + " " + meetingPoint.zip + " " + meetingPoint.city + complementText;
   };
 
@@ -203,4 +204,3 @@ const Sign = styled.div`
   font-weight: 500;
   margin: 1rem;
 `;
-

packages/lib/src/plandetransport/index.ts

@@ -1 +1,2 @@
 export * from "./ligneService";
+export * from "./pdrService";

packages/lib/src/plandetransport/pdrService.ts

@@ -0,0 +1,8 @@
+import { PointDeRassemblementType } from "../mongoSchema";
+
+export const getParticularitesAcces = (pdr: PointDeRassemblementType, cohortName?: string) => {
+  if (!cohortName || !!pdr.matricule) {
+    return pdr.particularitesAcces;
+  }
+  return pdr.particularitesAcces || pdr?.complementAddress.find((c) => c.cohort === cohortName)?.complement;
+};