@movalib/movalib-commons 1.68.37 → 1.68.39

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

@@ -54,7 +54,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var CloseRounded_1 = __importDefault(require("@mui/icons-material/CloseRounded"));
 var EditRounded_1 = __importDefault(require("@mui/icons-material/EditRounded"));
-var NoteAlt_1 = __importDefault(require("@mui/icons-material/NoteAlt"));
+var StickyNote2_1 = __importDefault(require("@mui/icons-material/StickyNote2"));
 var material_1 = require("@mui/material");
 var x_date_pickers_1 = require("@mui/x-date-pickers");
 var moment_1 = __importDefault(require("moment"));
@@ -283,7 +283,7 @@ var VehicleFullCard = function (_a) {
                                                                     case 1: return [2 /*return*/, _a.sent()];
                                                                 }
                                                             });
-                                                        }); }, "aria-label": "Copier la plaque", children: (0, jsx_runtime_1.jsx)(icons_material_1.ContentCopy, { sx: { fontSize: 14, color: "text.disabled" } }) })] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { display: "flex", flexDirection: "row", alignItems: "flex-end", gap: 1 }, children: [vehicle.notes && appType !== Enums_1.MovaAppType.INDIVIDUAL && (isDesktop ? ((0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: vehicle.notes.length > 500 ? vehicle.notes.slice(0, 500) + '…' : vehicle.notes, children: (0, jsx_runtime_1.jsx)(NoteAlt_1.default, { sx: { color: '#F59E0B', fontSize: 22, cursor: 'default', alignSelf: 'center' } }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.IconButton, { size: "small", onClick: function (e) { return setNotesAnchorEl(e.currentTarget); }, sx: { p: 0.5, alignSelf: 'center' }, children: (0, jsx_runtime_1.jsx)(NoteAlt_1.default, { sx: { color: '#F59E0B', fontSize: 22 } }) }), (0, jsx_runtime_1.jsx)(material_1.Popover, { open: Boolean(notesAnchorEl), anchorEl: notesAnchorEl, onClose: function () { return setNotesAnchorEl(null); }, anchorOrigin: { vertical: 'bottom', horizontal: 'right' }, transformOrigin: { vertical: 'top', horizontal: 'right' }, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { p: 2, maxWidth: 280, fontSize: 13 }, children: vehicle.notes.length > 500 ? vehicle.notes.slice(0, 500) + '…' : vehicle.notes }) })] }))), onDelete && ((0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "error", size: "small", onClick: function (e) { return handleOnClickDeleteVehicle(e); }, children: "Supprimer" })), !localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleOnClickEdit, size: "small", variant: "outlined", startIcon: (0, jsx_runtime_1.jsx)(EditRounded_1.default, { sx: { fontSize: "14px !important" } }), sx: {
+                                                        }); }, "aria-label": "Copier la plaque", children: (0, jsx_runtime_1.jsx)(icons_material_1.ContentCopy, { sx: { fontSize: 14, color: "text.disabled" } }) })] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { display: "flex", flexDirection: "row", alignItems: "flex-end", gap: 1 }, children: [vehicle.notes && appType !== Enums_1.MovaAppType.INDIVIDUAL && (isDesktop ? ((0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: vehicle.notes.length > 500 ? vehicle.notes.slice(0, 500) + '…' : vehicle.notes, children: (0, jsx_runtime_1.jsx)(StickyNote2_1.default, { sx: { color: theme.palette.primary.main, fontSize: 22, cursor: 'default', alignSelf: 'center' } }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.IconButton, { size: "small", onClick: function (e) { return setNotesAnchorEl(e.currentTarget); }, sx: { p: 0.5, alignSelf: 'center' }, children: (0, jsx_runtime_1.jsx)(StickyNote2_1.default, { sx: { color: theme.palette.primary.main, fontSize: 22 } }) }), (0, jsx_runtime_1.jsx)(material_1.Popover, { open: Boolean(notesAnchorEl), anchorEl: notesAnchorEl, onClose: function () { return setNotesAnchorEl(null); }, anchorOrigin: { vertical: 'bottom', horizontal: 'right' }, transformOrigin: { vertical: 'top', horizontal: 'right' }, children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { p: 2, maxWidth: 280, fontSize: 13 }, children: vehicle.notes.length > 500 ? vehicle.notes.slice(0, 500) + '…' : vehicle.notes }) })] }))), onDelete && ((0, jsx_runtime_1.jsx)(material_1.Button, { variant: "outlined", color: "error", size: "small", onClick: function (e) { return handleOnClickDeleteVehicle(e); }, children: "Supprimer" })), !localEditMode && ((0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleOnClickEdit, size: "small", variant: "outlined", startIcon: (0, jsx_runtime_1.jsx)(EditRounded_1.default, { sx: { fontSize: "14px !important" } }), sx: {
                                                     fontSize: 12,
                                                     borderColor: "divider",
                                                 }, children: "Modifier" }))] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { px: 2, py: 1.5, borderBottom: "0.5px solid", borderColor: "divider" }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "body2", sx: sectionTitleSx, children: "Kilom\u00E9trage" }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { display: "grid", gridTemplateColumns: "1fr 1fr", gap: 1 }, children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { bgcolor: "grey.50", borderRadius: 1, p: 1.25 }, children: [(0, jsx_runtime_1.jsx)(material_1.Typography, { variant: "caption", color: "text.secondary", display: "block", children: "Actuel" }), !localEditMode ? ((0, jsx_runtime_1.jsxs)(material_1.Typography, { variant: "body1", fontWeight: 500, children: [(_b = vehicle.currentMileage) !== null && _b !== void 0 ? _b : "-", " ", (0, jsx_runtime_1.jsx)(material_1.Typography, { component: "span", variant: "caption", color: "text.secondary", children: "km" })] })) : ((0, jsx_runtime_1.jsx)(material_1.TextField, { name: "currentMileage", variant: "standard", type: "number", required: true, value: (_c = form.currentMileage.value) !== null && _c !== void 0 ? _c : "", onChange: handleInputChange, error: Boolean(form.currentMileage.error), helperText: Boolean(form.currentMileage.error && form.currentMileage.value > 0)

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

@@ -4,5 +4,10 @@ export default class LoanVehicle {
     garageVehicleId: number;
     vehicleLoanEnd: Date;
     vehicleLoanStart: Date;
-    constructor(id: number, eventId: string, garageVehicleId: number, vehicleLoanStart: Date, vehicleLoanEnd: Date);
+    vehicleReturnDate?: Date;
+    garageVehicleMileage?: number;
+    vehicleReturnMileage?: number;
+    existHistory?: boolean;
+    existHistoryReturn?: boolean;
+    constructor(id: number, eventId: string, garageVehicleId: number, vehicleLoanStart: Date, vehicleLoanEnd: Date, vehicleReturnDate?: Date, garageVehicleMileage?: number, vehicleReturnMileage?: number, existHistory?: boolean, existHistoryReturn?: boolean);
 }

package/dist/src/models/LoanVehicle.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var LoanVehicle = /** @class */ (function () {
-    function LoanVehicle(id, eventId, garageVehicleId, vehicleLoanStart, vehicleLoanEnd) {
+    function LoanVehicle(id, eventId, garageVehicleId, vehicleLoanStart, vehicleLoanEnd, vehicleReturnDate, garageVehicleMileage, vehicleReturnMileage, existHistory, existHistoryReturn) {
         this.id = id;
         this.eventId = eventId;
         this.garageVehicleId = garageVehicleId;
         this.vehicleLoanStart = new Date(vehicleLoanStart);
         this.vehicleLoanEnd = new Date(vehicleLoanEnd);
+        this.vehicleReturnDate = vehicleReturnDate ? new Date(vehicleReturnDate) : undefined;
+        this.existHistory = existHistory;
+        this.vehicleReturnMileage = vehicleReturnMileage;
+        this.garageVehicleMileage = garageVehicleMileage;
+        this.existHistoryReturn = existHistoryReturn;
     }
     return LoanVehicle;
 }());

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

@@ -82,6 +82,7 @@ export default class GarageService {
     static assignGarageVehicleEvent(garageId: string, eventId: string, vehicleId: number, req: any): Promise<APIResponse<string>>;
     static editGarageVehicleDateEvent(garageId: string, eventId: string, req: any): Promise<APIResponse<string>>;
     static deassignGarageVehicleEvent(garageId: string, eventId: string): Promise<APIResponse<string>>;
+    static returnGarageVehicleBooking(garageId: string, bookingId: number, returnDate: string, mileage: number): Promise<APIResponse<string>>;
     static getGaragesCsm(): Promise<APIResponse<Garage[]>>;
     static getOneGarageCsm(garageId: string): Promise<APIResponse<Garage[]>>;
     static getAllOperations(garageId: string): Promise<APIResponse<Operation>>;

package/dist/src/services/GarageService.js

@@ -499,6 +499,13 @@ var GarageService = /** @class */ (function () {
             appType: Enums_1.MovaAppType.GARAGE,
         });
     };
+    GarageService.returnGarageVehicleBooking = function (garageId, bookingId, returnDate, mileage) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/loaner/booking/").concat(bookingId, "/return?returnDate=").concat(encodeURIComponent(returnDate), "&mileage=").concat(mileage),
+            method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
+        });
+    };
     // CSM
     GarageService.getGaragesCsm = function () {
         return (0, ApiHelper_1.request)({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.68.37",
+	"version": "1.68.39",
 	"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

@@ -4,7 +4,7 @@ import {
   default as CloseIcon,
 } from "@mui/icons-material/CloseRounded";
 import EditIcon from "@mui/icons-material/EditRounded";
-import NoteAltIcon from "@mui/icons-material/NoteAlt";
+import StickyNote2Icon from "@mui/icons-material/StickyNote2";
 import {
   Alert,
   Box,
@@ -407,12 +407,12 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
                 {vehicle.notes && appType !== MovaAppType.INDIVIDUAL && (
                   isDesktop ? (
                     <Tooltip title={vehicle.notes.length > 500 ? vehicle.notes.slice(0, 500) + '…' : vehicle.notes}>
-                      <NoteAltIcon sx={{ color: '#F59E0B', fontSize: 22, cursor: 'default', alignSelf: 'center' }} />
+                      <StickyNote2Icon sx={{ color: theme.palette.primary.main, fontSize: 22, cursor: 'default', alignSelf: 'center' }} />
                     </Tooltip>
                   ) : (
                     <>
                       <IconButton size="small" onClick={(e) => setNotesAnchorEl(e.currentTarget)} sx={{ p: 0.5, alignSelf: 'center' }}>
-                        <NoteAltIcon sx={{ color: '#F59E0B', fontSize: 22 }} />
+                        <StickyNote2Icon sx={{ color: theme.palette.primary.main, fontSize: 22 }} />
                       </IconButton>
                       <Popover
                         open={Boolean(notesAnchorEl)}

package/src/models/LoanVehicle.ts

@@ -5,18 +5,33 @@ export default class LoanVehicle {
 
   vehicleLoanEnd: Date;
   vehicleLoanStart: Date;
-
+  vehicleReturnDate?: Date;
+  garageVehicleMileage?: number;
+  vehicleReturnMileage?:number;
+  existHistory?:boolean;
+existHistoryReturn?:boolean;
   constructor(
     id: number,
     eventId: string,
     garageVehicleId: number,
     vehicleLoanStart: Date,
-    vehicleLoanEnd: Date
+    vehicleLoanEnd: Date,
+    vehicleReturnDate?: Date,
+    garageVehicleMileage?:number,
+    vehicleReturnMileage?:number,
+    existHistory?:boolean,
+    existHistoryReturn?:boolean,
+
   ) {
     this.id = id;
     this.eventId = eventId;
     this.garageVehicleId = garageVehicleId;
     this.vehicleLoanStart = new Date(vehicleLoanStart);
     this.vehicleLoanEnd = new Date(vehicleLoanEnd);
+    this.vehicleReturnDate = vehicleReturnDate ? new Date(vehicleReturnDate) : undefined;
+    this.existHistory = existHistory;
+    this.vehicleReturnMileage = vehicleReturnMileage;
+    this.garageVehicleMileage = garageVehicleMileage;
+    this.existHistoryReturn = existHistoryReturn;
   }
 }

package/src/services/GarageService.ts

@@ -741,6 +741,19 @@ export default class GarageService {
     });
   }
 
+  static returnGarageVehicleBooking(
+    garageId: string,
+    bookingId: number,
+    returnDate: string,
+    mileage: number
+  ): Promise<APIResponse<string>> {
+    return request({
+      url: `${API_BASE_URL}/garage/${garageId}/loaner/booking/${bookingId}/return?returnDate=${encodeURIComponent(returnDate)}&mileage=${mileage}`,
+      method: APIMethod.PATCH,
+      appType: MovaAppType.GARAGE,
+    });
+  }
+
   // CSM
   static getGaragesCsm(): Promise<APIResponse<Garage[]>> {
     return request({