@movalib/movalib-commons 1.59.0 → 1.59.2

package/dist/src/components/QrCodePLVContainer/QrCodePLVContainer.d.ts

@@ -1,4 +1,5 @@
 import '../../style/QRCode.css';
+export declare const getPdfDocument: (url: string) => import("pdfjs-dist/types/src/display/api").PDFDocumentLoadingTask;
 export declare const QrCodePLVContainer: ({ data }: {
     data: string;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/src/components/QrCodePLVContainer/QrCodePLVContainer.js

@@ -73,7 +73,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QrCodePLVContainer = void 0;
+exports.QrCodePLVContainer = exports.getPdfDocument = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var material_1 = require("@mui/material");
@@ -88,7 +88,11 @@ var Tools_1 = require("../../helpers/Tools");
 var pdf_lib_1 = require("pdf-lib");
 var PLVComponent_1 = require("./PLVComponent");
 var pdfjsLib = __importStar(require("pdfjs-dist"));
-pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.mjs';
+pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.min.mjs';
+var getPdfDocument = function (url) {
+    return pdfjsLib.getDocument(url);
+};
+exports.getPdfDocument = getPdfDocument;
 var QrCodePLVContainer = function (_a) {
     var data = _a.data;
     var _b = (0, react_1.useState)(null), selectedChoice = _b[0], setSelectedChoice = _b[1];
@@ -144,24 +148,14 @@ var QrCodePLVContainer = function (_a) {
         var urlA4 = printPLV('A4').then(function (url) {
             setUrlA4(url);
         });
-        var urlA3 = printPLV('A3').then(function (url) {
-            setUrlA3(url);
-        });
     }, [data]);
-    (0, react_1.useEffect)(function () {
-        if (PLVrefA4.current || PLVrefA3.current) {
-            setIsReady(true);
-        }
-        else {
-            setIsReady(false);
-        }
-    }, [PLVrefA4.current, PLVrefA3.current]);
     function printPLV(format) {
         return __awaiter(this, void 0, void 0, function () {
             var pdfUrl, response, existingPdfBytes, pdfDoc, qrCodeBlob, qrImageBytes, qrImage, pages, firstPage, _a, width, height, optionQrcode, modifiedPdfBytes, blob, url, loadingTask, pdf, page, canvas, context, viewport, renderContext, imageUrl;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        setIsReady(false);
                         pdfUrl = "/Movalib_".concat(format, ".pdf");
                         return [4 /*yield*/, fetch(pdfUrl)];
                     case 1:
@@ -208,7 +202,7 @@ var QrCodePLVContainer = function (_a) {
                         modifiedPdfBytes = _b.sent();
                         blob = new Blob([modifiedPdfBytes], { type: 'application/pdf' });
                         url = URL.createObjectURL(blob);
-                        loadingTask = pdfjsLib.getDocument(url);
+                        loadingTask = (0, exports.getPdfDocument)(url);
                         return [4 /*yield*/, loadingTask.promise];
                     case 8:
                         pdf = _b.sent();
@@ -228,6 +222,7 @@ var QrCodePLVContainer = function (_a) {
                     case 10:
                         _b.sent();
                         imageUrl = canvas.toDataURL('image/png');
+                        setIsReady(true);
                         return [2 /*return*/, imageUrl];
                 }
             });
@@ -268,6 +263,11 @@ var QrCodePLVContainer = function (_a) {
         qrCode.append(qrCodeRef.current);
     }, [qrCode.append]);
     var onChangeSelectedChoice = function (e) {
+        if (e.target.value === 'A3' && !urlA3) {
+            printPLV('A3').then(function (url) {
+                setUrlA3(url);
+            });
+        }
         setSelectedChoice(e.target.value);
     };
     var printA3PLV = (0, react_to_print_1.useReactToPrint)({

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

@@ -59,6 +59,7 @@ export default class Event {
     otherReason?: string;
     repairOrderNumber?: number;
     orderComment?: string;
+    vehicleReceived?: 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);
     static getPrestationsList(event: Event): string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.59.0",
+  "version": "1.59.2",
   "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/QrCodePLVContainer/QrCodePLVContainer.tsx

@@ -24,8 +24,10 @@ import { flexCenter } from '../../helpers/Tools';
 import { PDFDocument } from 'pdf-lib';
 import { PLVComponentV2, PrintSize } from './PLVComponent';
 import * as pdfjsLib from 'pdfjs-dist';
-pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.mjs';
-
+pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.min.mjs';
+export const getPdfDocument = (url: string) => {
+  return pdfjsLib.getDocument(url);
+};
 type SelectChoice = null | 'A3' | 'A4' | 'QR_Headless' | 'QR_Google';
 export const QrCodePLVContainer = ({ data }: { data: string }) => {
   const [selectedChoice, setSelectedChoice] = useState<SelectChoice>(null);
@@ -88,20 +90,13 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
     const urlA4 = printPLV('A4').then((url) => {
       setUrlA4(url);
     });
-    const urlA3 = printPLV('A3').then((url) => {
-      setUrlA3(url);
-    });
   }, [data]);
 
-  useEffect(() => {
-    if (PLVrefA4.current || PLVrefA3.current) {
-      setIsReady(true);
-    } else {
-      setIsReady(false);
-    }
-  }, [PLVrefA4.current, PLVrefA3.current]); 
+
 
   async function printPLV(format: string) {
+    setIsReady(false);
+
     // Chemin du fichier PDF
    const pdfUrl = `/Movalib_${format}.pdf`;
     // Récupérer le fichier PDF depuis le serveur
@@ -156,7 +151,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   
 
     // Convertir le PDF en image
-    const loadingTask = pdfjsLib.getDocument(url);
+    const loadingTask = getPdfDocument(url);
     const pdf = await loadingTask.promise;
   
     // Récupérer la première page
@@ -179,6 +174,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   
     // Convertir le canvas en URL d'image (data URL)
     const imageUrl = canvas.toDataURL('image/png');
+    setIsReady(true);
     return imageUrl;
   }
 
@@ -226,6 +222,11 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   }, [qrCode.append]);
 
   const onChangeSelectedChoice: SelectProps<SelectChoice>['onChange'] = (e) => {
+    if(e.target.value === 'A3' && !urlA3){
+      printPLV('A3').then((url) => {
+        setUrlA3(url);
+      });
+    }
     setSelectedChoice(e.target.value as SelectChoice);
   };
   
@@ -256,7 +257,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   return (
     <Box display='flex' flexDirection='column' alignItems='center' gap='24px'>
       {urlA4 && <PLVComponentV2 ref={PLVrefA4} url={urlA4} printSize={PrintSize.A4} />}
-      {urlA3 &&<PLVComponentV2 ref={PLVrefA3} url={urlA3} printSize={PrintSize.A3} />}
+      {urlA3 && <PLVComponentV2 ref={PLVrefA3} url={urlA3} printSize={PrintSize.A3} />}
 
       <Grid container justifyContent='center' alignItems='center'>
         <Grid item xs={7}>

package/src/models/Event.ts

@@ -66,6 +66,7 @@ export default class Event {
 
     repairOrderNumber?: number;
     orderComment?: string;
+    vehicleReceived?: 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[],