[tra-14716]Ajouter l'immatriculation et le n° de CAP sur le tableau d…

…e bord général, pour tous les acteurs (#3624)
MTES-MCT · Oct 3, 2024 · 6c0b483 · 6c0b483
1 parent 7df5531
commit 6c0b483
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/front/src/Apps/Dashboard/Components/BsdCard/BsdCard.tsx b/front/src/Apps/Dashboard/Components/BsdCard/BsdCard.tsx
@@ -183,39 +183,33 @@ function BsdCard({
     ? getPrimaryActionsReviewsLabel(bsdDisplay, currentSiret)
     : "";
 
+  const isTransportTabs = isToCollectTab || isCollectedTab;
+
   const currentTransporterInfos = useMemo(() => {
-    if (!isToCollectTab && !isCollectedTab) {
-      return null;
-    }
     return getCurrentTransporterInfos(bsd, currentSiret, isToCollectTab);
-  }, [bsd, currentSiret, isToCollectTab, isCollectedTab]);
+  }, [bsd, currentSiret, isToCollectTab]);
 
   // display the transporter's custom info if:
   // - we are in the "To Collect" tab
   // OR
   // - we are in the "Collected" tab and there is a custom info
   const displayTransporterCustomInfo =
+    isTransportTabs &&
     !!currentTransporterInfos &&
     (isToCollectTab ||
       (isCollectedTab &&
         !!currentTransporterInfos?.transporterCustomInfo?.length));
 
   // display the transporter's number plate if:
   // - the mode of transport is ROAD
-  // AND
-  // - we are in the "To Collect" tab
-  // OR
-  // - we are in the "Collected" tab and there is a number plate
   const displayTransporterNumberPlate =
     !!currentTransporterInfos &&
     (currentTransporterInfos.transporterMode === TransportMode.Road ||
       // permet de gérer un trou dans la raquette en terme de validation des données
       // qui ne rend pas le mode de transport obligatoire à la signature transporteur
       // en attente de correction Cf ticket tra-14517
       !currentTransporterInfos.transporterMode) &&
-    (isToCollectTab ||
-      (isCollectedTab &&
-        !!currentTransporterInfos?.transporterNumberPlate?.length));
+    !!currentTransporterInfos?.transporterNumberPlate?.length;
 
   const handleValidationClick = (
     _: React.MouseEvent<HTMLButtonElement, MouseEvent>
@@ -399,14 +393,21 @@ function BsdCard({
                         transporterNumberPlate:
                           currentTransporterInfos?.transporterNumberPlate
                       }}
-                      hasEditableInfos
+                      hasEditableInfos={isToCollectTab}
+                      info={currentTransporterInfos?.transporterNumberPlate?.toString()}
                       isDisabled={
                         isCollectedTab ||
                         !permissions.includes(UserPermission.BsdCanUpdate)
                       }
                       onClick={handleEditableInfoClick}
                     />
                   )}
+                  {bsdDisplay?.destination?.["cap"] && (
+                    <InfoWithIcon
+                      labelCode={InfoIconCode.Cap}
+                      info={bsdDisplay?.destination?.["cap"]}
+                    />
+                  )}
                 </div>
                 {isMobile && <div className="bsd-card-border" />}
               </div>

diff --git a/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIcon.scss b/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIcon.scss
@@ -96,7 +96,8 @@
       flex-shrink: 0;
     }
   }
-  &__CustomId {
+  &__CustomId,
+  &__Cap {
     &:before {
       display: inline-block;
       content: "";

diff --git a/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIconTypes.ts b/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIconTypes.ts
@@ -8,15 +8,16 @@ export enum InfoIconCode {
   TransporterNumberPlate = "TransporterNumberPlate",
   PickupSite = "PickupSite",
   CustomId = "CustomId",
+  Cap = "Cap",
   default = ""
 }
 export enum InfoIconValue {
   TempStorage = "Entreposage provisoire",
   LastModificationDate = "Modifié le",
   CustomInfo = "Champ libre",
-  TransporterNumberPlate = "Plaque d'immatriculation",
   PickupSite = "Adresse chantier",
   CustomId = "N° libre : ",
+  Cap = "CAP : ",
   default = ""
 }
 

diff --git a/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIconUtils.ts b/front/src/Apps/Dashboard/Components/InfoWithIcon/infoWithIconUtils.ts
@@ -11,9 +11,11 @@ export const getLabelValue = (code: InfoIconCode): InfoIconValue => {
     case InfoIconCode.CustomInfo:
       return InfoIconValue.CustomInfo;
     case InfoIconCode.TransporterNumberPlate:
-      return InfoIconValue.TransporterNumberPlate;
+      return InfoIconValue.default;
     case InfoIconCode.CustomId:
       return InfoIconValue.CustomId;
+    case InfoIconCode.Cap:
+      return InfoIconValue.Cap;
     default:
       return InfoIconValue.default;
   }

diff --git a/front/src/Apps/common/queries/fragments/bsda.ts b/front/src/Apps/common/queries/fragments/bsda.ts
@@ -60,6 +60,7 @@ export const bsdaFragment = gql`
           }
         }
       }
+      cap
     }
     worker {
       isDisabled

diff --git a/front/src/Apps/common/queries/fragments/bsdd.ts b/front/src/Apps/common/queries/fragments/bsdd.ts
@@ -438,6 +438,7 @@ export const dashboardFormFragment = gql`
         name
       }
       isTempStorage
+      cap
     }
     transporter {
       id

diff --git a/front/src/Apps/common/queries/fragments/bsff.ts b/front/src/Apps/common/queries/fragments/bsff.ts
@@ -57,6 +57,7 @@ export const dashboardBsffFragment = gql`
         name
       }
       plannedOperationCode
+      cap
     }
     waste {
       code