@movalib/movalib-commons 1.64.2 → 1.64.4

package/src/MovaVehicleTireField.tsx

@@ -1,116 +1,127 @@
-import { TextField } from '@mui/material';
-import { useState, type FC, useEffect } from 'react';
-import VehicleTire from './models/VehicleTire';
-import { formatVehicleTire } from './helpers/Tools';
+import { TextField } from "@mui/material";
+import { useEffect, useState, type FC } from "react";
+import { formatVehicleTire } from "./helpers/Tools";
+import VehicleTire from "./models/VehicleTire";
 
 interface MovaVehicleTireFieldProps {
-    vehicleTire?: VehicleTire,
-    onChangeVehicleTire: (vehicleTire: VehicleTire, isValid: boolean) => void;
+  label?: string;
+  vehicleTire?: VehicleTire;
+  onChangeVehicleTire: (vehicleTire: VehicleTire, isValid: boolean) => void;
 }
 
 // Regex pour une taille de pneumatique Française
 const regex = /^[A-Za-z0-9]{7}/;
 
-const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({ vehicleTire, onChangeVehicleTire }) => {
-
-    const [tireInfo, setTireInfo] = useState('');
-    const [error, setError] = useState<boolean>(false);
-    const [lastLength, setLastLength] = useState<number>(0); // Ajout d'un état pour stocker la longueur précédente
-
-    useEffect(() => {
-        if(vehicleTire) {
-            setTireInfo(formatVehicleTire(vehicleTire));
-        }
-    }, [vehicleTire]);
-
-
-    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        e.preventDefault();
-        const rawValue = e.target.value;
-        // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
-        // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
-        let value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
-
-        // On valide la saisie (le champ n'est pas obligatoire)
-        let isValid = value.length == 0  || (value.length > 0 && regex.test(value));
-        setError(!regex.test(value));
-
-        // Vérifier si l'utilisateur est en train de supprimer un caractère
-        const isDeleting = rawValue.length < lastLength;
-        // Ajout du " / "
-        if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
-            value = `${value.substring(0, 3)} / ${value.substring(3)}`;
-        }
-    
-        // Ajout du " R"
-        if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
-            value = `${value.substring(0, 8)} R${value.substring(8)}`;
-        }
-
-        let additonalChar = false;
-
-        if (value[12] && /^[A-Z]$/.test(value[12])) {
-            if(rawValue.length === 14 && isDeleting) {
-                value = `${value.substring(0, 12)}`;
-            } else {
-            additonalChar = true;
-            value = `${value.substring(0, 13)} ${value.substring(13)}`;
-            }
-        }
-
-
-        // Ajout d'un espace après la saisie du diamètre des pneus
-        if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
-            value = `${value.substring(0, 12)} ${value.substring(12)}`;
-        }
-        //console.log('2 valeu',JSON.stringify(value));
-        if (additonalChar) {
-            let endString = rawValue.substring(15);
-            value = value.substring(0,15) + (endString !== undefined ? endString :'');
-            console.log(rawValue.split(' ')[5]);
-        } else {
-            let endString = rawValue.substring(12);
-            if(endString && endString.length > 1) {
-                value = value.substring(0,13) + endString.trimStart();
-            } 
-        }
-
-
-        const parts = value.split(" ");
-
-        setTireInfo(value);
-        if (value.length >= 16) {
-                let [width, _separator, height, diameter, speedIndex] = parts;
-                speedIndex = value.substring(13);
-                const vehicleTire = new VehicleTire(width, height, diameter, speedIndex);
-                onChangeVehicleTire(vehicleTire, isValid);
-        } else {
-            let [width, _separator, height, diameter, speedIndex] = parts;
-            speedIndex = value.substring(13);
-            const vehicleTire = new VehicleTire(width ?? '', height ?? '', diameter ?? '', speedIndex ?? '');
-            onChangeVehicleTire(vehicleTire, isValid);
-        }
-
-        setLastLength(value.length); // Mettre à jour la longueur précédente
-
-    };
-
-    return (
-        <TextField
-            label="Taille des pneumatiques"
-            variant="outlined"
-            value={tireInfo}
-            onChange={handleChange}
-            fullWidth
-            placeholder='XXX XX RXX XXX'
-            sx={{
-                width: '100%',
-                '& input': { textTransform: 'uppercase' } // CSS pour forcer les majuscules dans l'input
-              }}
-            error={error && tireInfo.length > 0}
-            helperText={error && tireInfo.length > 0 ? "Saisie invalide" : ''}
-        />
-    );
-}
+const MovaVehicleTireField: FC<MovaVehicleTireFieldProps> = ({
+  vehicleTire,
+  onChangeVehicleTire,
+  label,
+}) => {
+  const [tireInfo, setTireInfo] = useState("");
+  const [error, setError] = useState<boolean>(false);
+  const [lastLength, setLastLength] = useState<number>(0); // Ajout d'un état pour stocker la longueur précédente
+
+  useEffect(() => {
+    if (vehicleTire) {
+      setTireInfo(formatVehicleTire(vehicleTire));
+    }
+  }, [vehicleTire]);
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    e.preventDefault();
+    const rawValue = e.target.value;
+    // Cette expression régulière supprimera tous les caractères qui ne sont pas des chiffres ou des lettres alphabétiques, à l'exception de "R" et "r".
+    // On ne peut saisir que 10 caractères maximum (ex : 245551791V)
+    let value = rawValue
+      .toUpperCase()
+      .replace(/[^0-9A-QS-Za-qs-z]/g, "")
+      .slice(0, 15);
+
+    // On valide la saisie (le champ n'est pas obligatoire)
+    let isValid = value.length == 0 || (value.length > 0 && regex.test(value));
+    setError(!regex.test(value));
+
+    // Vérifier si l'utilisateur est en train de supprimer un caractère
+    const isDeleting = rawValue.length < lastLength;
+    // Ajout du " / "
+    if (value.length >= 3 && !(rawValue.length == 5 && isDeleting)) {
+      value = `${value.substring(0, 3)} / ${value.substring(3)}`;
+    }
+
+    // Ajout du " R"
+    if (value.length >= 8 && !(rawValue.length == 9 && isDeleting)) {
+      value = `${value.substring(0, 8)} R${value.substring(8)}`;
+    }
+
+    let additonalChar = false;
+
+    if (value[12] && /^[A-Z]$/.test(value[12])) {
+      if (rawValue.length === 14 && isDeleting) {
+        value = `${value.substring(0, 12)}`;
+      } else {
+        additonalChar = true;
+        value = `${value.substring(0, 13)} ${value.substring(13)}`;
+      }
+    }
+
+    // Ajout d'un espace après la saisie du diamètre des pneus
+    if (value.length >= 12 && !(rawValue.length <= 12 && isDeleting)) {
+      value = `${value.substring(0, 12)} ${value.substring(12)}`;
+    }
+    //console.log('2 valeu',JSON.stringify(value));
+    if (additonalChar) {
+      let endString = rawValue.substring(15);
+      value =
+        value.substring(0, 15) + (endString !== undefined ? endString : "");
+      console.log(rawValue.split(" ")[5]);
+    } else {
+      let endString = rawValue.substring(12);
+      if (endString && endString.length > 1) {
+        value = value.substring(0, 13) + endString.trimStart();
+      }
+    }
+
+    const parts = value.split(" ");
+
+    setTireInfo(value);
+    if (value.length >= 16) {
+      let [width, _separator, height, diameter, speedIndex] = parts;
+      speedIndex = value.substring(13);
+      const vehicleTire = new VehicleTire(width, height, diameter, speedIndex);
+      onChangeVehicleTire(vehicleTire, isValid);
+    } else {
+      let [width, _separator, height, diameter, speedIndex] = parts;
+      speedIndex = value.substring(13);
+      const vehicleTire = new VehicleTire(
+        width ?? "",
+        height ?? "",
+        diameter ?? "",
+        speedIndex ?? ""
+      );
+      onChangeVehicleTire(vehicleTire, isValid);
+    }
+
+    setLastLength(value.length); // Mettre à jour la longueur précédente
+  };
+
+  return (
+    <TextField
+      label={
+        label ? `Taille des pneumatiques ${label}` : "Taille des pneumatiques"
+      }
+      variant="outlined"
+      value={tireInfo}
+      onChange={handleChange}
+      fullWidth
+      placeholder="XXX XX RXX XXX"
+      sx={{
+        width: "100%",
+        "& input": { textTransform: "uppercase" }, // CSS pour forcer les majuscules dans l'input
+      }}
+      error={error && tireInfo.length > 0}
+      helperText={error && tireInfo.length > 0 ? "Saisie invalide" : ""}
+    />
+  );
+};
 
 export default MovaVehicleTireField;

package/src/components/vehicle/VehicleFullCard.tsx

@@ -72,6 +72,11 @@ const initialUserFormState = {
   lastMaintenanceDate: { value: null, isValid: true },
   tireBrand: { value: "", isValid: true },
   tireProfile: { value: "", isValid: true },
+  secondaryTireDiameter: { value: "", isValid: true },
+  secondaryTireHeight: { value: "", isValid: true },
+  secondaryTireSpeedIndex: { value: "", isValid: true },
+  secondaryTireWidth: { value: "", isValid: true },
+  secondaryTireSize: { value: null, isValid: true },
 };
 
 const VehicleFullCard: FC<VehicleFullCardProps> = ({
@@ -127,79 +132,75 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
   }, [vehicle]);
 
   const initForm = () => {
-    if (vehicle) {
-      setForm((prevForm) => ({
+    if (!vehicle) return;
+    console.log("vehicle", vehicle);
+    setForm((prevForm) => {
+      const updatedForm = {
         ...prevForm,
         currentMileage: {
-          ...prevForm["currentMileage"],
+          ...prevForm.currentMileage,
           value: vehicle.currentMileage,
         },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
         averageMileagePerYear: {
-          ...prevForm["averageMileagePerYear"],
+          ...prevForm.averageMileagePerYear,
           value: vehicle.averageMileagePerYear,
         },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
-        tireWidth: { ...prevForm["tireWidth"], value: vehicle.tireWidth },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
-        tireHeight: { ...prevForm["tireHeight"], value: vehicle.tireHeight },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
-        tireDiameter: {
-          ...prevForm["tireDiameter"],
-          value: vehicle.tireDiameter,
-        },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
+        tireWidth: { ...prevForm.tireWidth, value: vehicle.tireWidth },
+        tireHeight: { ...prevForm.tireHeight, value: vehicle.tireHeight },
+        tireDiameter: { ...prevForm.tireDiameter, value: vehicle.tireDiameter },
         tireSpeedIndex: {
-          ...prevForm["tireSpeedIndex"],
+          ...prevForm.tireSpeedIndex,
           value: vehicle.tireSpeedIndex,
         },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
+        secondaryTireWidth: {
+          ...prevForm.secondaryTireWidth,
+          value: vehicle.secondaryTireWidth,
+        },
+        secondaryTireHeight: {
+          ...prevForm.secondaryTireHeight,
+          value: vehicle.secondaryTireHeight,
+        },
+        secondaryTireDiameter: {
+          ...prevForm.secondaryTireDiameter,
+          value: vehicle.secondaryTireDiameter,
+        },
+        secondaryTireSpeedIndex: {
+          ...prevForm.secondaryTireSpeedIndex,
+          value: vehicle.secondaryTireSpeedIndex,
+        },
         lastInspectionDate: {
-          ...prevForm["lastInspectionDate"],
+          ...prevForm.lastInspectionDate,
           value: vehicle.lastInspectionDate
             ? new Date(vehicle.lastInspectionDate)
             : null,
         },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
         lastMaintenanceDate: {
-          ...prevForm["lastMaintenanceDate"],
+          ...prevForm.lastMaintenanceDate,
           value: vehicle.lastMaintenanceDate
             ? new Date(vehicle.lastMaintenanceDate)
             : null,
         },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
-        tireBrand: { ...prevForm["tireBrand"], value: vehicle.tireBrand },
-      }));
-      setForm((prevForm) => ({
-        ...prevForm,
-        tireProfile: { ...prevForm["tireProfile"], value: vehicle.tireProfile },
-      }));
+        tireBrand: { ...prevForm.tireBrand, value: vehicle.tireBrand },
+        tireProfile: { ...prevForm.tireProfile, value: vehicle.tireProfile },
+      };
 
       if (isVehicleTireSizeDefined(vehicle)) {
-        setForm((prevForm) => ({
-          ...prevForm,
-          tireSize: { ...prevForm["tireSize"], value: vehicle.tireSize },
-        }));
+        updatedForm.tireSize = {
+          ...prevForm.tireSize,
+          value: vehicle.tireSize,
+        };
+      }
+      if (isVehicleSecondaryTireSizeDefined(vehicle)) {
+        updatedForm.secondaryTireSize = {
+          ...prevForm.secondaryTireSize,
+          value: vehicle.secondaryTireSize,
+        };
       }
 
-      Logger.info(form);
-    }
+      return updatedForm;
+    });
+
+    Logger.info(form);
   };
 
   const toggleShowLinkedDocument = (docType: DocumentType | null) => {
@@ -217,6 +218,13 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
       vehicle.tireSize && vehicle.tireSize.diameter && vehicle.tireSize.height
     );
   };
+  const isVehicleSecondaryTireSizeDefined = (vehicle: Vehicle) => {
+    return (
+      vehicle.secondaryTireSize &&
+      vehicle.secondaryTireSize.diameter &&
+      vehicle.secondaryTireSize.height
+    );
+  };
 
   const validateForm = () => {
     let newForm: MovaVehicleForm = { ...form };
@@ -316,6 +324,20 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
     }));
   };
 
+  const handleOnChangeVehicleSecondaryTire = (
+    vehicleTire: VehicleTire,
+    isValid: boolean
+  ) => {
+    setForm((prevForm) => ({
+      ...prevForm,
+      secondaryTireSize: {
+        ...prevForm["secondaryTireSize"],
+        value: vehicleTire,
+        isValid: isValid,
+      },
+    }));
+  };
+
   const handleOnClickDeleteVehicle = (
     e: React.MouseEvent<HTMLButtonElement, MouseEvent>
   ) => {
@@ -355,6 +377,23 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
           form.tireSize.isValid && form.tireSize.value
             ? (form.tireSize.value as VehicleTire).speedIndex
             : undefined,
+        secondaryTireWidth:
+          form.secondaryTireSize && form.secondaryTireSize.value
+            ? (form.secondaryTireSize.value as VehicleTire).width
+            : undefined,
+        secondaryTireHeight:
+          form.secondaryTireSize && form.secondaryTireSize.value
+            ? (form.secondaryTireSize.value as VehicleTire).height
+            : undefined,
+        secondaryTireDiameter:
+          form.secondaryTireSize && form.secondaryTireSize.value
+            ? (form.secondaryTireSize.value as VehicleTire).diameter
+            : undefined,
+        secondaryTireSpeedIndex:
+          form.secondaryTireSize && form.secondaryTireSize.value
+            ? (form.secondaryTireSize.value as VehicleTire).speedIndex
+            : undefined,
+
         lastInspectionDate: form.lastInspectionDate.value,
         lastMaintenanceDate: form.lastMaintenanceDate.value,
         tireBrand: form.tireBrand.value,
@@ -572,22 +611,47 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
               )}
 
               {!localEditMode && (
-                <Grid container textAlign="justify" sx={{ pt: 2 }}>
-                  <Grid item xs={6}>
-                    <Typography variant="body1" color="text.secondary">
-                      Pneumatiques :
-                    </Typography>
+                <>
+                  <Grid container textAlign="justify" sx={{ pt: 2 }}>
+                    <Grid item xs={6}>
+                      <Typography variant="body1" color="text.secondary">
+                        Pneumatiques{" "}
+                        {isVehicleSecondaryTireSizeDefined(vehicle) ? "AV" : ""}{" "}
+                        :
+                      </Typography>
+                    </Grid>
+                    <Grid item xs={6} sx={{ textAlign: "right" }}>
+                      <Typography variant="body1" color="text.secondary">
+                        {isVehicleTireSizeDefined(vehicle) ? (
+                          <b>{formatVehicleTire(vehicle.tireSize)}</b>
+                        ) : (
+                          "-"
+                        )}
+                      </Typography>
+                    </Grid>
                   </Grid>
-                  <Grid item xs={6} sx={{ textAlign: "right" }}>
-                    <Typography variant="body1" color="text.secondary">
-                      {isVehicleTireSizeDefined(vehicle) ? (
-                        <b>{formatVehicleTire(vehicle.tireSize)}</b>
-                      ) : (
-                        "-"
-                      )}
-                    </Typography>
-                  </Grid>
-                </Grid>
+
+                  {isVehicleSecondaryTireSizeDefined(vehicle) && (
+                    <Grid container textAlign="justify" sx={{ pt: 2 }}>
+                      <Grid item xs={6}>
+                        <Typography variant="body1" color="text.secondary">
+                          Pneumatiques AR:
+                        </Typography>
+                      </Grid>
+                      <Grid item xs={6} sx={{ textAlign: "right" }}>
+                        <Typography variant="body1" color="text.secondary">
+                          {isVehicleSecondaryTireSizeDefined(vehicle) ? (
+                            <b>
+                              {formatVehicleTire(vehicle.secondaryTireSize)}
+                            </b>
+                          ) : (
+                            "-"
+                          )}
+                        </Typography>
+                      </Grid>
+                    </Grid>
+                  )}
+                </>
               )}
               {!localEditMode && (
                 <Grid container textAlign="justify" sx={{ pt: 2 }}>
@@ -620,12 +684,22 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
               )}
 
               {localEditMode && (
-                <Grid item xs={12} sx={{ mt: 1 }}>
-                  <MovaVehicleTireField
-                    vehicleTire={form.tireSize.value}
-                    onChangeVehicleTire={handleOnChangeVehicleTire}
-                  />
-                </Grid>
+                <>
+                  <Grid item xs={12} sx={{ mt: 1 }}>
+                    <MovaVehicleTireField
+                      label="AV"
+                      vehicleTire={form.tireSize.value}
+                      onChangeVehicleTire={handleOnChangeVehicleTire}
+                    />
+                  </Grid>
+                  <Grid item xs={12} sx={{ mt: 1 }}>
+                    <MovaVehicleTireField
+                      label="AR"
+                      vehicleTire={form.secondaryTireSize.value}
+                      onChangeVehicleTire={handleOnChangeVehicleSecondaryTire}
+                    />
+                  </Grid>
+                </>
               )}
               {localEditMode && (
                 <Grid item xs={12}>

package/src/helpers/Enums.ts

@@ -239,6 +239,7 @@ export enum QuoteState {
   QUOTE_SENT = "QUOTE_SENT",
   QUOTE_ACCEPTED = "QUOTE_ACCEPTED",
   QUOTE_REJECTED = "QUOTE_REJECTED",
+  QUOTE_CANCELLED = "CANCELLED"
 }
 
 export enum DocumentType {

package/src/helpers/Types.ts

@@ -24,6 +24,11 @@ export type MovaVehicleForm = {
   lastMaintenanceDate: MovaFormField;
   tireBrand: MovaFormField;
   tireProfile: MovaFormField;
+  secondaryTireSize: MovaFormField;
+  secondaryTireWidth: MovaFormField;
+  secondaryTireHeight: MovaFormField;
+  secondaryTireDiameter: MovaFormField;
+  secondaryTireSpeedIndex: MovaFormField;
 };
 
 /**

package/src/models/Garage.ts

@@ -68,6 +68,7 @@ export default class Garage {
   quoteRequestStart?: Date;
   companyRegistrationNumber?: string;
   establishmentRegistrationNumber?: string;
+  reopeningDate?: Date;
   constructor(
     id: string,
     adminId: string,
@@ -100,7 +101,8 @@ export default class Garage {
     appId?: number,
     establishmentRegistrationNumber?: string,
     companyRegistrationNumber?: string,
-    quoteRequestStart?: Date
+    quoteRequestStart?: Date,
+    reopeningDate?: Date
   ) {
     this.id = id;
     this.adminId = adminId;
@@ -134,5 +136,6 @@ export default class Garage {
     this.quoteRequestStart = quoteRequestStart;
     this.companyRegistrationNumber = companyRegistrationNumber;
     this.establishmentRegistrationNumber = establishmentRegistrationNumber;
+    this.reopeningDate = reopeningDate;
   }
 }

package/src/models/Prestation.ts

@@ -25,6 +25,7 @@ export default class Prestation {
      * La notion de position (ou d'ordre) peut être utile à l'affichage d'une liste de prestation par exemple
      */
     position: number;
+    availableOnline: boolean;
 
     active:boolean;
 
@@ -37,7 +38,7 @@ export default class Prestation {
     
       constructor(id:number, code: string, name:string, description: string, category:string,
         downtime:number, appointmentDelay: number, position: number, active: boolean, state: PrestationState, 
-        multipleApplication: boolean,  operationsVisible: boolean,categoryCode: string, operations?: Operation[]) {
+        multipleApplication: boolean,  operationsVisible: boolean,categoryCode: string, availableOnline:boolean, operations?: Operation[]) {
         this.id = id;
         this.code = code;
         this.name = name;
@@ -52,5 +53,6 @@ export default class Prestation {
         this.operations = operations;
         this.state = state;
         this.categoryCode = categoryCode;
+        this.availableOnline = availableOnline;
       }
 }