@movalib/movalib-commons 1.64.2 → 1.64.3

package/dist/src/MovaVehicleTireField.d.ts

@@ -1,6 +1,7 @@
-import { type FC } from 'react';
-import VehicleTire from './models/VehicleTire';
+import { type FC } from "react";
+import VehicleTire from "./models/VehicleTire";
 interface MovaVehicleTireFieldProps {
+    label?: string;
     vehicleTire?: VehicleTire;
     onChangeVehicleTire: (vehicleTire: VehicleTire, isValid: boolean) => void;
 }

package/dist/src/MovaVehicleTireField.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var react_1 = require("react");
-var VehicleTire_1 = __importDefault(require("./models/VehicleTire"));
 var Tools_1 = require("./helpers/Tools");
+var VehicleTire_1 = __importDefault(require("./models/VehicleTire"));
 // Regex pour une taille de pneumatique Française
 var regex = /^[A-Za-z0-9]{7}/;
 var MovaVehicleTireField = function (_a) {
-    var vehicleTire = _a.vehicleTire, onChangeVehicleTire = _a.onChangeVehicleTire;
-    var _b = (0, react_1.useState)(''), tireInfo = _b[0], setTireInfo = _b[1];
+    var vehicleTire = _a.vehicleTire, onChangeVehicleTire = _a.onChangeVehicleTire, label = _a.label;
+    var _b = (0, react_1.useState)(""), tireInfo = _b[0], setTireInfo = _b[1];
     var _c = (0, react_1.useState)(false), error = _c[0], setError = _c[1];
     var _d = (0, react_1.useState)(0), lastLength = _d[0], setLastLength = _d[1]; // Ajout d'un état pour stocker la longueur précédente
     (0, react_1.useEffect)(function () {
@@ -25,7 +25,10 @@ var MovaVehicleTireField = function (_a) {
         var 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)
-        var value = rawValue.toUpperCase().replace(/[^0-9A-QS-Za-qs-z]/g, '').slice(0, 15);
+        var value = rawValue
+            .toUpperCase()
+            .replace(/[^0-9A-QS-Za-qs-z]/g, "")
+            .slice(0, 15);
         // On valide la saisie (le champ n'est pas obligatoire)
         var isValid = value.length == 0 || (value.length > 0 && regex.test(value));
         setError(!regex.test(value));
@@ -56,8 +59,9 @@ var MovaVehicleTireField = function (_a) {
         //console.log('2 valeu',JSON.stringify(value));
         if (additonalChar) {
             var endString = rawValue.substring(15);
-            value = value.substring(0, 15) + (endString !== undefined ? endString : '');
-            console.log(rawValue.split(' ')[5]);
+            value =
+                value.substring(0, 15) + (endString !== undefined ? endString : "");
+            console.log(rawValue.split(" ")[5]);
         }
         else {
             var endString = rawValue.substring(12);
@@ -76,14 +80,14 @@ var MovaVehicleTireField = function (_a) {
         else {
             var width = parts[0], _separator = parts[1], height = parts[2], diameter = parts[3], speedIndex = parts[4];
             speedIndex = value.substring(13);
-            var vehicleTire_2 = new VehicleTire_1.default(width !== null && width !== void 0 ? width : '', height !== null && height !== void 0 ? height : '', diameter !== null && diameter !== void 0 ? diameter : '', speedIndex !== null && speedIndex !== void 0 ? speedIndex : '');
+            var vehicleTire_2 = new VehicleTire_1.default(width !== null && width !== void 0 ? width : "", height !== null && height !== void 0 ? height : "", diameter !== null && diameter !== void 0 ? diameter : "", speedIndex !== null && speedIndex !== void 0 ? speedIndex : "");
             onChangeVehicleTire(vehicleTire_2, isValid);
         }
         setLastLength(value.length); // Mettre à jour la longueur précédente
     };
-    return ((0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Taille des pneumatiques", variant: "outlined", value: tireInfo, onChange: handleChange, fullWidth: true, 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" : '' }));
+    return ((0, jsx_runtime_1.jsx)(material_1.TextField, { label: label ? "Taille des pneumatiques ".concat(label) : "Taille des pneumatiques", variant: "outlined", value: tireInfo, onChange: handleChange, fullWidth: true, 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" : "" }));
 };
 exports.default = MovaVehicleTireField;

package/dist/src/components/vehicle/VehicleFullCard.js

@@ -41,6 +41,11 @@ var 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 },
 };
 var VehicleFullCard = function (_a) {
     var _b;
@@ -66,26 +71,24 @@ var VehicleFullCard = function (_a) {
         initForm();
     }, [vehicle]);
     var initForm = function () {
-        if (vehicle) {
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { currentMileage: __assign(__assign({}, prevForm["currentMileage"]), { value: vehicle.currentMileage }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { averageMileagePerYear: __assign(__assign({}, prevForm["averageMileagePerYear"]), { value: vehicle.averageMileagePerYear }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireWidth: __assign(__assign({}, prevForm["tireWidth"]), { value: vehicle.tireWidth }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireHeight: __assign(__assign({}, prevForm["tireHeight"]), { value: vehicle.tireHeight }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireDiameter: __assign(__assign({}, prevForm["tireDiameter"]), { value: vehicle.tireDiameter }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireSpeedIndex: __assign(__assign({}, prevForm["tireSpeedIndex"]), { value: vehicle.tireSpeedIndex }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { lastInspectionDate: __assign(__assign({}, prevForm["lastInspectionDate"]), { value: vehicle.lastInspectionDate
+        if (!vehicle)
+            return;
+        console.log("vehicle", vehicle);
+        setForm(function (prevForm) {
+            var updatedForm = __assign(__assign({}, prevForm), { currentMileage: __assign(__assign({}, prevForm.currentMileage), { value: vehicle.currentMileage }), averageMileagePerYear: __assign(__assign({}, prevForm.averageMileagePerYear), { value: vehicle.averageMileagePerYear }), tireWidth: __assign(__assign({}, prevForm.tireWidth), { value: vehicle.tireWidth }), tireHeight: __assign(__assign({}, prevForm.tireHeight), { value: vehicle.tireHeight }), tireDiameter: __assign(__assign({}, prevForm.tireDiameter), { value: vehicle.tireDiameter }), tireSpeedIndex: __assign(__assign({}, prevForm.tireSpeedIndex), { value: vehicle.tireSpeedIndex }), secondaryTireWidth: __assign(__assign({}, prevForm.secondaryTireWidth), { value: vehicle.secondaryTireWidth }), secondaryTireHeight: __assign(__assign({}, prevForm.secondaryTireHeight), { value: vehicle.secondaryTireHeight }), secondaryTireDiameter: __assign(__assign({}, prevForm.secondaryTireDiameter), { value: vehicle.secondaryTireDiameter }), secondaryTireSpeedIndex: __assign(__assign({}, prevForm.secondaryTireSpeedIndex), { value: vehicle.secondaryTireSpeedIndex }), lastInspectionDate: __assign(__assign({}, prevForm.lastInspectionDate), { value: vehicle.lastInspectionDate
                         ? new Date(vehicle.lastInspectionDate)
-                        : null }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { lastMaintenanceDate: __assign(__assign({}, prevForm["lastMaintenanceDate"]), { value: vehicle.lastMaintenanceDate
+                        : null }), lastMaintenanceDate: __assign(__assign({}, prevForm.lastMaintenanceDate), { value: vehicle.lastMaintenanceDate
                         ? new Date(vehicle.lastMaintenanceDate)
-                        : null }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireBrand: __assign(__assign({}, prevForm["tireBrand"]), { value: vehicle.tireBrand }) })); });
-            setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireProfile: __assign(__assign({}, prevForm["tireProfile"]), { value: vehicle.tireProfile }) })); });
+                        : null }), tireBrand: __assign(__assign({}, prevForm.tireBrand), { value: vehicle.tireBrand }), tireProfile: __assign(__assign({}, prevForm.tireProfile), { value: vehicle.tireProfile }) });
             if (isVehicleTireSizeDefined(vehicle)) {
-                setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireSize: __assign(__assign({}, prevForm["tireSize"]), { value: vehicle.tireSize }) })); });
+                updatedForm.tireSize = __assign(__assign({}, prevForm.tireSize), { value: vehicle.tireSize });
             }
-            Logger_1.default.info(form);
-        }
+            if (isVehicleSecondaryTireSizeDefined(vehicle)) {
+                updatedForm.secondaryTireSize = __assign(__assign({}, prevForm.secondaryTireSize), { value: vehicle.secondaryTireSize });
+            }
+            return updatedForm;
+        });
+        Logger_1.default.info(form);
     };
     var toggleShowLinkedDocument = function (docType) {
         setShowLinkedDocument(!isShowLinkedDocument);
@@ -100,6 +103,11 @@ var VehicleFullCard = function (_a) {
     var isVehicleTireSizeDefined = function (vehicle) {
         return (vehicle.tireSize && vehicle.tireSize.diameter && vehicle.tireSize.height);
     };
+    var isVehicleSecondaryTireSizeDefined = function (vehicle) {
+        return (vehicle.secondaryTireSize &&
+            vehicle.secondaryTireSize.diameter &&
+            vehicle.secondaryTireSize.height);
+    };
     var validateForm = function () {
         var newForm = __assign({}, form);
         // Validator pour les champs obligatoires
@@ -162,6 +170,9 @@ var VehicleFullCard = function (_a) {
     var handleOnChangeVehicleTire = function (vehicleTire, isValid) {
         setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { tireSize: __assign(__assign({}, prevForm["tireSize"]), { value: vehicleTire, isValid: isValid }) })); });
     };
+    var handleOnChangeVehicleSecondaryTire = function (vehicleTire, isValid) {
+        setForm(function (prevForm) { return (__assign(__assign({}, prevForm), { secondaryTireSize: __assign(__assign({}, prevForm["secondaryTireSize"]), { value: vehicleTire, isValid: isValid }) })); });
+    };
     var handleOnClickDeleteVehicle = function (e) {
         e.preventDefault();
         setOpenConfirmVehicleDelete(true);
@@ -189,6 +200,18 @@ var VehicleFullCard = function (_a) {
                 tireSpeedIndex: form.tireSize.isValid && form.tireSize.value
                     ? form.tireSize.value.speedIndex
                     : undefined,
+                secondaryTireWidth: form.secondaryTireSize && form.secondaryTireSize.value
+                    ? form.secondaryTireSize.value.width
+                    : undefined,
+                secondaryTireHeight: form.secondaryTireSize && form.secondaryTireSize.value
+                    ? form.secondaryTireSize.value.height
+                    : undefined,
+                secondaryTireDiameter: form.secondaryTireSize && form.secondaryTireSize.value
+                    ? form.secondaryTireSize.value.diameter
+                    : undefined,
+                secondaryTireSpeedIndex: form.secondaryTireSize && form.secondaryTireSize.value
+                    ? form.secondaryTireSize.value.speedIndex
+                    : undefined,
                 lastInspectionDate: form.lastInspectionDate.value,
                 lastMaintenanceDate: form.lastMaintenanceDate.value,
                 tireBrand: form.tireBrand.value,
@@ -248,7 +271,7 @@ var VehicleFullCard = function (_a) {
                                                 ? form.currentMileage.error
                                                 : "Sur votre tableau de bord 😉" }) }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 8 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Km moyen annuel :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 4, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: (0, jsx_runtime_1.jsxs)("b", { children: [vehicle.averageMileagePerYear, " km"] }) })) }))] }))), localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ fullWidth: true, margin: "normal", error: Boolean(form.averageMileagePerYear.error) }, { children: [(0, jsx_runtime_1.jsx)(material_1.InputLabel, __assign({ id: "averageMileagePerYear-label" }, { children: "Kilom\u00E9trage moyen annuel" })), (0, jsx_runtime_1.jsxs)(material_1.Select, __assign({ labelId: "averageMileagePerYear-label", id: "averageMileagePerYear", name: "averageMileagePerYear", value: form.averageMileagePerYear.value
                                                         ? String(form.averageMileagePerYear.value)
-                                                        : "", onChange: function (e) { return handleSelectChange(e); }, label: "Kilom\u00E9trage moyen annuel" }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 5000 }, { children: "5 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 10000 }, { children: "10 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 15000 }, { children: "15 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 20000 }, { children: "20 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 25000 }, { children: "25 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 30000 }, { children: "30 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 50000 }, { children: "50 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 75000 }, { children: "75 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 100000 }, { children: "100 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 999999 }, { children: "+100 000" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: form.averageMileagePerYear.error })] })) }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: isVehicleTireSizeDefined(vehicle) ? ((0, jsx_runtime_1.jsx)("b", { children: (0, Tools_1.formatVehicleTire)(vehicle.tireSize) })) : ("-") })) }))] }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Marque pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: vehicle.tireBrand ? (0, jsx_runtime_1.jsx)("b", { children: vehicle.tireBrand }) : "-" })) }))] }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Mod\u00E8le pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: vehicle.tireProfile ? (0, jsx_runtime_1.jsx)("b", { children: vehicle.tireProfile }) : "-" })) }))] }))), localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 1 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { vehicleTire: form.tireSize.value, onChangeVehicleTire: handleOnChangeVehicleTire }) }))), localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Mod\u00E8le pneumatique", name: "tireProfile", variant: "outlined", value: form.tireProfile.value, onChange: function (e) { return handleInputChange(e); }, error: Boolean(form.tireProfile.error), sx: {
+                                                        : "", onChange: function (e) { return handleSelectChange(e); }, label: "Kilom\u00E9trage moyen annuel" }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 5000 }, { children: "5 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 10000 }, { children: "10 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 15000 }, { children: "15 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 20000 }, { children: "20 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 25000 }, { children: "25 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 30000 }, { children: "30 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 50000 }, { children: "50 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 75000 }, { children: "75 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 100000 }, { children: "100 000" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: 999999 }, { children: "+100 000" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: form.averageMileagePerYear.error })] })) }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: ["Pneumatiques", " ", isVehicleSecondaryTireSizeDefined(vehicle) ? "AV" : "", " ", ":"] })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: isVehicleTireSizeDefined(vehicle) ? ((0, jsx_runtime_1.jsx)("b", { children: (0, Tools_1.formatVehicleTire)(vehicle.tireSize) })) : ("-") })) }))] })), isVehicleSecondaryTireSizeDefined(vehicle) && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Pneumatiques AR:" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: isVehicleSecondaryTireSizeDefined(vehicle) ? ((0, jsx_runtime_1.jsx)("b", { children: (0, Tools_1.formatVehicleTire)(vehicle.secondaryTireSize) })) : ("-") })) }))] })))] })), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Marque pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: vehicle.tireBrand ? (0, jsx_runtime_1.jsx)("b", { children: vehicle.tireBrand }) : "-" })) }))] }))), !localEditMode && ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true, textAlign: "justify", sx: { pt: 2 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: "Mod\u00E8le pneumatiques :" })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6, sx: { textAlign: "right" } }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "body1", color: "text.secondary" }, { children: vehicle.tireProfile ? (0, jsx_runtime_1.jsx)("b", { children: vehicle.tireProfile }) : "-" })) }))] }))), localEditMode && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 1 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { label: "AV", vehicleTire: form.tireSize.value, onChangeVehicleTire: handleOnChangeVehicleTire }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 1 } }, { children: (0, jsx_runtime_1.jsx)(MovaVehicleTireField_1.default, { label: "AR", vehicleTire: form.secondaryTireSize.value, onChangeVehicleTire: handleOnChangeVehicleSecondaryTire }) }))] })), localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Mod\u00E8le pneumatique", name: "tireProfile", variant: "outlined", value: form.tireProfile.value, onChange: function (e) { return handleInputChange(e); }, error: Boolean(form.tireProfile.error), sx: {
                                                 width: "100%",
                                                 mt: 2,
                                                 "& input": { textTransform: "uppercase" }, // CSS pour forcer les majuscules dans l'input

package/dist/src/helpers/Enums.d.ts

@@ -216,7 +216,8 @@ export declare enum QuoteState {
     QUOTE_DRAFT = "QUOTE_DRAFT",
     QUOTE_SENT = "QUOTE_SENT",
     QUOTE_ACCEPTED = "QUOTE_ACCEPTED",
-    QUOTE_REJECTED = "QUOTE_REJECTED"
+    QUOTE_REJECTED = "QUOTE_REJECTED",
+    QUOTE_CANCELLED = "CANCELLED"
 }
 export declare enum DocumentType {
     USER_BANK_DETAILS = "USER_BANK_DETAILS",

package/dist/src/helpers/Enums.js

@@ -243,6 +243,7 @@ var QuoteState;
     QuoteState["QUOTE_SENT"] = "QUOTE_SENT";
     QuoteState["QUOTE_ACCEPTED"] = "QUOTE_ACCEPTED";
     QuoteState["QUOTE_REJECTED"] = "QUOTE_REJECTED";
+    QuoteState["QUOTE_CANCELLED"] = "CANCELLED";
 })(QuoteState = exports.QuoteState || (exports.QuoteState = {}));
 var DocumentType;
 (function (DocumentType) {

package/dist/src/helpers/Types.d.ts

@@ -18,6 +18,11 @@ export type MovaVehicleForm = {
     lastMaintenanceDate: MovaFormField;
     tireBrand: MovaFormField;
     tireProfile: MovaFormField;
+    secondaryTireSize: MovaFormField;
+    secondaryTireWidth: MovaFormField;
+    secondaryTireHeight: MovaFormField;
+    secondaryTireDiameter: MovaFormField;
+    secondaryTireSpeedIndex: MovaFormField;
 };
 /**
  * Type utilisé pour définir un interval sur une objet Schedule

package/dist/src/models/Garage.d.ts

@@ -62,5 +62,6 @@ export default class Garage {
     quoteRequestStart?: Date;
     companyRegistrationNumber?: string;
     establishmentRegistrationNumber?: string;
-    constructor(id: string, adminId: string, name: string, address: Address, workforce: number, prestations: Prestation[], schedules: Schedule[], contactPhone: string, prestationCategories: CategoryPrestation[], dayPeriodFastServiceExcluded: boolean, loanerVehicleFastServiceExcluded: boolean, fastServiceThreshold: number, timezone: string, vehicles?: VehicleGarage[], contactEmail?: string, logo?: string, suppliers?: Supplier[], documents?: Document[], subscriptions?: Subscription[], loanerVehicleActive?: boolean, loanerVehicleRequestActive?: boolean, customStyle?: string, subscription?: Subscription, partialWorkforce?: number, mailCustomization?: boolean, billingActive?: boolean, billingToken?: string, billingSimulationActive?: boolean, appId?: number, establishmentRegistrationNumber?: string, companyRegistrationNumber?: string, quoteRequestStart?: Date);
+    reopeningDate?: Date;
+    constructor(id: string, adminId: string, name: string, address: Address, workforce: number, prestations: Prestation[], schedules: Schedule[], contactPhone: string, prestationCategories: CategoryPrestation[], dayPeriodFastServiceExcluded: boolean, loanerVehicleFastServiceExcluded: boolean, fastServiceThreshold: number, timezone: string, vehicles?: VehicleGarage[], contactEmail?: string, logo?: string, suppliers?: Supplier[], documents?: Document[], subscriptions?: Subscription[], loanerVehicleActive?: boolean, loanerVehicleRequestActive?: boolean, customStyle?: string, subscription?: Subscription, partialWorkforce?: number, mailCustomization?: boolean, billingActive?: boolean, billingToken?: string, billingSimulationActive?: boolean, appId?: number, establishmentRegistrationNumber?: string, companyRegistrationNumber?: string, quoteRequestStart?: Date, reopeningDate?: Date);
 }

package/dist/src/models/Garage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Garage = /** @class */ (function () {
-    function Garage(id, adminId, name, address, workforce, prestations, schedules, contactPhone, prestationCategories, dayPeriodFastServiceExcluded, loanerVehicleFastServiceExcluded, fastServiceThreshold, timezone, vehicles, contactEmail, logo, suppliers, documents, subscriptions, loanerVehicleActive, loanerVehicleRequestActive, customStyle, subscription, partialWorkforce, mailCustomization, billingActive, billingToken, billingSimulationActive, appId, establishmentRegistrationNumber, companyRegistrationNumber, quoteRequestStart) {
+    function Garage(id, adminId, name, address, workforce, prestations, schedules, contactPhone, prestationCategories, dayPeriodFastServiceExcluded, loanerVehicleFastServiceExcluded, fastServiceThreshold, timezone, vehicles, contactEmail, logo, suppliers, documents, subscriptions, loanerVehicleActive, loanerVehicleRequestActive, customStyle, subscription, partialWorkforce, mailCustomization, billingActive, billingToken, billingSimulationActive, appId, establishmentRegistrationNumber, companyRegistrationNumber, quoteRequestStart, reopeningDate) {
         this.id = id;
         this.adminId = adminId;
         this.name = name;
@@ -34,6 +34,7 @@ var Garage = /** @class */ (function () {
         this.quoteRequestStart = quoteRequestStart;
         this.companyRegistrationNumber = companyRegistrationNumber;
         this.establishmentRegistrationNumber = establishmentRegistrationNumber;
+        this.reopeningDate = reopeningDate;
     }
     return Garage;
 }());

package/dist/src/models/Prestation.d.ts

@@ -22,10 +22,11 @@ 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;
     state: PrestationState;
     multipleApplication: boolean;
     operationsVisible: boolean;
     categoryCode: string;
-    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[]);
+    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, availableOnline: boolean, operations?: Operation[]);
 }

package/dist/src/models/Prestation.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Prestation = /** @class */ (function () {
-    function Prestation(id, code, name, description, category, downtime, appointmentDelay, position, active, state, multipleApplication, operationsVisible, categoryCode, operations) {
+    function Prestation(id, code, name, description, category, downtime, appointmentDelay, position, active, state, multipleApplication, operationsVisible, categoryCode, availableOnline, operations) {
         this.id = id;
         this.code = code;
         this.name = name;
@@ -16,6 +16,7 @@ var Prestation = /** @class */ (function () {
         this.operations = operations;
         this.state = state;
         this.categoryCode = categoryCode;
+        this.availableOnline = availableOnline;
     }
     return Prestation;
 }());

package/dist/src/models/Vehicle.d.ts

@@ -25,6 +25,11 @@ export default class Vehicle {
     foreignPlate: boolean;
     tireBrand?: string;
     tireProfile?: string;
-    constructor(id: number, ownerId: number, averageMileagePerYear: number, plate: string, brand: string, model: string, version: string, vin: string, currentMileage: number, digitalPassportIndex: DigitalPassportIndex, firstRegistrationDate: Date, ktype: string, tireDiameter: string, tireHeight: string, tireSpeedIndex: string, tireWidth: string, documents: Document[], tireSize: VehicleTire, lastInspectionDate: Date, lastMaintenanceDate: Date, foreignPlate: boolean, tireBrand?: string, tireProfile?: string);
+    secondaryTireDiameter: string;
+    secondaryTireHeight: string;
+    secondaryTireSpeedIndex: string;
+    secondaryTireWidth: string;
+    secondaryTireSize: VehicleTire;
+    constructor(id: number, ownerId: number, averageMileagePerYear: number, plate: string, brand: string, model: string, version: string, vin: string, currentMileage: number, digitalPassportIndex: DigitalPassportIndex, firstRegistrationDate: Date, ktype: string, tireDiameter: string, tireHeight: string, tireSpeedIndex: string, tireWidth: string, documents: Document[], tireSize: VehicleTire, lastInspectionDate: Date, lastMaintenanceDate: Date, foreignPlate: boolean, secondaryTireDiameter: string, secondaryTireHeight: string, secondaryTireSpeedIndex: string, secondaryTireWidth: string, secondaryTireSize: VehicleTire, tireBrand?: string, tireProfile?: string);
     getVehicleLabel(): string;
 }

package/dist/src/models/Vehicle.js

@@ -11,7 +11,7 @@ Carburant : Essence
 Cylindrée : 1984 cm3
 Puissance : 140 KW (190 HP) */
 var Vehicle = /** @class */ (function () {
-    function Vehicle(id, ownerId, averageMileagePerYear, plate, brand, model, version, vin, currentMileage, digitalPassportIndex, firstRegistrationDate, ktype, tireDiameter, tireHeight, tireSpeedIndex, tireWidth, documents, tireSize, lastInspectionDate, lastMaintenanceDate, foreignPlate, tireBrand, tireProfile) {
+    function Vehicle(id, ownerId, averageMileagePerYear, plate, brand, model, version, vin, currentMileage, digitalPassportIndex, firstRegistrationDate, ktype, tireDiameter, tireHeight, tireSpeedIndex, tireWidth, documents, tireSize, lastInspectionDate, lastMaintenanceDate, foreignPlate, secondaryTireDiameter, secondaryTireHeight, secondaryTireSpeedIndex, secondaryTireWidth, secondaryTireSize, tireBrand, tireProfile) {
         this.id = id;
         this.ownerId = ownerId;
         this.averageMileagePerYear = averageMileagePerYear;
@@ -35,6 +35,11 @@ var Vehicle = /** @class */ (function () {
         this.foreignPlate = foreignPlate;
         this.tireBrand = tireBrand;
         this.tireProfile = tireProfile;
+        this.secondaryTireDiameter = secondaryTireDiameter;
+        this.secondaryTireHeight = secondaryTireHeight;
+        this.secondaryTireSpeedIndex = secondaryTireSpeedIndex;
+        this.secondaryTireWidth = secondaryTireWidth;
+        this.secondaryTireSize = secondaryTireSize;
     }
     Vehicle.prototype.getVehicleLabel = function () {
         return "".concat(this.brand, " ").concat(this.model, " ").concat(this.version);

package/dist/src/services/GarageService.types.d.ts

@@ -14,6 +14,10 @@ export type AddCustomerVehicleParams = {
     tireHeight?: string;
     tireDiameter?: string;
     tireSpeedIndex?: string;
+    secondaryTireWidth?: string;
+    secondaryTireHeight?: string;
+    secondaryTireDiameter?: string;
+    secondaryTireSpeedIndex?: string;
     lastMaintenanceDate?: string;
     lastInspectionDate?: string;
     isForeignPlate?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.64.2",
+	"version": "1.64.3",
 	"description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

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;
       }
 }

package/src/models/Vehicle.ts

@@ -38,6 +38,11 @@ export default class Vehicle {
   foreignPlate: boolean;
   tireBrand?: string;
   tireProfile?: string;
+  secondaryTireDiameter: string;
+  secondaryTireHeight: string;
+  secondaryTireSpeedIndex: string;
+  secondaryTireWidth: string;
+  secondaryTireSize: VehicleTire;
 
   constructor(
     id: number,
@@ -61,6 +66,11 @@ export default class Vehicle {
     lastInspectionDate: Date,
     lastMaintenanceDate: Date,
     foreignPlate: boolean,
+    secondaryTireDiameter: string,
+    secondaryTireHeight: string,
+    secondaryTireSpeedIndex: string,
+    secondaryTireWidth: string,
+    secondaryTireSize: VehicleTire,
     tireBrand?: string,
     tireProfile?: string
   ) {
@@ -87,6 +97,11 @@ export default class Vehicle {
     this.foreignPlate = foreignPlate;
     this.tireBrand = tireBrand;
     this.tireProfile = tireProfile;
+    this.secondaryTireDiameter = secondaryTireDiameter;
+    this.secondaryTireHeight = secondaryTireHeight;
+    this.secondaryTireSpeedIndex = secondaryTireSpeedIndex;
+    this.secondaryTireWidth = secondaryTireWidth;
+    this.secondaryTireSize = secondaryTireSize;
   }
 
   getVehicleLabel() {

package/src/services/GarageService.types.ts

@@ -1,32 +1,36 @@
 export type AddCustomerVehicleParams = {
-	/** L'identifiant unique du garage */
-	garageId: string;
-	/** L'identifiant unique du client */
-	customerId: string;
-	/** La plaque d'immat du véhicule */
-	plate: string;
-	/** Le nombre de km au compteur */
-	currentMileage?: number;
-	/** Le nombre moyen de km par an */
-	averageMileagePerYear?: number;
+  /** L'identifiant unique du garage */
+  garageId: string;
+  /** L'identifiant unique du client */
+  customerId: string;
+  /** La plaque d'immat du véhicule */
+  plate: string;
+  /** Le nombre de km au compteur */
+  currentMileage?: number;
+  /** Le nombre moyen de km par an */
+  averageMileagePerYear?: number;
 
-	/** Identification du pneu (XXX XX RXX XXX) */
-	tireWidth?: string;
-	tireHeight?: string;
-	tireDiameter?: string;
-	tireSpeedIndex?: string;
-	lastMaintenanceDate?: string;
-	lastInspectionDate?: string;
-	isForeignPlate?: boolean;
-	model?: string
-}
+  /** Identification du pneu (XXX XX RXX XXX) */
+  tireWidth?: string;
+  tireHeight?: string;
+  tireDiameter?: string;
+  tireSpeedIndex?: string;
+  secondaryTireWidth?: string;
+  secondaryTireHeight?: string;
+  secondaryTireDiameter?: string;
+  secondaryTireSpeedIndex?: string;
+  lastMaintenanceDate?: string;
+  lastInspectionDate?: string;
 
+  isForeignPlate?: boolean;
+  model?: string;
+};
 
 export type DeleteCustomerVehicleParams = {
-	/** L'identifiant unique du garage */
-	garageId: string;
-	/** L'identifiant unique du client */
-	customerId: string;
-	/** L'identifiant unique du véhicule */
-	vehicleId: string;
-}
+  /** L'identifiant unique du garage */
+  garageId: string;
+  /** L'identifiant unique du client */
+  customerId: string;
+  /** L'identifiant unique du véhicule */
+  vehicleId: string;
+};