@movalib/movalib-commons 1.59.30 → 1.59.32

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

@@ -46,10 +46,12 @@ export default class Event {
     documents?: Document[];
     customerReminders?: number;
     vehicleAvailableNotified?: boolean;
+    vehicleAvailableNotificationTime?: Date;
     editable?: boolean;
     vehicleDepositDate?: Date;
     vehicleDepositDateRequest?: Date;
     color?: string;
+    interventionEndTime?: Date;
     /** Propriété calculée pas toujours présent, pour savoir si les produits de cet event on été commandé au grossistes */
     hasProductOrdered?: boolean;
     /** Eventuels opérateurs associés à l'event */
@@ -63,6 +65,6 @@ export default class Event {
     garageVehicleId?: number;
     garageVehicleRequest?: boolean;
     origin?: string;
-    constructor(id: string, ownerId: number, type: EventType, title: string, garageName: string, garageId: number, color: string, state: EventState, garageAddress?: Address, start?: Date, end?: Date, prestations?: Prestation[], operations?: Operation[], products?: Product[], guestsId?: string[], vehicleId?: number, quoteId?: number, notes?: string, vehicleAvailableNotified?: boolean, editable?: boolean, resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean);
+    constructor(id: string, ownerId: number, type: EventType, title: string, garageName: string, garageId: number, color: string, state: EventState, garageAddress?: Address, start?: Date, end?: Date, prestations?: Prestation[], operations?: Operation[], products?: Product[], guestsId?: string[], vehicleId?: number, quoteId?: number, notes?: string, vehicleAvailableNotified?: boolean, editable?: boolean, resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean, vehicleAvailableNotificationTime?: Date, interventionEndTime?: Date);
     static getPrestationsList(event: Event): string[];
 }

package/dist/src/models/Event.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Event = /** @class */ (function () {
-    function Event(id, ownerId, type, title, garageName, garageId, color, state, garageAddress, start, end, prestations, operations, products, guestsId, vehicleId, quoteId, notes, vehicleAvailableNotified, editable, resourceId, garageVehicleId, garageVehicleRequest) {
+    function Event(id, ownerId, type, title, garageName, garageId, color, state, garageAddress, start, end, prestations, operations, products, guestsId, vehicleId, quoteId, notes, vehicleAvailableNotified, editable, resourceId, garageVehicleId, garageVehicleRequest, vehicleAvailableNotificationTime, interventionEndTime) {
         this.id = id;
         this.notes = notes;
         this.ownerId = ownerId;
@@ -25,6 +25,8 @@ var Event = /** @class */ (function () {
         this.color = color;
         this.garageVehicleId = garageVehicleId;
         this.garageVehicleRequest = garageVehicleRequest;
+        this.vehicleAvailableNotificationTime = vehicleAvailableNotificationTime ? new Date(vehicleAvailableNotificationTime) : undefined;
+        this.interventionEndTime = interventionEndTime ? new Date(interventionEndTime) : undefined;
     }
     Event.getPrestationsList = function (event) {
         if (event && event.prestations) {

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

@@ -54,5 +54,6 @@ export default class Garage {
     paymentAuthorizationMinDowntime?: number;
     timezone: string;
     customStyle?: 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;
+    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);
 }

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) {
+    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) {
         this.id = id;
         this.adminId = adminId;
         this.name = name;
@@ -26,6 +26,7 @@ var Garage = /** @class */ (function () {
         this.fastServiceThreshold = fastServiceThreshold;
         this.customStyle = customStyle;
         this.timezone = timezone;
+        this.mailCustomization = mailCustomization;
     }
     return Garage;
 }());

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

@@ -23,6 +23,7 @@ export default class GarageService {
         garageId: string;
     }): Promise<APIResponse<Garage>>;
     static uploadLogo(garageId: string, formData: FormData): Promise<APIResponse<string>>;
+    static sendInterventionEnd(garageId: string, eventId: string): Promise<APIResponse<string>>;
     static sendAppointmentVehicleAvailable(garageId: string, eventId: string): Promise<APIResponse<string>>;
     static enableGaragePrestation(garageId: string, prestationId: string): Promise<APIResponse<string>>;
     static disableGaragePrestation(garageId: string, prestationId: string): Promise<APIResponse<string>>;

package/dist/src/services/GarageService.js

@@ -137,6 +137,13 @@ var GarageService = /** @class */ (function () {
             body: formData,
         });
     };
+    GarageService.sendInterventionEnd = function (garageId, eventId) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/intervention-end"),
+            method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.GARAGE,
+        });
+    };
     GarageService.sendAppointmentVehicleAvailable = function (garageId, eventId) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/vehicle-available"),

package/package.json

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

package/src/components/vehicle/VehicleFullCard.tsx

@@ -23,6 +23,7 @@ import { AttachFile } from '@mui/icons-material';
 import { LinkedDocumentDialog } from '../LinkedDocumentDialog';
 import User from '../../models/User';
 import CatPlateBg from '../../assets/images/car_plate_bg.png';
+import { DatePicker } from '@mui/x-date-pickers';
 
 interface VehicleFullCardProps {
     currentUser: User,
@@ -46,7 +47,9 @@ const initialUserFormState = {
     tireWidth: { value: '', isValid: true },
     tireHeight: { value: '', isValid: true },
     tireDiameter: { value: '', isValid: true },
-    tireSpeedIndex: { value: '', isValid: true }
+    tireSpeedIndex: { value: '', isValid: true },
+    lastInspectionDate: { value: null, isValid: true },
+    lastMaintenanceDate: { value: null, isValid: true }
 }
 
 const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError, onUploadDocument, onDeleteDocument, appType, editMode = false, focused = false, onUpdate, onDelete, currentUpload, currentUser }) => {
@@ -80,7 +83,8 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
     }, [vehicle]);
 
     const initForm = () => {
-        if (vehicle) {
+        if (vehicle)
+        {
 
             setForm(prevForm => (
                 { ...prevForm, ['currentMileage']: { ...prevForm['currentMileage'], value: vehicle.currentMileage } }));
@@ -94,6 +98,10 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
                 { ...prevForm, ['tireDiameter']: { ...prevForm['tireDiameter'], value: vehicle.tireDiameter } }));
             setForm(prevForm => (
                 { ...prevForm, ['tireSpeedIndex']: { ...prevForm['tireSpeedIndex'], value: vehicle.tireSpeedIndex } }));
+            setForm(prevForm => (
+                { ...prevForm, ['lastInspectionDate']: { ...prevForm['lastInspectionDate'], value: vehicle.lastInspectionDate ? new Date(vehicle.lastInspectionDate) : null } }));
+            setForm(prevForm => (
+                { ...prevForm, ['lastMaintenanceDate']: { ...prevForm['lastMaintenanceDate'], value: vehicle.lastMaintenanceDate ? new Date(vehicle.lastMaintenanceDate) : null } }));
 
             if (isVehicleTireSizeDefined(vehicle))
             {
@@ -107,10 +115,12 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
 
     const toggleShowLinkedDocument = (docType: DocumentType | null) => {
         setShowLinkedDocument(!isShowLinkedDocument);
-        if (docType && invoiceInputRef.current) {
+        if (docType && invoiceInputRef.current)
+        {
             docTypeCurrent.current = docType;
             invoiceInputRef.current.click();
-        } else {
+        } else
+        {
             docTypeCurrent.current = undefined;
         }
     }
@@ -142,18 +152,21 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
     }
 
     const handleChange = (fieldName: string, fieldValue: string): void => {
+        console.log(fieldName, fieldValue);
         const newField: MovaFormField = { [fieldName]: { value: fieldValue, isValid: true } };
 
         setForm({ ...form, ...newField });
     }
 
     const uploadVehicleDocument = (document: File, documentType: DocumentType) => {
-        if (document.size > 10000000) {
+        if (document.size > 10000000)
+        {
             setSizeLimit(true);
             return;
         }
 
-        if (vehicle && document && documentType) {
+        if (vehicle && document && documentType)
+        {
 
             // Utilisation d'un formData pour permettre le trasnfert de fichier vers l'API
             let formData = new FormData();
@@ -175,7 +188,8 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
     const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>, docType: DocumentType) => {
         event.preventDefault();
 
-        if (event && event.target.files && event.target.files.length > 0 && docType) {
+        if (event && event.target.files && event.target.files.length > 0 && docType)
+        {
             uploadVehicleDocument(event.target.files[0], docType);
         }
 
@@ -192,6 +206,7 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
             { ...prevForm, ['tireSize']: { ...prevForm['tireSize'], value: vehicleTire, isValid: isValid } }));
     }
 
+
     const handleOnClickDeleteVehicle = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
         e.preventDefault();
         setOpenConfirmVehicleDelete(true);
@@ -205,7 +220,8 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
 
     const handleOnClickValidate = () => {
 
-        if (validateForm()) {
+        if (validateForm())
+        {
 
             Logger.info(form.tireSize.value);
 
@@ -215,7 +231,9 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
                 tireWidth: form.tireSize.isValid && form.tireSize.value ? (form.tireSize.value as VehicleTire).width : undefined,
                 tireHeight: form.tireSize.isValid && form.tireSize.value ? (form.tireSize.value as VehicleTire).height : undefined,
                 tireDiameter: form.tireSize.isValid && form.tireSize.value ? (form.tireSize.value as VehicleTire).diameter : undefined,
-                tireSpeedIndex: form.tireSize.isValid && form.tireSize.value ? (form.tireSize.value as VehicleTire).speedIndex : undefined
+                tireSpeedIndex: form.tireSize.isValid && form.tireSize.value ? (form.tireSize.value as VehicleTire).speedIndex : undefined,
+                lastInspectionDate: form.lastInspectionDate.value,
+                lastMaintenanceDate: form.lastMaintenanceDate.value,
             }
             Logger.info(query)
 
@@ -245,7 +263,8 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
     const handleConfirmDocumentDelete = () => {
         setOpenConfirmDocumentDelete(false);
 
-        if (vehicle && documentToDelete) {
+        if (vehicle && documentToDelete)
+        {
 
             // Appel du callback correspondant
             if (onDeleteDocument)
@@ -256,7 +275,8 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
     const handleConfirmVehicleDelete = () => {
         setOpenConfirmVehicleDelete(false);
 
-        if (vehicle && onDelete) {
+        if (vehicle && onDelete)
+        {
 
             // Appel du callback correspondant
             onDelete();
@@ -280,12 +300,12 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
                         </Typography>
                         <Grid container justifyContent="space-between">
 
-                            <Grid container sx={{ mb: 1, alignItems: 'center', justifyContent: 'center'  }}>
-                                <Grid item xs={6} sx={{ position: 'relative', minWidth: '234px'}}>
+                            <Grid container sx={{ mb: 1, alignItems: 'center', justifyContent: 'center' }}>
+                                <Grid item xs={6} sx={{ position: 'relative', minWidth: '234px' }}>
                                     <img
                                         src={CatPlateBg}
                                         alt="Plaque d'immatriculation"
-                                        style={{ height: '50px', position: 'relative',  }}
+                                        style={{ height: '50px', position: 'relative', }}
                                     />
                                     <Typography
                                         variant='h6'
@@ -395,6 +415,64 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({ vehicle, fullwidth, onError
                                 />
                             </Grid>}
 
+                            {!localEditMode && <Grid container textAlign='justify' sx={{ pt: 2 }}>
+                                <Grid item xs={8} >
+                                    <Typography variant="body1" color="text.secondary">
+                                        Dernier contrôle technique :
+                                    </Typography>
+                                </Grid>
+                                <Grid item xs={4} sx={{ textAlign: 'right' }}>
+                                    <Typography variant="body1" color="text.secondary">
+                                        <b>{formatDateByTimezone(vehicle.lastInspectionDate, 'Europe/Paris', DateFormatTypes.SHORT_FORMAT_DATE) !== '' ? formatDateByTimezone(vehicle.lastInspectionDate, 'Europe/Paris', DateFormatTypes.SHORT_FORMAT_DATE) : '-'}</b>
+                                    </Typography>
+                                </Grid>
+                            </Grid>}
+
+                            {localEditMode && <Grid item xs={12}>
+                                <FormControl fullWidth sx={{marginTop: 2}}>
+                                    <DatePicker
+                                        label={"Dernier contrôle technique"}
+                                        name={'lastInspectionDate'}
+                                        value={form.lastInspectionDate.value}
+                                        format='dd/MM/yyyy'
+                                        formatDensity='dense'
+                                        views={['day']}
+                                        displayWeekNumber
+                                        onChange={(e)=>handleChange('lastInspectionDate',e)}
+                                    />
+                                </FormControl>
+                            </Grid>}
+
+                            {!localEditMode && <Grid container textAlign='justify' sx={{ pt: 2 }}>
+                                <Grid item xs={8} >
+                                    <Typography variant="body1" color="text.secondary">
+                                        Dernier entretien :
+                                    </Typography>
+                                </Grid>
+                                <Grid item xs={4} sx={{ textAlign: 'right' }}>
+                                    <Typography variant="body1" color="text.secondary">
+                                    <b>{formatDateByTimezone(vehicle.lastMaintenanceDate, 'Europe/Paris', DateFormatTypes.SHORT_FORMAT_DATE) !== '' ? formatDateByTimezone(vehicle.lastMaintenanceDate, 'Europe/Paris', DateFormatTypes.SHORT_FORMAT_DATE) : '-'}</b>
+                                    </Typography>
+                                </Grid>
+                            </Grid>}
+
+                            {localEditMode && <Grid item xs={12}>
+                                <FormControl fullWidth sx={{marginTop: 2}}>
+                                    <DatePicker
+                                        label={"Dernier entretient"}
+                                        name={'lastMaintenanceDate'}
+                                        value={form.lastMaintenanceDate.value}
+                                        format='dd/MM/yyyy'
+                                        formatDensity='dense'
+                                        views={['day']}
+                                        displayWeekNumber
+                                        onChange={(e)=>handleChange('lastMaintenanceDate',e)}
+                                    />
+                                </FormControl>
+                            </Grid>}
+
+
+
                         </Grid>
 
                         {!localEditMode && <>

package/src/helpers/Types.ts

@@ -15,7 +15,9 @@ export type MovaVehicleForm = {
     tireWidth: MovaFormField,
     tireHeight: MovaFormField,
     tireDiameter: MovaFormField,
-    tireSpeedIndex: MovaFormField
+    tireSpeedIndex: MovaFormField,
+    lastInspectionDate: MovaFormField,
+    lastMaintenanceDate: MovaFormField,
 }
 
 /**

package/src/models/Event.ts

@@ -49,11 +49,12 @@ export default class Event {
     documents?: Document[];
     customerReminders?: number;
     vehicleAvailableNotified?: boolean;
+    vehicleAvailableNotificationTime?:Date
     editable?: boolean;
     vehicleDepositDate?: Date;
     vehicleDepositDateRequest?: Date;
     color?: string;
-
+    interventionEndTime?: Date;
     /** Propriété calculée pas toujours présent, pour savoir si les produits de cet event on été commandé au grossistes */
     hasProductOrdered?: boolean;
 
@@ -74,7 +75,7 @@ export default class Event {
     constructor(id: string, ownerId: number, type : EventType, title: string, garageName: string,  garageId: number,color: string,
             state: EventState, garageAddress?: Address, start?: Date, end?: Date, prestations?: Prestation[], operations?: Operation[], products?: Product[],
             guestsId?: string[], vehicleId?: number, quoteId?: number, notes?: string, vehicleAvailableNotified?: boolean, editable?: boolean, 
-            resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean)
+            resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean, vehicleAvailableNotificationTime?: Date, interventionEndTime?: Date)
     {
         this.id = id;
         this.notes = notes;
@@ -99,6 +100,8 @@ export default class Event {
         this.color = color;
         this.garageVehicleId = garageVehicleId;
         this.garageVehicleRequest = garageVehicleRequest;
+        this.vehicleAvailableNotificationTime = vehicleAvailableNotificationTime ? new Date(vehicleAvailableNotificationTime) : undefined;
+        this.interventionEndTime = interventionEndTime ? new Date(interventionEndTime) : undefined;
     }
 
     static getPrestationsList(event: Event) : string[] {

package/src/models/Garage.ts

@@ -55,6 +55,7 @@ export default class Garage {
     paymentAuthorizationMinDowntime?: number;
     timezone: string;
     customStyle?: string;
+    mailCustomization?: boolean;
 
     constructor(
         id:string,
@@ -81,6 +82,7 @@ export default class Garage {
         customStyle?: string,
         subscription?: Subscription,
         partialWorkforce?: number,
+        mailCustomization?: boolean,
     ) {
         this.id = id;
         this.adminId = adminId;
@@ -106,5 +108,6 @@ export default class Garage {
         this.fastServiceThreshold = fastServiceThreshold;
         this.customStyle = customStyle;
         this.timezone = timezone;
+        this.mailCustomization = mailCustomization;
     }
 }

package/src/models/Vehicle.ts

@@ -34,6 +34,8 @@ export default class Vehicle {
      tireWidth: string;
      documents : Document[];
      tireSize: VehicleTire;
+     lastInspectionDate: Date;
+     lastMaintenanceDate: Date;
 
     constructor(
         id: number,
@@ -53,7 +55,9 @@ export default class Vehicle {
         tireSpeedIndex: string,
         tireWidth: string,
         documents: Document[],
-        tireSize: VehicleTire
+        tireSize: VehicleTire,
+        lastInspectionDate: Date,
+        lastMaintenanceDate: Date
     ) {
         this.id = id;
         this.ownerId = ownerId;
@@ -73,6 +77,8 @@ export default class Vehicle {
         this.tireWidth = tireWidth;
         this.documents = documents;
         this.tireSize = tireSize;
+        this.lastInspectionDate = lastInspectionDate;
+        this.lastMaintenanceDate = lastMaintenanceDate;
     }
 
     getVehicleLabel() {

package/src/services/GarageService.ts

@@ -171,6 +171,17 @@ export default class GarageService {
 		});
 	}
 
+	static sendInterventionEnd(
+		garageId: string,
+		eventId: string,
+	): Promise<APIResponse<string>> {
+		return request({
+			url: `${API_BASE_URL}/garage/${garageId}/event/${eventId}/intervention-end`,
+			method: APIMethod.POST,
+			appType: MovaAppType.GARAGE,
+		});
+	}
+
 	static sendAppointmentVehicleAvailable(
 		garageId: string,
 		eventId: string,

package/src/services/GarageService.types.ts

@@ -15,6 +15,8 @@ export type AddCustomerVehicleParams = {
 	tireHeight?: string;
 	tireDiameter?: string;
 	tireSpeedIndex?: string;
+	lastMaintenanceDate?: string;
+	lastInspectionDate?: string;
 }