@movalib/movalib-commons 1.62.3 → 1.63.0

package/dist/src/models/Document.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Document = /** @class */ (function () {
-    function Document(id, ownerId, state, fileName, originalFileName, fileType, fileSignedUrl, type, creationDate, updateDate, reference, validateToken, remindersCount, totalAmountInclVat, lastSendingTime, firstSendingTime) {
+    function Document(id, ownerId, state, fileName, originalFileName, fileType, fileSignedUrl, type, creationDate, updateDate, reference, validateToken, remindersCount, totalAmountInclVat, lastSendingTime, firstSendingTime, eventId, sinaoDocumentId) {
         this.id = id;
         this.state = state;
         this.ownerId = ownerId;
@@ -22,10 +22,18 @@ var Document = /** @class */ (function () {
         this.firstSendingTime = firstSendingTime
             ? new Date(firstSendingTime)
             : undefined;
+        this.eventId = eventId;
+        this.sinaoDocumentId = sinaoDocumentId;
     }
     Document.findByTypeAndReference = function (documents, type, reference) {
         if (documents && type && reference) {
-            return documents.find(function (document) { return document.type === type && document.reference === reference; });
+            return documents.find(function (document) { return document.type === type && document.eventId === reference; });
+        }
+        return undefined;
+    };
+    Document.findManyByTypeAndReference = function (documents, type, reference) {
+        if (documents && type && reference) {
+            return documents.filter(function (document) { return document.type === type && document.eventId === reference; });
         }
         return undefined;
     };

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

@@ -1,13 +1,13 @@
+import { OrderPreference, RegistrationState, SlotAlgorithm, SubscriptionPaymentInterval } from "../helpers/Enums";
 import Address from "./Address";
-import Schedule from "./Schedule";
+import CategoryPrestation from "./CategoryPrestation";
+import Document from "./Document";
+import Employee from "./Employee";
 import Prestation from "./Prestation";
+import Schedule from "./Schedule";
+import Subscription from "./Subscription";
 import Supplier from "./Supplier";
-import Document from "./Document";
-import { OrderPreference, RegistrationState, SlotAlgorithm, SubscriptionPaymentInterval } from "../helpers/Enums";
 import User from "./User";
-import Subscription from "./Subscription";
-import Employee from "./Employee";
-import CategoryPrestation from "./CategoryPrestation";
 import VehicleGarage from "./VehicleGarage";
 export default class Garage {
     id: string;
@@ -55,5 +55,9 @@ export default class Garage {
     timezone: string;
     customStyle?: string;
     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);
+    billingActive?: boolean;
+    billingToken?: string;
+    billingSimulationActive?: boolean;
+    appId?: number;
+    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);
 }

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

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

@@ -22,6 +22,7 @@ export default class Vehicle {
     tireSize: VehicleTire;
     lastInspectionDate: Date;
     lastMaintenanceDate: Date;
-    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;
+    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);
     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) {
+    function Vehicle(id, ownerId, averageMileagePerYear, plate, brand, model, version, vin, currentMileage, digitalPassportIndex, firstRegistrationDate, ktype, tireDiameter, tireHeight, tireSpeedIndex, tireWidth, documents, tireSize, lastInspectionDate, lastMaintenanceDate, foreignPlate) {
         this.id = id;
         this.ownerId = ownerId;
         this.averageMileagePerYear = averageMileagePerYear;
@@ -32,6 +32,7 @@ var Vehicle = /** @class */ (function () {
         this.tireSize = tireSize;
         this.lastInspectionDate = lastInspectionDate;
         this.lastMaintenanceDate = lastMaintenanceDate;
+        this.foreignPlate = foreignPlate;
     }
     Vehicle.prototype.getVehicleLabel = function () {
         return "".concat(this.brand, " ").concat(this.model, " ").concat(this.version);

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

@@ -16,6 +16,8 @@ export type AddCustomerVehicleParams = {
     tireSpeedIndex?: string;
     lastMaintenanceDate?: string;
     lastInspectionDate?: string;
+    isForeignPlate?: boolean;
+    model?: string;
 };
 export type DeleteCustomerVehicleParams = {
     /** L'identifiant unique du garage */

package/index.ts

@@ -32,6 +32,7 @@ export { QrCodePLVContainer } from './src/components/QrCodePLVContainer/QrCodePL
 export { PLVComponent, PrintSize } from './src/components/QrCodePLVContainer/PLVComponent';
 export {LinkedDocumentDialog} from './src/components/LinkedDocumentDialog';
 export { default as MovaTable } from './src/components/MovaTable/MovaTable';
+export {default as MovaTableBack} from "./src/components/MovaTableBack/MovaTableBack"
 
 // Export des classes
 export { default as Subscription } from './src/models/Subscription';
@@ -71,7 +72,7 @@ export { readCookie, deleteCookie } from './src/helpers/CookieUtils';
 export {
   validateField,
   formatVehicleTire,
-  formatFrenchVehiclePlate,
+  formatVehiclePlate,
   isEmpty,
   getApplicationShortLabel,
   capitalizeFirstLetter,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.62.3",
+	"version": "1.63.0",
 	"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/MovaTableBack/MovaTableBack.tsx

@@ -0,0 +1,249 @@
+import { Refresh } from "@mui/icons-material";
+import SearchIcon from "@mui/icons-material/Search";
+import {
+  Box,
+  Button,
+  InputAdornment,
+  LinearProgress,
+  Paper,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableFooter,
+  TableHead,
+  TablePagination,
+  TableRow,
+  TextField,
+  debounce,
+} from "@mui/material";
+import {
+  ChangeEvent,
+  ComponentType,
+  MouseEvent,
+  useCallback,
+  useRef,
+  useState,
+} from "react";
+
+type TMovaTable<T> = {
+  useDataHook: (
+    page: number,
+    rowsPerPage: number,
+    search?: string
+  ) => {
+    data: T[];
+    totalElements: number;
+    isLoading: boolean;
+    refresh: () => void;
+  };
+  displayedColumns: {
+    displayName: string;
+    component: ComponentType<{ element: T }>;
+    autoWidth?: boolean;
+  }[];
+  pagination?: number[];
+  compact?: boolean;
+  onRowClick?: (data: T) => void;
+  onRowRightClick?: (data: T, event: MouseEvent<HTMLTableRowElement>) => void;
+  isClickable?: (data: T) => boolean;
+  onRowDoubleClick?: (data: T) => void;
+  filterChildren?: React.ReactNode;
+};
+
+export default function MovaTableBack<T>({
+  useDataHook,
+  displayedColumns,
+  pagination,
+  compact,
+  onRowClick,
+  onRowRightClick,
+  onRowDoubleClick,
+  isClickable,
+  filterChildren,
+}: TMovaTable<T>) {
+  const [currentPageIndex, setCurrentPageIndex] = useState<number>(0);
+  const [rowsPerPage, setRowsPerPage] = useState<number>(25);
+  const [search, setSearch] = useState("");
+  const clickTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const { data, totalElements, isLoading, refresh } = useDataHook(
+    currentPageIndex,
+    rowsPerPage,
+    search
+  );
+
+  const handleDoubleClick = useCallback(
+    (element: T) => {
+      if (!onRowDoubleClick) return;
+
+      if (clickTimeout.current) {
+        clearTimeout(clickTimeout.current);
+        clickTimeout.current = null;
+      }
+
+      onRowDoubleClick(element);
+    },
+    [onRowDoubleClick]
+  );
+
+  const handleRowClick = useCallback(
+    (element: T) => {
+      if (!onRowClick) return;
+
+      if (clickTimeout.current) return;
+
+      clickTimeout.current = setTimeout(() => {
+        onRowClick(element);
+        clickTimeout.current = null;
+      }, 200);
+    },
+    [onRowClick]
+  );
+
+  const handlePageChange = (
+    event: MouseEvent<HTMLButtonElement> | null,
+    page: number
+  ) => {
+    setCurrentPageIndex(page);
+  };
+
+  const handleRowsPerPageChange = (
+    event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => {
+    setCurrentPageIndex(0);
+    setRowsPerPage(Number(event.target.value));
+  };
+
+  const handleSearchChange = debounce((event) => {
+    const search = event?.target.value;
+    if (search.length > 2) {
+      setSearch(search);
+      setCurrentPageIndex(0);
+    } else {
+      setSearch("");
+      setCurrentPageIndex(0);
+    }
+  }, 700);
+
+  return (
+    <div style={{ height: "100%", display: "flex", flexDirection: "column" }}>
+      <Box
+        sx={{
+          width: "50%",
+          my: 2,
+          px: 2,
+          display: "flex",
+          gap: 2,
+        }}
+      >
+        <TextField
+          size="small"
+          type="search"
+          onChange={handleSearchChange}
+          inputProps={{
+            startAdornment: (
+              <InputAdornment position="start">
+                <SearchIcon />
+              </InputAdornment>
+            ),
+          }}
+          sx={{ width: "100%" }}
+          placeholder="Rechercher"
+        />
+        {refresh && (
+          <Button size="small" onClick={refresh} variant="contained">
+            <Refresh />
+          </Button>
+        )}
+      </Box>
+      {filterChildren && filterChildren}
+      <TableContainer sx={{ height: "100%" }} component={Paper}>
+        <Table
+          size={compact ? "small" : "medium"}
+          sx={{ height: "100%" }}
+          stickyHeader
+        >
+          <TableHead>
+            <TableRow>
+              {displayedColumns.map((column, index) => (
+                <TableCell key={index}>{column.displayName}</TableCell>
+              ))}
+            </TableRow>
+          </TableHead>
+          <TableBody sx={{ overflowY: "auto" }}>
+            {isLoading && (
+              <TableRow>
+                <TableCell colSpan={5} sx={{ padding: 0 }}>
+                  <LinearProgress />
+                </TableCell>
+              </TableRow>
+            )}
+
+            {data?.length !== 0 &&
+              data?.map((element, index) => (
+                <TableRow
+                  onDoubleClick={() => {
+                    handleDoubleClick(element);
+                  }}
+                  onClick={() => handleRowClick(element)}
+                  onContextMenu={(event) =>
+                    onRowRightClick && onRowRightClick(element, event)
+                  }
+                  sx={{
+                    backgroundColor: "white",
+                    cursor: isClickable
+                      ? isClickable(element)
+                        ? "pointer"
+                        : "default"
+                      : "pointer",
+                    height: "auto",
+                  }}
+                  hover
+                  key={index}
+                >
+                  {displayedColumns.map((column, index) => (
+                    <TableCell
+                      key={index}
+                      sx={
+                        column.autoWidth
+                          ? {
+                              whiteSpace: "nowrap",
+                              width: "1%",
+                              maxWidth: "fit-content",
+                            }
+                          : {}
+                      }
+                    >
+                      {column.component && (
+                        <column.component element={element} />
+                      )}
+                    </TableCell>
+                  ))}
+                </TableRow>
+              ))}
+            <TableRow sx={{ height: "100%" }} />
+          </TableBody>
+
+          {pagination && pagination.length > 0 && (
+            <TableFooter
+              sx={{ position: "sticky", bottom: 0, backgroundColor: "white" }}
+            >
+              <TableRow>
+                <TablePagination
+                  count={totalElements}
+                  onPageChange={handlePageChange}
+                  page={currentPageIndex}
+                  rowsPerPage={rowsPerPage}
+                  labelRowsPerPage="Lignes par page :"
+                  onRowsPerPageChange={handleRowsPerPageChange}
+                  rowsPerPageOptions={pagination}
+                />
+              </TableRow>
+            </TableFooter>
+          )}
+        </Table>
+      </TableContainer>
+    </div>
+  );
+}

package/src/components/vehicle/VehicleFullCard.tsx

@@ -38,7 +38,7 @@ import {
 } from "../../helpers/Enums";
 import Logger from "../../helpers/Logger";
 import {
-  formatFrenchVehiclePlate,
+  formatVehiclePlate,
   formatVehicleTire,
 } from "../../helpers/Tools";
 import { MovaFormField, MovaVehicleForm } from "../../helpers/Types";
@@ -438,7 +438,7 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
                     color={theme.palette.text.primary}
                     sx={{ position: "absolute", top: "8px", left: "76px" }}
                   >
-                    <b>{formatFrenchVehiclePlate(vehicle.plate)}</b>
+                    <b>{formatVehiclePlate(vehicle.plate, vehicle.foreignPlate)}</b>
                   </Typography>
                 </Grid>
                 {onDelete && (
@@ -692,51 +692,55 @@ const VehicleFullCard: FC<VehicleFullCardProps> = ({
                 </Grid>
 
                 {vehicle.documents &&
-                  vehicle.documents?.map((invoice, index) => (
-                    <Grid
-                      container
-                      sx={{
-                        justifyContent: "space-between",
-                        alignItems: "center",
-                      }}
-                      key={index + 1}
-                    >
-                      <Grid
-                        item
-                        xs={11}
-                        key={(index + 1) * 50}
-                        sx={{ textAlign: "left" }}
-                      >
-                        <Tooltip title={invoice.originalFileName}>
-                          <Link
-                            color={darken("#F29ABA", 0.2)}
-                            href={invoice.fileSignedUrl}
-                            target="_blank"
-                            rel="noopener"
-                          >
-                            <Typography variant="body1">
-                              {invoice.fileName}
-                            </Typography>
-                          </Link>
-                        </Tooltip>
-                      </Grid>
+                  vehicle.documents
+                    ?.filter((doc) => doc.fileSignedUrl)
+                    .map((invoice, index) => (
                       <Grid
-                        item
-                        xs={1}
-                        key={(index + 1) * 100}
-                        sx={{ textAlign: "right" }}
+                        container
+                        sx={{
+                          justifyContent: "space-between",
+                          alignItems: "center",
+                        }}
+                        key={index + 1}
                       >
-                        <IconButton
-                          disabled={
-                            !(invoice.ownerId.toString() == currentUser.id)
-                          }
-                          onClick={(e) => handleDeleteDocument(e, invoice?.id)}
+                        <Grid
+                          item
+                          xs={11}
+                          key={(index + 1) * 50}
+                          sx={{ textAlign: "left" }}
                         >
-                          <CloseIcon />
-                        </IconButton>
+                          <Tooltip title={invoice.originalFileName}>
+                            <Link
+                              color={darken("#F29ABA", 0.2)}
+                              href={invoice.fileSignedUrl}
+                              target="_blank"
+                              rel="noopener"
+                            >
+                              <Typography variant="body1">
+                                {invoice.fileName}
+                              </Typography>
+                            </Link>
+                          </Tooltip>
+                        </Grid>
+                        <Grid
+                          item
+                          xs={1}
+                          key={(index + 1) * 100}
+                          sx={{ textAlign: "right" }}
+                        >
+                          <IconButton
+                            disabled={
+                              !(invoice.ownerId.toString() == currentUser.id)
+                            }
+                            onClick={(e) =>
+                              handleDeleteDocument(e, invoice?.id)
+                            }
+                          >
+                            <CloseIcon />
+                          </IconButton>
+                        </Grid>
                       </Grid>
-                    </Grid>
-                  ))}
+                    ))}
 
                 {/* * Les FACTURES du véhicule
                                 {vehicle.documents && vehicle.documents?.filter(doc => doc.type === DocumentType.VEHICLE_MAINTENANCE_INVOICE)