From 5b906322313d9bc0e68f6d0c020af9ee07da4f75 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 Sep 2024 10:14:08 +0200
Subject: [PATCH 01/18] Signature: add a signature zone manually

---
 .../Resources/public/types.ts                 |   4 +-
 .../public/vuejs/DocumentSignature/App.vue    | 163 +++++++++++++-----
 .../public/vuejs/DocumentSignature/index.ts   |   4 +-
 3 files changed, 128 insertions(+), 43 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
index 840421991..921da3a9a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
@@ -83,7 +83,7 @@ export interface PDFPage {
   height: number,
 }
 export interface SignatureZone {
-  index: number,
+  index: number | null,
   x: number,
   y: number,
   width: number,
@@ -98,3 +98,5 @@ export interface Signature {
 }
 
 export type SignedState = 'pending' | 'signed' | 'rejected' | 'canceled' | 'error';
+
+export type CanvasEvent = 'select' | 'add';
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 47edd87c3..04cdf9eea 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -80,8 +80,32 @@
   </div>
 
   <div class="col-12 p-4" id="action-buttons" v-if="signedState !== 'signed'">
+
+    <div class="row mb-3">
+      <div class="col-12 d-flex justify-content-end">
+        <div class="col-4 col-xl-3 gap-2 d-grid">
+          <button
+            v-if="adding"
+            class="btn btn-misc btn-cancel me-2 btn-sm"
+            @click="removeNewZone()"
+          >
+            {{ $t("remove_sign_zone") }}
+          </button>
+        </div>
+        <div class="col-4 gap-2 d-grid">
+          <button
+            class="btn btn-create btn-sm"
+            :class="{ active: canvasEvent === 'add' }"
+            @click="toggleAddZone()"
+          >
+            {{ $t("add_sign_zone") }}
+          </button>
+        </div>
+      </div>
+    </div>
+
     <div class="row">
-      <div class="col-6">
+      <div class="col-4">
         <button
           class="btn btn-action me-2"
           :disabled="!userSignatureZone"
@@ -90,7 +114,7 @@
           {{ $t("sign") }}
         </button>
       </div>
-      <div class="col-6 d-flex justify-content-end">
+      <div class="col-8 d-flex justify-content-end">
         <button
           class="btn btn-misc me-2"
           :hidden="!userSignatureZone"
@@ -119,7 +143,12 @@
 import { ref, Ref, reactive } from "vue";
 import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
-import { Signature, SignatureZone, SignedState } from "../../types";
+import {
+  CanvasEvent,
+  Signature,
+  SignatureZone,
+  SignedState,
+} from "../../types";
 import { makeFetch } from "../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import * as pdfjsLib from "pdfjs-dist";
 import {
@@ -143,11 +172,12 @@ pdfjsLib.GlobalWorkerOptions.workerSrc = "pdfjs-dist/build/pdf.worker.mjs";
 
 const modalOpen: Ref<boolean> = ref(false);
 const loading: Ref<boolean> = ref(false);
+const adding: Ref<boolean> = ref(false);
+const canvasEvent: Ref<CanvasEvent> = ref("select");
 const signedState: Ref<SignedState> = ref("pending");
 const page: Ref<number> = ref(1);
 const pageCount: Ref<number> = ref(0);
 let userSignatureZone: Ref<null | SignatureZone> = ref(null);
-let pdfSource: Ref<string> = ref("");
 let pdf = {} as PDFDocumentProxy;
 
 declare global {
@@ -160,6 +190,8 @@ const $toast = useToast();
 
 const signature = window.signature;
 
+console.log(signature);
+
 const mountPdf = async (url: string) => {
   const loadingTask = pdfjsLib.getDocument(url);
   pdf = await loadingTask.promise;
@@ -202,33 +234,31 @@ async function downloadAndOpen(): Promise<Blob> {
 
 const initPdf = () => {
   const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
-  canvas.addEventListener(
-    "pointerup",
-    (e: PointerEvent) => canvasClick(e, canvas),
-    false
-  );
+  canvas.addEventListener("pointerup", canvasClick, false);
   setTimeout(() => addZones(page.value), 800);
 };
 
+const scaleXToCanvas = (x: number, canvasWidth: number, PDFWidth: number) =>
+  Math.round((x * canvasWidth) / PDFWidth);
+
+const scaleYToCanvas = (h: number, canvasHeight: number, PDFHeight: number) =>
+  Math.round((h * canvasHeight) / PDFHeight);
+
 const hitSignature = (
   zone: SignatureZone,
   xy: number[],
   canvasWidth: number,
   canvasHeight: number
-) => {
-  const scaleXToCanvas = (x: number) =>
-    Math.round((x * canvasWidth) / zone.PDFPage.width);
-  const scaleHeightToCanvas = (h: number) =>
-    Math.round((h * canvasHeight) / zone.PDFPage.height);
-  const scaleYToCanvas = (y: number) =>
-    Math.round(zone.PDFPage.height - scaleHeightToCanvas(y));
-  return (
-    scaleXToCanvas(zone.x) < xy[0] &&
-    xy[0] < scaleXToCanvas(zone.x + zone.width) &&
-    scaleYToCanvas(zone.y) < xy[1] &&
-    xy[1] < scaleYToCanvas(zone.y) + scaleHeightToCanvas(zone.height)
-  );
-};
+) =>
+  scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) < xy[0] &&
+  xy[0] <
+    scaleXToCanvas(zone.x + zone.width, canvasWidth, zone.PDFPage.width) &&
+  zone.PDFPage.height -
+    scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) <
+    xy[1] &&
+  xy[1] <
+    scaleYToCanvas(zone.height - zone.y, canvasHeight, zone.PDFPage.height) +
+      zone.PDFPage.height;
 
 const selectZone = (z: SignatureZone, canvas: HTMLCanvasElement) => {
   userSignatureZone.value = z;
@@ -239,7 +269,7 @@ const selectZone = (z: SignatureZone, canvas: HTMLCanvasElement) => {
   }
 };
 
-const canvasClick = (e: PointerEvent, canvas: HTMLCanvasElement) =>
+const selectZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) =>
   signature.zones
     .filter((z) => z.PDFPage.index + 1 === page.value)
     .map((z) => {
@@ -256,6 +286,13 @@ const canvasClick = (e: PointerEvent, canvas: HTMLCanvasElement) =>
       }
     });
 
+const canvasClick = (e: PointerEvent) => {
+  const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
+  canvasEvent.value === "select"
+    ? selectZoneOnCanvas(e, canvas)
+    : addZoneOnCanvas(e, canvas);
+};
+
 const turnPage = async (upOrDown: number) => {
   userSignatureZone.value = null;
   page.value = page.value + upOrDown;
@@ -290,12 +327,6 @@ const drawZone = (
 ) => {
   const unselectedBlue = "#007bff";
   const selectedBlue = "#034286";
-  const scaleXToCanvas = (x: number) =>
-    Math.round((x * canvasWidth) / zone.PDFPage.width);
-  const scaleHeightToCanvas = (h: number) =>
-    Math.round((h * canvasHeight) / zone.PDFPage.height);
-  const scaleYToCanvas = (y: number) =>
-    Math.round(zone.PDFPage.height - scaleHeightToCanvas(y));
   ctx.strokeStyle =
     userSignatureZone.value?.index === zone.index
       ? selectedBlue
@@ -303,16 +334,22 @@ const drawZone = (
   ctx.lineWidth = 2;
   ctx.lineJoin = "bevel";
   ctx.strokeRect(
-    scaleXToCanvas(zone.x),
-    scaleYToCanvas(zone.y),
-    scaleXToCanvas(zone.width),
-    scaleHeightToCanvas(zone.height)
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width),
+    zone.PDFPage.height -
+      scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height),
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width),
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height)
   );
   ctx.font = "bold 16px serif";
   ctx.textAlign = "center";
   ctx.fillStyle = "black";
-  const xText = scaleXToCanvas(zone.x) + scaleXToCanvas(zone.width) / 2;
-  const yText = scaleYToCanvas(zone.y) + scaleHeightToCanvas(zone.height) / 2;
+  const xText =
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) +
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width) / 2;
+  const yText =
+    zone.PDFPage.height -
+    scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) +
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height) / 2;
   if (userSignatureZone.value?.index === zone.index) {
     ctx.fillStyle = selectedBlue;
     ctx.fillText("Signer ici", xText, yText);
@@ -414,14 +451,58 @@ const confirmSign = () => {
 };
 
 const undoSign = async () => {
-  // const canvas = document.querySelectorAll("canvas")[0];
-  // const ctx = canvas.getContext("2d");
-  // if (ctx && userSignatureZone.value) {
-  //   //drawZone(userSignatureZone.value, ctx, canvas.width, canvas.height);
-  // }
+  signature.zones = signature.zones.filter((z) => z.index !== null);
   await setPage(page.value);
   setTimeout(() => addZones(page.value), 200);
   userSignatureZone.value = null;
+  adding.value = false;
+};
+
+const toggleAddZone = () => {
+  canvasEvent.value === "select"
+    ? (canvasEvent.value = "add")
+    : (canvasEvent.value = "select");
+};
+
+const addZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) => {
+  const BOX_WIDTH = 180;
+  const BOX_HEIGHT = 90;
+  const PDFPageHeight = canvas.height;
+  const PDFPageWidth = canvas.width;
+
+  const x = e.offsetX;
+  const y = e.offsetY;
+  const newZone: SignatureZone = {
+    index: null,
+    x:
+      scaleXToCanvas(x, canvas.width, PDFPageWidth) -
+      scaleXToCanvas(BOX_WIDTH / 2, canvas.width, PDFPageWidth),
+    y:
+      PDFPageHeight -
+      scaleYToCanvas(y, canvas.height, PDFPageHeight) +
+      scaleYToCanvas(BOX_HEIGHT / 2, canvas.height, PDFPageHeight),
+    width: BOX_WIDTH,
+    height: BOX_HEIGHT,
+    PDFPage: {
+      index: page.value - 1,
+      width: PDFPageWidth,
+      height: PDFPageHeight,
+    },
+  };
+  signature.zones.push(newZone);
+
+  setTimeout(() => addZones(page.value), 200);
+  canvasEvent.value = "select";
+  adding.value = true;
+};
+
+const removeNewZone = async () => {
+  signature.zones = signature.zones.filter((z) => z.index !== null);
+  userSignatureZone.value = null;
+  await setPage(page.value);
+  setTimeout(() => addZones(page.value), 200);
+  canvasEvent.value = "select";
+  adding.value = false;
 };
 
 downloadAndOpen();
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
index 77f2ee48c..c5c4b5eb8 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
@@ -16,7 +16,9 @@ const appMessages = {
         last_sign_zone: 'Zone de signature précédente',
         next_sign_zone: 'Zone de signature suivante',
         electronic_signature_in_progress: 'Signature électronique en cours...',
-        loading: 'Chargement...'
+        loading: 'Chargement...',
+        add_sign_zone: 'Ajouter une zone de signature',
+        remove_sign_zone: 'Enlever la zone',
     }
 }
 

From 0d62d8d1c694ca7401936cfc79fcdd2eb4b57731 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 Sep 2024 12:04:59 +0200
Subject: [PATCH 02/18] Signature - improve UI signature app

---
 .../public/vuejs/DocumentSignature/App.vue    | 72 +++++++++----------
 .../views/Workflow/_signature_sign.html.twig  |  2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 04cdf9eea..2074c4163 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -26,37 +26,9 @@
       </template>
     </modal>
   </teleport>
-  <div class="col-12">
-    <div
-      class="row justify-content-center mb-2"
-      v-if="signature.zones.length > 1"
-    >
-      <div class="col-4 gap-2 d-grid">
-        <button
-          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
-          class="btn btn-light btn-sm"
-          @click="turnSignature(-1)"
-        >
-          {{ $t("last_sign_zone") }}
-        </button>
-      </div>
-      <div class="col-4 gap-2 d-grid">
-        <button
-          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
-          class="btn btn-light btn-sm"
-          @click="turnSignature(1)"
-        >
-          {{ $t("next_sign_zone") }}
-        </button>
-      </div>
-    </div>
-
-    <div
-      id="turn-page"
-      class="row justify-content-center mb-2"
-      v-if="pageCount > 1"
-    >
-      <div class="col-6-sm col-3-md text-center">
+  <div class="col-12 m-auto">
+    <div class="row justify-content-center border-bottom pdf-tools">
+      <div v-if="pageCount > 1" class="col-4 text-center turn-page">
         <button
           class="btn btn-light btn-sm"
           :disabled="page <= 1"
@@ -73,14 +45,35 @@
           ❯
         </button>
       </div>
+      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-end">
+        <button
+          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ $t("last_sign_zone") }}
+        </button>
+      </div>
+      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-start">
+        <button
+          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ $t("next_sign_zone") }}
+        </button>
+      </div>
     </div>
   </div>
-  <div class="col-12 text-center">
+  <div class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center">
     <canvas class="m-auto" id="canvas"></canvas>
   </div>
 
-  <div class="col-12 p-4" id="action-buttons" v-if="signedState !== 'signed'">
-
+  <div
+    class="col-xs-12 col-md-12 col-lg-9 m-auto p-4"
+    id="action-buttons"
+    v-if="signedState !== 'signed'"
+  >
     <div class="row mb-3">
       <div class="col-12 d-flex justify-content-end">
         <div class="col-4 col-xl-3 gap-2 d-grid">
@@ -510,7 +503,7 @@ downloadAndOpen();
 
 <style scoped lang="scss">
 #canvas {
-  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.2);
 }
 div#action-buttons {
   position: sticky;
@@ -518,7 +511,14 @@ div#action-buttons {
   background-color: white;
   z-index: 100;
 }
-div#turn-page {
+div.pdf-tools {
+  background-color: #f3f3f3;
+  @media (min-width: 1200px) {
+    background: none;
+    border: none !important;
+  }
+}
+div.turn-page {
   span {
     font-size: 0.8rem;
     margin: 0 0.4rem;
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
index 8b2770952..1c4b0a8f2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
@@ -27,7 +27,7 @@
     <div class="content" id="content">
         <div class="container-xxl">
             <div class="row">
-               <div class="col-xs-12 col-md-12 col-lg-9 my-5 m-auto">
+               <div class="col-12 m-auto">
                    <div class="row" id="document-signature"></div>
                </div>
             </div>

From 479a02bbc7959f623983a33b77c7d3043d0a5bf7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 Sep 2024 14:11:57 +0200
Subject: [PATCH 03/18] Signature: add and process returnPath in the signature
 app

---
 .../public/vuejs/DocumentSignature/App.vue    | 19 +++++++++++++------
 .../Controller/WorkflowController.php         | 10 ++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 2074c4163..5e3b0f0db 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -124,9 +124,9 @@
         >
           {{ $t("cancel") }}
         </button>
-        <button class="btn btn-delete" @click="undoSign">
+        <a class="btn btn-delete" :href="getReturnPath()">
           {{ $t("cancel_signing") }}
-        </button>
+        </a>
       </div>
     </div>
   </div>
@@ -157,9 +157,7 @@ console.log(PdfWorker); // incredible but this is needed
 // pdfjsLib.GlobalWorkerOptions.workerSrc = PdfWorker;
 
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
-import {
-  download_and_decrypt_doc,
-} from "../StoredObjectButton/helpers";
+import { download_and_decrypt_doc } from "../StoredObjectButton/helpers";
 
 pdfjsLib.GlobalWorkerOptions.workerSrc = "pdfjs-dist/build/pdf.worker.mjs";
 
@@ -215,7 +213,10 @@ const setPage = async (page: number) => {
 async function downloadAndOpen(): Promise<Blob> {
   let raw;
   try {
-    raw = await download_and_decrypt_doc(signature.storedObject, signature.storedObject.currentVersion);
+    raw = await download_and_decrypt_doc(
+      signature.storedObject,
+      signature.storedObject.currentVersion
+    );
   } catch (e) {
     console.error("error while downloading and decrypting document", e);
     throw e;
@@ -498,6 +499,12 @@ const removeNewZone = async () => {
   adding.value = false;
 };
 
+const getReturnPath = () =>
+  window.location.search
+    ? window.location.search.split("?returnPath=")[1] ??
+      window.location.pathname
+    : window.location.pathname;
+
 downloadAndOpen();
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 277a18142..4e4b4928a 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -377,7 +377,10 @@ class WorkflowController extends AbstractController
         $signature = $this->entityManager->getRepository(EntityWorkflowStepSignature::class)->find($signature_id);
 
         if ($signature->getSigner() instanceof User) {
-            return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);
+            return $this->redirectToRoute('chill_main_workflow_signature_add', [
+                'id' => $signature_id,
+                'returnPath' => $request->query->get('returnPath', null),
+            ]);
         }
 
         $metadataForm = $this->createForm(WorkflowSignatureMetadataType::class);
@@ -401,7 +404,10 @@ class WorkflowController extends AbstractController
             $this->entityManager->persist($signature);
             $this->entityManager->flush();
 
-            return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);
+            return $this->redirectToRoute('chill_main_workflow_signature_add', [
+                'id' => $signature_id,
+                'returnPath' => $request->query->get('returnPath', null),
+            ]);
         }
 
         return $this->render(

From c23568032c32a2ae7ff6de6cd6dbc33a73b91a45 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 Sep 2024 10:14:08 +0200
Subject: [PATCH 04/18] Signature: add a signature zone manually

---
 .../Resources/public/types.ts                 |   4 +-
 .../public/vuejs/DocumentSignature/App.vue    | 163 +++++++++++++-----
 .../public/vuejs/DocumentSignature/index.ts   |   4 +-
 3 files changed, 128 insertions(+), 43 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
index 840421991..921da3a9a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
@@ -83,7 +83,7 @@ export interface PDFPage {
   height: number,
 }
 export interface SignatureZone {
-  index: number,
+  index: number | null,
   x: number,
   y: number,
   width: number,
@@ -98,3 +98,5 @@ export interface Signature {
 }
 
 export type SignedState = 'pending' | 'signed' | 'rejected' | 'canceled' | 'error';
+
+export type CanvasEvent = 'select' | 'add';
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 47edd87c3..04cdf9eea 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -80,8 +80,32 @@
   </div>
 
   <div class="col-12 p-4" id="action-buttons" v-if="signedState !== 'signed'">
+
+    <div class="row mb-3">
+      <div class="col-12 d-flex justify-content-end">
+        <div class="col-4 col-xl-3 gap-2 d-grid">
+          <button
+            v-if="adding"
+            class="btn btn-misc btn-cancel me-2 btn-sm"
+            @click="removeNewZone()"
+          >
+            {{ $t("remove_sign_zone") }}
+          </button>
+        </div>
+        <div class="col-4 gap-2 d-grid">
+          <button
+            class="btn btn-create btn-sm"
+            :class="{ active: canvasEvent === 'add' }"
+            @click="toggleAddZone()"
+          >
+            {{ $t("add_sign_zone") }}
+          </button>
+        </div>
+      </div>
+    </div>
+
     <div class="row">
-      <div class="col-6">
+      <div class="col-4">
         <button
           class="btn btn-action me-2"
           :disabled="!userSignatureZone"
@@ -90,7 +114,7 @@
           {{ $t("sign") }}
         </button>
       </div>
-      <div class="col-6 d-flex justify-content-end">
+      <div class="col-8 d-flex justify-content-end">
         <button
           class="btn btn-misc me-2"
           :hidden="!userSignatureZone"
@@ -119,7 +143,12 @@
 import { ref, Ref, reactive } from "vue";
 import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
-import { Signature, SignatureZone, SignedState } from "../../types";
+import {
+  CanvasEvent,
+  Signature,
+  SignatureZone,
+  SignedState,
+} from "../../types";
 import { makeFetch } from "../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import * as pdfjsLib from "pdfjs-dist";
 import {
@@ -143,11 +172,12 @@ pdfjsLib.GlobalWorkerOptions.workerSrc = "pdfjs-dist/build/pdf.worker.mjs";
 
 const modalOpen: Ref<boolean> = ref(false);
 const loading: Ref<boolean> = ref(false);
+const adding: Ref<boolean> = ref(false);
+const canvasEvent: Ref<CanvasEvent> = ref("select");
 const signedState: Ref<SignedState> = ref("pending");
 const page: Ref<number> = ref(1);
 const pageCount: Ref<number> = ref(0);
 let userSignatureZone: Ref<null | SignatureZone> = ref(null);
-let pdfSource: Ref<string> = ref("");
 let pdf = {} as PDFDocumentProxy;
 
 declare global {
@@ -160,6 +190,8 @@ const $toast = useToast();
 
 const signature = window.signature;
 
+console.log(signature);
+
 const mountPdf = async (url: string) => {
   const loadingTask = pdfjsLib.getDocument(url);
   pdf = await loadingTask.promise;
@@ -202,33 +234,31 @@ async function downloadAndOpen(): Promise<Blob> {
 
 const initPdf = () => {
   const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
-  canvas.addEventListener(
-    "pointerup",
-    (e: PointerEvent) => canvasClick(e, canvas),
-    false
-  );
+  canvas.addEventListener("pointerup", canvasClick, false);
   setTimeout(() => addZones(page.value), 800);
 };
 
+const scaleXToCanvas = (x: number, canvasWidth: number, PDFWidth: number) =>
+  Math.round((x * canvasWidth) / PDFWidth);
+
+const scaleYToCanvas = (h: number, canvasHeight: number, PDFHeight: number) =>
+  Math.round((h * canvasHeight) / PDFHeight);
+
 const hitSignature = (
   zone: SignatureZone,
   xy: number[],
   canvasWidth: number,
   canvasHeight: number
-) => {
-  const scaleXToCanvas = (x: number) =>
-    Math.round((x * canvasWidth) / zone.PDFPage.width);
-  const scaleHeightToCanvas = (h: number) =>
-    Math.round((h * canvasHeight) / zone.PDFPage.height);
-  const scaleYToCanvas = (y: number) =>
-    Math.round(zone.PDFPage.height - scaleHeightToCanvas(y));
-  return (
-    scaleXToCanvas(zone.x) < xy[0] &&
-    xy[0] < scaleXToCanvas(zone.x + zone.width) &&
-    scaleYToCanvas(zone.y) < xy[1] &&
-    xy[1] < scaleYToCanvas(zone.y) + scaleHeightToCanvas(zone.height)
-  );
-};
+) =>
+  scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) < xy[0] &&
+  xy[0] <
+    scaleXToCanvas(zone.x + zone.width, canvasWidth, zone.PDFPage.width) &&
+  zone.PDFPage.height -
+    scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) <
+    xy[1] &&
+  xy[1] <
+    scaleYToCanvas(zone.height - zone.y, canvasHeight, zone.PDFPage.height) +
+      zone.PDFPage.height;
 
 const selectZone = (z: SignatureZone, canvas: HTMLCanvasElement) => {
   userSignatureZone.value = z;
@@ -239,7 +269,7 @@ const selectZone = (z: SignatureZone, canvas: HTMLCanvasElement) => {
   }
 };
 
-const canvasClick = (e: PointerEvent, canvas: HTMLCanvasElement) =>
+const selectZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) =>
   signature.zones
     .filter((z) => z.PDFPage.index + 1 === page.value)
     .map((z) => {
@@ -256,6 +286,13 @@ const canvasClick = (e: PointerEvent, canvas: HTMLCanvasElement) =>
       }
     });
 
+const canvasClick = (e: PointerEvent) => {
+  const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
+  canvasEvent.value === "select"
+    ? selectZoneOnCanvas(e, canvas)
+    : addZoneOnCanvas(e, canvas);
+};
+
 const turnPage = async (upOrDown: number) => {
   userSignatureZone.value = null;
   page.value = page.value + upOrDown;
@@ -290,12 +327,6 @@ const drawZone = (
 ) => {
   const unselectedBlue = "#007bff";
   const selectedBlue = "#034286";
-  const scaleXToCanvas = (x: number) =>
-    Math.round((x * canvasWidth) / zone.PDFPage.width);
-  const scaleHeightToCanvas = (h: number) =>
-    Math.round((h * canvasHeight) / zone.PDFPage.height);
-  const scaleYToCanvas = (y: number) =>
-    Math.round(zone.PDFPage.height - scaleHeightToCanvas(y));
   ctx.strokeStyle =
     userSignatureZone.value?.index === zone.index
       ? selectedBlue
@@ -303,16 +334,22 @@ const drawZone = (
   ctx.lineWidth = 2;
   ctx.lineJoin = "bevel";
   ctx.strokeRect(
-    scaleXToCanvas(zone.x),
-    scaleYToCanvas(zone.y),
-    scaleXToCanvas(zone.width),
-    scaleHeightToCanvas(zone.height)
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width),
+    zone.PDFPage.height -
+      scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height),
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width),
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height)
   );
   ctx.font = "bold 16px serif";
   ctx.textAlign = "center";
   ctx.fillStyle = "black";
-  const xText = scaleXToCanvas(zone.x) + scaleXToCanvas(zone.width) / 2;
-  const yText = scaleYToCanvas(zone.y) + scaleHeightToCanvas(zone.height) / 2;
+  const xText =
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) +
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width) / 2;
+  const yText =
+    zone.PDFPage.height -
+    scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) +
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height) / 2;
   if (userSignatureZone.value?.index === zone.index) {
     ctx.fillStyle = selectedBlue;
     ctx.fillText("Signer ici", xText, yText);
@@ -414,14 +451,58 @@ const confirmSign = () => {
 };
 
 const undoSign = async () => {
-  // const canvas = document.querySelectorAll("canvas")[0];
-  // const ctx = canvas.getContext("2d");
-  // if (ctx && userSignatureZone.value) {
-  //   //drawZone(userSignatureZone.value, ctx, canvas.width, canvas.height);
-  // }
+  signature.zones = signature.zones.filter((z) => z.index !== null);
   await setPage(page.value);
   setTimeout(() => addZones(page.value), 200);
   userSignatureZone.value = null;
+  adding.value = false;
+};
+
+const toggleAddZone = () => {
+  canvasEvent.value === "select"
+    ? (canvasEvent.value = "add")
+    : (canvasEvent.value = "select");
+};
+
+const addZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) => {
+  const BOX_WIDTH = 180;
+  const BOX_HEIGHT = 90;
+  const PDFPageHeight = canvas.height;
+  const PDFPageWidth = canvas.width;
+
+  const x = e.offsetX;
+  const y = e.offsetY;
+  const newZone: SignatureZone = {
+    index: null,
+    x:
+      scaleXToCanvas(x, canvas.width, PDFPageWidth) -
+      scaleXToCanvas(BOX_WIDTH / 2, canvas.width, PDFPageWidth),
+    y:
+      PDFPageHeight -
+      scaleYToCanvas(y, canvas.height, PDFPageHeight) +
+      scaleYToCanvas(BOX_HEIGHT / 2, canvas.height, PDFPageHeight),
+    width: BOX_WIDTH,
+    height: BOX_HEIGHT,
+    PDFPage: {
+      index: page.value - 1,
+      width: PDFPageWidth,
+      height: PDFPageHeight,
+    },
+  };
+  signature.zones.push(newZone);
+
+  setTimeout(() => addZones(page.value), 200);
+  canvasEvent.value = "select";
+  adding.value = true;
+};
+
+const removeNewZone = async () => {
+  signature.zones = signature.zones.filter((z) => z.index !== null);
+  userSignatureZone.value = null;
+  await setPage(page.value);
+  setTimeout(() => addZones(page.value), 200);
+  canvasEvent.value = "select";
+  adding.value = false;
 };
 
 downloadAndOpen();
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
index 77f2ee48c..c5c4b5eb8 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
@@ -16,7 +16,9 @@ const appMessages = {
         last_sign_zone: 'Zone de signature précédente',
         next_sign_zone: 'Zone de signature suivante',
         electronic_signature_in_progress: 'Signature électronique en cours...',
-        loading: 'Chargement...'
+        loading: 'Chargement...',
+        add_sign_zone: 'Ajouter une zone de signature',
+        remove_sign_zone: 'Enlever la zone',
     }
 }
 

From 4933238f3f60c3f08755ef538fd1e6c4c7da8ad7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 Sep 2024 12:04:59 +0200
Subject: [PATCH 05/18] Signature - improve UI signature app

---
 .../public/vuejs/DocumentSignature/App.vue    | 72 +++++++++----------
 .../views/Workflow/_signature_sign.html.twig  |  2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 04cdf9eea..2074c4163 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -26,37 +26,9 @@
       </template>
     </modal>
   </teleport>
-  <div class="col-12">
-    <div
-      class="row justify-content-center mb-2"
-      v-if="signature.zones.length > 1"
-    >
-      <div class="col-4 gap-2 d-grid">
-        <button
-          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
-          class="btn btn-light btn-sm"
-          @click="turnSignature(-1)"
-        >
-          {{ $t("last_sign_zone") }}
-        </button>
-      </div>
-      <div class="col-4 gap-2 d-grid">
-        <button
-          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
-          class="btn btn-light btn-sm"
-          @click="turnSignature(1)"
-        >
-          {{ $t("next_sign_zone") }}
-        </button>
-      </div>
-    </div>
-
-    <div
-      id="turn-page"
-      class="row justify-content-center mb-2"
-      v-if="pageCount > 1"
-    >
-      <div class="col-6-sm col-3-md text-center">
+  <div class="col-12 m-auto">
+    <div class="row justify-content-center border-bottom pdf-tools">
+      <div v-if="pageCount > 1" class="col-4 text-center turn-page">
         <button
           class="btn btn-light btn-sm"
           :disabled="page <= 1"
@@ -73,14 +45,35 @@
           ❯
         </button>
       </div>
+      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-end">
+        <button
+          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ $t("last_sign_zone") }}
+        </button>
+      </div>
+      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-start">
+        <button
+          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ $t("next_sign_zone") }}
+        </button>
+      </div>
     </div>
   </div>
-  <div class="col-12 text-center">
+  <div class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center">
     <canvas class="m-auto" id="canvas"></canvas>
   </div>
 
-  <div class="col-12 p-4" id="action-buttons" v-if="signedState !== 'signed'">
-
+  <div
+    class="col-xs-12 col-md-12 col-lg-9 m-auto p-4"
+    id="action-buttons"
+    v-if="signedState !== 'signed'"
+  >
     <div class="row mb-3">
       <div class="col-12 d-flex justify-content-end">
         <div class="col-4 col-xl-3 gap-2 d-grid">
@@ -510,7 +503,7 @@ downloadAndOpen();
 
 <style scoped lang="scss">
 #canvas {
-  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.2);
 }
 div#action-buttons {
   position: sticky;
@@ -518,7 +511,14 @@ div#action-buttons {
   background-color: white;
   z-index: 100;
 }
-div#turn-page {
+div.pdf-tools {
+  background-color: #f3f3f3;
+  @media (min-width: 1200px) {
+    background: none;
+    border: none !important;
+  }
+}
+div.turn-page {
   span {
     font-size: 0.8rem;
     margin: 0 0.4rem;
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
index 8b2770952..1c4b0a8f2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
@@ -27,7 +27,7 @@
     <div class="content" id="content">
         <div class="container-xxl">
             <div class="row">
-               <div class="col-xs-12 col-md-12 col-lg-9 my-5 m-auto">
+               <div class="col-12 m-auto">
                    <div class="row" id="document-signature"></div>
                </div>
             </div>

From d08212df46f52b8317c6dafd1a937a83dc7e2c6c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 Sep 2024 14:11:57 +0200
Subject: [PATCH 06/18] Signature: add and process returnPath in the signature
 app

---
 .../public/vuejs/DocumentSignature/App.vue    | 19 +++++++++++++------
 .../Controller/WorkflowController.php         | 10 ++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 2074c4163..5e3b0f0db 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -124,9 +124,9 @@
         >
           {{ $t("cancel") }}
         </button>
-        <button class="btn btn-delete" @click="undoSign">
+        <a class="btn btn-delete" :href="getReturnPath()">
           {{ $t("cancel_signing") }}
-        </button>
+        </a>
       </div>
     </div>
   </div>
@@ -157,9 +157,7 @@ console.log(PdfWorker); // incredible but this is needed
 // pdfjsLib.GlobalWorkerOptions.workerSrc = PdfWorker;
 
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
-import {
-  download_and_decrypt_doc,
-} from "../StoredObjectButton/helpers";
+import { download_and_decrypt_doc } from "../StoredObjectButton/helpers";
 
 pdfjsLib.GlobalWorkerOptions.workerSrc = "pdfjs-dist/build/pdf.worker.mjs";
 
@@ -215,7 +213,10 @@ const setPage = async (page: number) => {
 async function downloadAndOpen(): Promise<Blob> {
   let raw;
   try {
-    raw = await download_and_decrypt_doc(signature.storedObject, signature.storedObject.currentVersion);
+    raw = await download_and_decrypt_doc(
+      signature.storedObject,
+      signature.storedObject.currentVersion
+    );
   } catch (e) {
     console.error("error while downloading and decrypting document", e);
     throw e;
@@ -498,6 +499,12 @@ const removeNewZone = async () => {
   adding.value = false;
 };
 
+const getReturnPath = () =>
+  window.location.search
+    ? window.location.search.split("?returnPath=")[1] ??
+      window.location.pathname
+    : window.location.pathname;
+
 downloadAndOpen();
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index ab3d67307..2f8a0fd55 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -396,7 +396,10 @@ class WorkflowController extends AbstractController
         }
 
         if ($signature->getSigner() instanceof User) {
-            return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);
+            return $this->redirectToRoute('chill_main_workflow_signature_add', [
+                'id' => $signature_id,
+                'returnPath' => $request->query->get('returnPath', null),
+            ]);
         }
 
         $metadataForm = $this->createForm(WorkflowSignatureMetadataType::class);
@@ -420,7 +423,10 @@ class WorkflowController extends AbstractController
             $this->entityManager->persist($signature);
             $this->entityManager->flush();
 
-            return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);
+            return $this->redirectToRoute('chill_main_workflow_signature_add', [
+                'id' => $signature_id,
+                'returnPath' => $request->query->get('returnPath', null),
+            ]);
         }
 
         return $this->render(

From 09563979a2a0591263c981d13610405dabff1fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 12 Sep 2024 11:17:54 +0200
Subject: [PATCH 07/18] Refactor entity rendering with manager pattern

Introduce ChillEntityRenderManager to centralize entity rendering logic, reducing redundancy and improving code organization. Update dependencies and service configuration to support the new manager pattern, enhancing maintainability and flexibility of entity rendering in templates.
---
 .../Entity/ChillEntityRenderExtension.php     | 48 ++-------------
 .../Entity/ChillEntityRenderInterface.php     |  6 +-
 .../Entity/ChillEntityRenderManager.php       | 59 +++++++++++++++++++
 .../ChillEntityRenderManagerInterface.php     | 19 ++++++
 .../config/services/templating.yaml           |  9 ++-
 5 files changed, 93 insertions(+), 48 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManagerInterface.php

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
index 9c8d4599e..8a9e70229 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -19,24 +19,7 @@ use Twig\TwigFilter;
  */
 class ChillEntityRenderExtension extends AbstractExtension
 {
-    /**
-     * @var ChillEntityRender
-     */
-    protected $defaultRender;
-
-    /**
-     * @var iterable|ChillEntityRenderInterface[]
-     */
-    protected $renders = [];
-
-    /**
-     * ChillEntityRenderExtension constructor.
-     */
-    public function __construct(iterable $renders)
-    {
-        $this->defaultRender = new ChillEntityRender();
-        $this->renders = $renders;
-    }
+    public function __construct(private ChillEntityRenderManagerInterface $renderManager) {}
 
     /**
      * @return array|TwigFilter[]
@@ -53,34 +36,13 @@ class ChillEntityRenderExtension extends AbstractExtension
         ];
     }
 
-    public function renderBox($entity, array $options = []): string
+    public function renderBox(?object $entity, array $options = []): string
     {
-        if (null === $entity) {
-            return '';
-        }
-
-        return $this->getRender($entity, $options)
-            ->renderBox($entity, $options);
+        return $this->renderManager->renderBox($entity, $options);
     }
 
-    public function renderString($entity, array $options = []): string
+    public function renderString(?object $entity, array $options = []): string
     {
-        if (null === $entity) {
-            return '';
-        }
-
-        return $this->getRender($entity, $options)
-            ->renderString($entity, $options);
-    }
-
-    protected function getRender($entity, $options): ?ChillEntityRenderInterface
-    {
-        foreach ($this->renders as $render) {
-            if ($render->supports($entity, $options)) {
-                return $render;
-            }
-        }
-
-        return $this->defaultRender;
+        return $this->renderManager->renderString($entity, $options);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
index d628420c7..7a7a5e1fe 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
@@ -15,7 +15,7 @@ namespace Chill\MainBundle\Templating\Entity;
  * Interface to implement which will render an entity in template on a custom
  * manner.
  *
- * @template T
+ * @template T of object
  */
 interface ChillEntityRenderInterface
 {
@@ -31,7 +31,7 @@ interface ChillEntityRenderInterface
      * </span>
      * ```
      *
-     * @param T $entity
+     * @param T|null $entity
      *
      * @phpstan-pure
      */
@@ -42,7 +42,7 @@ interface ChillEntityRenderInterface
      *
      * Example: returning the name of a person.
      *
-     * @param T $entity
+     * @param T|null $entity
      *
      * @phpstan-pure
      */
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
new file mode 100644
index 000000000..6437a9c24
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Templating\Entity;
+
+final readonly class ChillEntityRenderManager implements ChillEntityRenderManagerInterface
+{
+    private ChillEntityRender $defaultRender;
+
+    /**
+     * @var iterable<ChillEntityRenderInterface>
+     */
+    private iterable $renders;
+
+    public function __construct(iterable $renders)
+    {
+        $this->defaultRender = new ChillEntityRender();
+        $this->renders = $renders;
+    }
+
+    public function renderBox($entity, array $options = []): string
+    {
+        if (null === $entity) {
+            return '';
+        }
+
+        return $this->getRender($entity, $options)
+            ->renderBox($entity, $options);
+    }
+
+    public function renderString($entity, array $options = []): string
+    {
+        if (null === $entity) {
+            return '';
+        }
+
+        return $this->getRender($entity, $options)
+            ->renderString($entity, $options);
+    }
+
+    private function getRender($entity, $options): ChillEntityRenderInterface
+    {
+        foreach ($this->renders as $render) {
+            if ($render->supports($entity, $options)) {
+                return $render;
+            }
+        }
+
+        return $this->defaultRender;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManagerInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManagerInterface.php
new file mode 100644
index 000000000..44b996d73
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManagerInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Templating\Entity;
+
+interface ChillEntityRenderManagerInterface
+{
+    public function renderBox(?object $entity, array $options = []): string;
+
+    public function renderString(?object $entity, array $options = []): string;
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index 0baa91b69..281d4ad23 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -32,11 +32,16 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension:
-        arguments:
-            $renders: !tagged_iterator chill.render_entity
         tags:
             - { name: twig.extension }
 
+    Chill\MainBundle\Templating\Entity\ChillEntityRenderManager:
+        arguments:
+            $renders: !tagged_iterator chill.render_entity
+
+    Chill\MainBundle\Templating\Entity\ChillEntityRenderManagerInterface:
+        alias: 'Chill\MainBundle\Templating\Entity\ChillEntityRenderManager'
+
     Chill\MainBundle\Templating\Entity\CommentRender:
         tags:
             - { name: 'chill.render_entity' }

From f8a986d59bdc147f3c2301cd0a126d00cc88f1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 12 Sep 2024 11:18:15 +0200
Subject: [PATCH 08/18] Add user IP and authenticated user details to signature

Updated the SignatureRequest metadata to include the requester's IP address and currently authenticated user details. Also improved the rendering of signer information by leveraging the `ChillEntityRenderManagerInterface`.
---
 .../Controller/SignatureRequestController.php      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
index 70d126f78..606bafb15 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
@@ -16,11 +16,13 @@ use Chill\DocStoreBundle\Service\Signature\PDFPage;
 use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderManagerInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
 
 class SignatureRequestController
 {
@@ -28,6 +30,8 @@ class SignatureRequestController
         private readonly MessageBusInterface $messageBus,
         private readonly StoredObjectManagerInterface $storedObjectManager,
         private readonly EntityWorkflowManager $entityWorkflowManager,
+        private readonly ChillEntityRenderManagerInterface $entityRender,
+        private readonly Security $security,
     ) {}
 
     #[Route('/api/1.0/document/workflow/{id}/signature-request', name: 'chill_docstore_signature_request')]
@@ -51,8 +55,14 @@ class SignatureRequestController
             $signature->getId(),
             $zone,
             $data['zone']['index'],
-            'test signature', // reason (string)
-            'Mme Caroline Diallo', // signerText (string)
+            'Signed by IP: '.(string) $request->getClientIp().', authenticated user: '.$this->entityRender->renderString($this->security->getUser(), []),
+            $this->entityRender->renderString($signature->getSigner(), [
+                // options for user render
+                'absence' => false,
+                'main_scope' => false,
+                // options for person render
+                'addAge' => false,
+            ]),
             $content
         ));
 

From 3c987e0b8d3434e22d2dfdc30663c7123bae89f9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 11:31:31 +0200
Subject: [PATCH 09/18] Signature: keep selected zone when turning pages

---
 .../public/vuejs/DocumentSignature/App.vue    | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 5e3b0f0db..c09efda8a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -229,7 +229,7 @@ async function downloadAndOpen(): Promise<Blob> {
 const initPdf = () => {
   const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
   canvas.addEventListener("pointerup", canvasClick, false);
-  setTimeout(() => addZones(page.value), 800);
+  setTimeout(() => drawAllZones(page.value), 800);
 };
 
 const scaleXToCanvas = (x: number, canvasWidth: number, PDFWidth: number) =>
@@ -259,11 +259,11 @@ const selectZone = (z: SignatureZone, canvas: HTMLCanvasElement) => {
   const ctx = canvas.getContext("2d");
   if (ctx) {
     setPage(page.value);
-    setTimeout(() => drawZone(z, ctx, canvas.width, canvas.height), 200);
+    setTimeout(() => drawAllZones(page.value), 200);
   }
 };
 
-const selectZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) =>
+const selectZoneEvent = (e: PointerEvent, canvas: HTMLCanvasElement) =>
   signature.zones
     .filter((z) => z.PDFPage.index + 1 === page.value)
     .map((z) => {
@@ -283,15 +283,15 @@ const selectZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) =>
 const canvasClick = (e: PointerEvent) => {
   const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
   canvasEvent.value === "select"
-    ? selectZoneOnCanvas(e, canvas)
-    : addZoneOnCanvas(e, canvas);
+    ? selectZoneEvent(e, canvas)
+    : addZoneEvent(e, canvas);
 };
 
 const turnPage = async (upOrDown: number) => {
-  userSignatureZone.value = null;
+  //userSignatureZone.value = null; // desactivate the reset of the zone when turning page
   page.value = page.value + upOrDown;
   await setPage(page.value);
-  setTimeout(() => addZones(page.value), 200);
+  setTimeout(() => drawAllZones(page.value), 200);
 };
 
 const turnSignature = async (upOrDown: number) => {
@@ -351,19 +351,24 @@ const drawZone = (
     ctx.fillStyle = unselectedBlue;
     ctx.fillText("Choisir cette", xText, yText - 12);
     ctx.fillText("zone de signature", xText, yText + 12);
-    // ctx.strokeStyle = "#c6c6c6"; // halo
-    // ctx.strokeText("Choisir cette", xText, yText - 12);
-    // ctx.strokeText("zone de signature", xText, yText + 12);
   }
 };
 
-const addZones = (page: number) => {
+const drawAllZones = (page: number) => {
   const canvas = document.querySelectorAll("canvas")[0];
   const ctx = canvas.getContext("2d");
   if (ctx) {
     signature.zones
       .filter((z) => z.PDFPage.index + 1 === page)
-      .map((z) => drawZone(z, ctx, canvas.width, canvas.height));
+      .map((z) => {
+        if (userSignatureZone.value) {
+          if (userSignatureZone.value?.index === z.index) {
+            drawZone(z, ctx, canvas.width, canvas.height);
+          }
+        } else {
+          drawZone(z, ctx, canvas.width, canvas.height);
+        }
+      });
   }
 };
 
@@ -447,7 +452,7 @@ const confirmSign = () => {
 const undoSign = async () => {
   signature.zones = signature.zones.filter((z) => z.index !== null);
   await setPage(page.value);
-  setTimeout(() => addZones(page.value), 200);
+  setTimeout(() => drawAllZones(page.value), 200);
   userSignatureZone.value = null;
   adding.value = false;
 };
@@ -458,7 +463,8 @@ const toggleAddZone = () => {
     : (canvasEvent.value = "select");
 };
 
-const addZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) => {
+const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
+  userSignatureZone.value = null;
   const BOX_WIDTH = 180;
   const BOX_HEIGHT = 90;
   const PDFPageHeight = canvas.height;
@@ -485,7 +491,8 @@ const addZoneOnCanvas = (e: PointerEvent, canvas: HTMLCanvasElement) => {
   };
   signature.zones.push(newZone);
 
-  setTimeout(() => addZones(page.value), 200);
+  await setPage(page.value);
+  setTimeout(() => drawAllZones(page.value), 200);
   canvasEvent.value = "select";
   adding.value = true;
 };
@@ -494,7 +501,7 @@ const removeNewZone = async () => {
   signature.zones = signature.zones.filter((z) => z.index !== null);
   userSignatureZone.value = null;
   await setPage(page.value);
-  setTimeout(() => addZones(page.value), 200);
+  setTimeout(() => drawAllZones(page.value), 200);
   canvasEvent.value = "select";
   adding.value = false;
 };

From 57d2929ecd0c87d6ae89be612766cebd06862c8e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 14:03:43 +0200
Subject: [PATCH 10/18] Signature: move buttons to a top toolbar + change
 behavior on a new zone

---
 .../public/vuejs/DocumentSignature/App.vue    | 193 ++++++++++++------
 .../public/vuejs/DocumentSignature/index.ts   |   8 +-
 2 files changed, 142 insertions(+), 59 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index c09efda8a..7c519f54f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -27,8 +27,8 @@
     </modal>
   </teleport>
   <div class="col-12 m-auto">
-    <div class="row justify-content-center border-bottom pdf-tools">
-      <div v-if="pageCount > 1" class="col-4 text-center turn-page">
+    <div class="row justify-content-center border pdf-tools d-md-none">
+      <div v-if="pageCount > 1" class="col text-center turn-page">
         <button
           class="btn btn-light btn-sm"
           :disabled="page <= 1"
@@ -36,7 +36,7 @@
         >
           ❮
         </button>
-        <span>page {{ page }} / {{ pageCount }}</span>
+        <span>{{ page }}/{{ pageCount }}</span>
         <button
           class="btn btn-light btn-sm"
           :disabled="page >= pageCount"
@@ -45,7 +45,101 @@
           ❯
         </button>
       </div>
-      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-end">
+      <div v-if="signature.zones.length > 1" class="col-3 p-0">
+        <button
+          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ $t("last_zone") }}
+        </button>
+      </div>
+      <div v-if="signature.zones.length > 1" class="col-3 p-0">
+        <button
+          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ $t("next_zone") }}
+        </button>
+      </div>
+      <div class="col text-end p-0">
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-if="signature.zones.length > 1"
+          :title="$t('choose_another_signature')"
+        >
+          {{ $t("another_zone") }}
+        </button>
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-else
+        >
+          {{ $t("cancel") }}
+        </button>
+      </div>
+      <div class="col-1">
+        <button
+          class="btn btn-create btn-sm"
+          :class="{ active: canvasEvent === 'add' }"
+          @click="toggleAddZone()"
+          :title="$t('add_sign_zone')"
+        ></button>
+      </div>
+    </div>
+
+    <div
+      class="row justify-content-center border pdf-tools d-none d-md-flex"
+    >
+      <div v-if="pageCount > 1" class="col-2 text-center turn-page p-0">
+        <button
+          class="btn btn-light btn-sm"
+          :disabled="page <= 1"
+          @click="turnPage(-1)"
+        >
+          ❮
+        </button>
+        <span>{{ page }} / {{ pageCount }}</span>
+        <button
+          class="btn btn-light btn-sm"
+          :disabled="page >= pageCount"
+          @click="turnPage(1)"
+        >
+          ❯
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1"
+        class="col text-end d-lg-none"
+      >
+        <button
+          :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ $t("last_zone") }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1"
+        class="col text-start d-lg-none"
+      >
+        <button
+          :disabled="userSignatureZone?.index >= signature.zones.length - 1"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ $t("next_zone") }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1"
+        class="col text-end d-none d-lg-flex p-0"
+      >
         <button
           :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
           class="btn btn-light btn-sm"
@@ -54,7 +148,10 @@
           {{ $t("last_sign_zone") }}
         </button>
       </div>
-      <div v-if="signature.zones.length > 1" class="col-4 col-xl-3 text-start">
+      <div
+        v-if="signature.zones.length > 1"
+        class="col text-start d-none d-lg-flex p-0"
+      >
         <button
           :disabled="userSignatureZone?.index >= signature.zones.length - 1"
           class="btn btn-light btn-sm"
@@ -63,6 +160,34 @@
           {{ $t("next_sign_zone") }}
         </button>
       </div>
+      <div class="col text-end p-0">
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-if="signature.zones.length > 1"
+        >
+          {{ $t("choose_another_signature") }}
+        </button>
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-else
+        >
+          {{ $t("cancel") }}
+        </button>
+      </div>
+      <div class="col text-end p-0 pe-xxl-4">
+        <button
+          class="btn btn-create btn-sm"
+          :class="{ active: canvasEvent === 'add' }"
+          @click="toggleAddZone()"
+          :title="$t('add_sign_zone')"
+        >
+          {{ $t("add_zone") }}
+        </button>
+      </div>
     </div>
   </div>
   <div class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center">
@@ -74,29 +199,6 @@
     id="action-buttons"
     v-if="signedState !== 'signed'"
   >
-    <div class="row mb-3">
-      <div class="col-12 d-flex justify-content-end">
-        <div class="col-4 col-xl-3 gap-2 d-grid">
-          <button
-            v-if="adding"
-            class="btn btn-misc btn-cancel me-2 btn-sm"
-            @click="removeNewZone()"
-          >
-            {{ $t("remove_sign_zone") }}
-          </button>
-        </div>
-        <div class="col-4 gap-2 d-grid">
-          <button
-            class="btn btn-create btn-sm"
-            :class="{ active: canvasEvent === 'add' }"
-            @click="toggleAddZone()"
-          >
-            {{ $t("add_sign_zone") }}
-          </button>
-        </div>
-      </div>
-    </div>
-
     <div class="row">
       <div class="col-4">
         <button
@@ -108,22 +210,6 @@
         </button>
       </div>
       <div class="col-8 d-flex justify-content-end">
-        <button
-          class="btn btn-misc me-2"
-          :hidden="!userSignatureZone"
-          @click="undoSign"
-          v-if="signature.zones.length > 1"
-        >
-          {{ $t("choose_another_signature") }}
-        </button>
-        <button
-          class="btn btn-misc me-2"
-          :hidden="!userSignatureZone"
-          @click="undoSign"
-          v-else
-        >
-          {{ $t("cancel") }}
-        </button>
         <a class="btn btn-delete" :href="getReturnPath()">
           {{ $t("cancel_signing") }}
         </a>
@@ -455,6 +541,7 @@ const undoSign = async () => {
   setTimeout(() => drawAllZones(page.value), 200);
   userSignatureZone.value = null;
   adding.value = false;
+  canvasEvent.value = "select";
 };
 
 const toggleAddZone = () => {
@@ -464,7 +551,6 @@ const toggleAddZone = () => {
 };
 
 const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
-  userSignatureZone.value = null;
   const BOX_WIDTH = 180;
   const BOX_HEIGHT = 90;
   const PDFPageHeight = canvas.height;
@@ -490,6 +576,7 @@ const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
     },
   };
   signature.zones.push(newZone);
+  userSignatureZone.value = newZone;
 
   await setPage(page.value);
   setTimeout(() => drawAllZones(page.value), 200);
@@ -497,15 +584,6 @@ const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
   adding.value = true;
 };
 
-const removeNewZone = async () => {
-  signature.zones = signature.zones.filter((z) => z.index !== null);
-  userSignatureZone.value = null;
-  await setPage(page.value);
-  setTimeout(() => drawAllZones(page.value), 200);
-  canvasEvent.value = "select";
-  adding.value = false;
-};
-
 const getReturnPath = () =>
   window.location.search
     ? window.location.search.split("?returnPath=")[1] ??
@@ -527,9 +605,10 @@ div#action-buttons {
 }
 div.pdf-tools {
   background-color: #f3f3f3;
-  @media (min-width: 1200px) {
-    background: none;
-    border: none !important;
+  font-size: 0.8rem;
+  @media (min-width: 1400px) {
+    // background: none;
+    // border: none !important;
   }
 }
 div.turn-page {
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
index c5c4b5eb8..6f2ddafe9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
@@ -10,14 +10,18 @@ const appMessages = {
         you_are_going_to_sign: 'Vous allez signer le document',
         signature_confirmation: 'Confirmation de la signature',
         sign: 'Signer',
-        choose_another_signature: 'Choisir une autre zone de signature',
+        choose_another_signature: 'Choisir une autre zone',
         cancel: 'Annuler',
         cancel_signing: 'Refuser de signer',
         last_sign_zone: 'Zone de signature précédente',
         next_sign_zone: 'Zone de signature suivante',
+        add_sign_zone: 'Ajouter une zone de signature',
+        last_zone: 'Zone précédente',
+        next_zone: 'Zone suivante',
+        add_zone: 'Ajouter une zone',
+        another_zone: 'Autre zone',
         electronic_signature_in_progress: 'Signature électronique en cours...',
         loading: 'Chargement...',
-        add_sign_zone: 'Ajouter une zone de signature',
         remove_sign_zone: 'Enlever la zone',
     }
 }

From ae1459cf772983485bf87c1956e13383adf64de0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 14:22:58 +0200
Subject: [PATCH 11/18] Signature: topbar UI

---
 .../public/vuejs/DocumentSignature/App.vue         | 14 +++++++-------
 .../views/Workflow/_signature_sign.html.twig       |  8 +++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 7c519f54f..e1d3124ce 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -27,7 +27,7 @@
     </modal>
   </teleport>
   <div class="col-12 m-auto">
-    <div class="row justify-content-center border pdf-tools d-md-none">
+    <div class="row justify-content-center border-bottom pdf-tools d-md-none">
       <div v-if="pageCount > 1" class="col text-center turn-page">
         <button
           class="btn btn-light btn-sm"
@@ -93,7 +93,7 @@
     </div>
 
     <div
-      class="row justify-content-center border pdf-tools d-none d-md-flex"
+      class="row justify-content-center border-bottom pdf-tools d-none d-md-flex"
     >
       <div v-if="pageCount > 1" class="col-2 text-center turn-page p-0">
         <button
@@ -114,7 +114,7 @@
       </div>
       <div
         v-if="signature.zones.length > 1"
-        class="col text-end d-lg-none"
+        class="col text-end d-xl-none"
       >
         <button
           :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
@@ -126,7 +126,7 @@
       </div>
       <div
         v-if="signature.zones.length > 1"
-        class="col text-start d-lg-none"
+        class="col text-start d-xl-none"
       >
         <button
           :disabled="userSignatureZone?.index >= signature.zones.length - 1"
@@ -138,7 +138,7 @@
       </div>
       <div
         v-if="signature.zones.length > 1"
-        class="col text-end d-none d-lg-flex p-0"
+        class="col text-end d-none d-xl-flex p-0"
       >
         <button
           :disabled="userSignatureZone === null || userSignatureZone?.index < 1"
@@ -150,7 +150,7 @@
       </div>
       <div
         v-if="signature.zones.length > 1"
-        class="col text-start d-none d-lg-flex p-0"
+        class="col text-start d-none d-xl-flex p-0"
       >
         <button
           :disabled="userSignatureZone?.index >= signature.zones.length - 1"
@@ -178,7 +178,7 @@
           {{ $t("cancel") }}
         </button>
       </div>
-      <div class="col text-end p-0 pe-xxl-4">
+      <div class="col text-end p-0 pe-2 pe-xxl-4">
         <button
           class="btn btn-create btn-sm"
           :class="{ active: canvasEvent === 'add' }"
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
index 1c4b0a8f2..03e5a9174 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_sign.html.twig
@@ -25,11 +25,9 @@
     {% endblock %}
 
     <div class="content" id="content">
-        <div class="container-xxl">
-            <div class="row">
-               <div class="col-12 m-auto">
-                   <div class="row" id="document-signature"></div>
-               </div>
+        <div class="row">
+            <div class="col-12 m-auto">
+                <div class="row" id="document-signature"></div>
             </div>
         </div>
     </div>

From 092b5c4f90eb51c8923f149750e77e7d9fa55588 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 15:26:03 +0200
Subject: [PATCH 12/18] Signature: get the stored object back in the check
 signature API

---
 .../Controller/SignatureRequestController.php |  12 +-
 .../Resources/public/types.ts                 | 135 ++++++++++--------
 .../public/vuejs/DocumentSignature/App.vue    |   6 +-
 3 files changed, 91 insertions(+), 62 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
index 606bafb15..14e33cca3 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
@@ -23,6 +23,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class SignatureRequestController
 {
@@ -31,6 +32,7 @@ class SignatureRequestController
         private readonly StoredObjectManagerInterface $storedObjectManager,
         private readonly EntityWorkflowManager $entityWorkflowManager,
         private readonly ChillEntityRenderManagerInterface $entityRender,
+        private readonly NormalizerInterface $normalizer,
         private readonly Security $security,
     ) {}
 
@@ -72,6 +74,14 @@ class SignatureRequestController
     #[Route('/api/1.0/document/workflow/{id}/check-signature', name: 'chill_docstore_check_signature')]
     public function checkSignature(EntityWorkflowStepSignature $signature): JsonResponse
     {
-        return new JsonResponse($signature->getState(), JsonResponse::HTTP_OK, []);
+        $entityWorkflow = $signature->getStep()->getEntityWorkflow();
+        $storedObject = $this->entityWorkflowManager->getAssociatedStoredObject($entityWorkflow);
+
+        return new JsonResponse(
+            [
+                'state' => $signature->getState(),
+                'storedObject' => $this->normalizer->normalize($storedObject, 'json')
+            ],
+            JsonResponse::HTTP_OK, []);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
index 921da3a9a..ee6b2bf98 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
@@ -1,102 +1,119 @@
-import {DateTime, User} from "../../../ChillMainBundle/Resources/public/types";
+import {
+    DateTime,
+    User,
+} from "../../../ChillMainBundle/Resources/public/types";
 
-export type StoredObjectStatus = "empty"|"ready"|"failure"|"pending";
+export type StoredObjectStatus = "empty" | "ready" | "failure" | "pending";
 
 export interface StoredObject {
-    id: number,
-    title: string|null,
-    uuid: string,
-    prefix: string,
-    status: StoredObjectStatus,
-    currentVersion: null|StoredObjectVersionCreated|StoredObjectVersionPersisted,
-    totalVersions: number,
-    datas: object,
+    id: number;
+    title: string | null;
+    uuid: string;
+    prefix: string;
+    status: StoredObjectStatus;
+    currentVersion:
+        | null
+        | StoredObjectVersionCreated
+        | StoredObjectVersionPersisted;
+    totalVersions: number;
+    datas: object;
     /** @deprecated */
-    creationDate: DateTime,
-    createdAt: DateTime|null,
-    createdBy: User|null,
+    creationDate: DateTime;
+    createdAt: DateTime | null;
+    createdBy: User | null;
     _permissions: {
-        canEdit: boolean,
-        canSee: boolean,
-    },
+        canEdit: boolean;
+        canSee: boolean;
+    };
     _links?: {
         dav_link?: {
-            href: string
-            expiration: number
-        },
-    },
+            href: string;
+            expiration: number;
+        };
+    };
 }
 
 export interface StoredObjectVersion {
     /**
      * filename of the object in the object storage
      */
-    filename: string,
-    iv: number[],
-    keyInfos: JsonWebKey,
-    type: string,
+    filename: string;
+    iv: number[];
+    keyInfos: JsonWebKey;
+    type: string;
 }
 
 export interface StoredObjectVersionCreated extends StoredObjectVersion {
-    persisted: false,
+    persisted: false;
 }
 
-export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
-    version: number,
-    id: number,
-    createdAt: DateTime|null,
-    createdBy: User|null,
+export interface StoredObjectVersionPersisted
+    extends StoredObjectVersionCreated {
+    version: number;
+    id: number;
+    createdAt: DateTime | null;
+    createdBy: User | null;
 }
 
 export interface StoredObjectStatusChange {
-  id: number,
-  filename: string,
-  status: StoredObjectStatus,
-  type: string,
+    id: number;
+    filename: string;
+    status: StoredObjectStatus;
+    type: string;
 }
 
 /**
  * Function executed by the WopiEditButton component.
  */
 export type WopiEditButtonExecutableBeforeLeaveFunction = {
-  (): Promise<void>
-}
+    (): Promise<void>;
+};
 
 /**
  * Object containing information for performering a POST request to a swift object store
  */
 export interface PostStoreObjectSignature {
-  method: "POST",
-  max_file_size: number,
-  max_file_count: 1,
-  expires: number,
-  submit_delay: 180,
-  redirect: string,
-  prefix: string,
-  url: string,
-  signature: string,
+    method: "POST";
+    max_file_size: number;
+    max_file_count: 1;
+    expires: number;
+    submit_delay: 180;
+    redirect: string;
+    prefix: string;
+    url: string;
+    signature: string;
 }
 
 export interface PDFPage {
-  index: number,
-  width: number,
-  height: number,
+    index: number;
+    width: number;
+    height: number;
 }
 export interface SignatureZone {
-  index: number | null,
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-  PDFPage: PDFPage,
+    index: number | null;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    PDFPage: PDFPage;
 }
 
 export interface Signature {
-  id: number,
-  storedObject: StoredObject,
-  zones: SignatureZone[],
+    id: number;
+    storedObject: StoredObject;
+    zones: SignatureZone[];
 }
 
-export type SignedState = 'pending' | 'signed' | 'rejected' | 'canceled' | 'error';
+export type SignedState =
+    | "pending"
+    | "signed"
+    | "rejected"
+    | "canceled"
+    | "error";
 
-export type CanvasEvent = 'select' | 'add';
+export interface CheckSignature {
+    state: SignedState;
+    storedObject: StoredObject;
+}
+
+export type CanvasEvent = "select" | "add";
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index e1d3124ce..3294360ef 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -224,6 +224,7 @@ import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 import {
   CanvasEvent,
+  CheckSignature,
   Signature,
   SignatureZone,
   SignedState,
@@ -460,9 +461,10 @@ const drawAllZones = (page: number) => {
 
 const checkSignature = () => {
   const url = `/api/1.0/document/workflow/${signature.id}/check-signature`;
-  return makeFetch("GET", url)
+  return makeFetch<CheckSignature, CheckSignature>("GET", url)
     .then((r) => {
-      signedState.value = r as SignedState;
+      signedState.value = r.state;
+      signature.storedObject = r.storedObject;
       checkForReady();
     })
     .catch((error) => {

From 2b516629f6d8297c7fe8751930500a4d039eb140 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 17:02:08 +0200
Subject: [PATCH 13/18] Signature: refresh document after signature

---
 .../public/vuejs/DocumentSignature/App.vue    | 46 +++++++++++--------
 .../public/vuejs/DocumentSignature/index.ts   |  1 +
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 3294360ef..0f6b8bcdf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -82,7 +82,7 @@
           {{ $t("cancel") }}
         </button>
       </div>
-      <div class="col-1">
+      <div class="col-1" v-if="signedState !== 'signed'">
         <button
           class="btn btn-create btn-sm"
           :class="{ active: canvasEvent === 'add' }"
@@ -113,7 +113,7 @@
         </button>
       </div>
       <div
-        v-if="signature.zones.length > 1"
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
         class="col text-end d-xl-none"
       >
         <button
@@ -125,7 +125,7 @@
         </button>
       </div>
       <div
-        v-if="signature.zones.length > 1"
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
         class="col text-start d-xl-none"
       >
         <button
@@ -137,7 +137,7 @@
         </button>
       </div>
       <div
-        v-if="signature.zones.length > 1"
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
         class="col text-end d-none d-xl-flex p-0"
       >
         <button
@@ -149,7 +149,7 @@
         </button>
       </div>
       <div
-        v-if="signature.zones.length > 1"
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
         class="col text-start d-none d-xl-flex p-0"
       >
         <button
@@ -160,7 +160,7 @@
           {{ $t("next_sign_zone") }}
         </button>
       </div>
-      <div class="col text-end p-0">
+      <div class="col text-end p-0" v-if="signedState !== 'signed'">
         <button
           class="btn btn-misc btn-sm"
           :hidden="!userSignatureZone"
@@ -178,7 +178,10 @@
           {{ $t("cancel") }}
         </button>
       </div>
-      <div class="col text-end p-0 pe-2 pe-xxl-4">
+      <div
+        class="col text-end p-0 pe-2 pe-xxl-4"
+        v-if="signedState !== 'signed'"
+      >
         <button
           class="btn btn-create btn-sm"
           :class="{ active: canvasEvent === 'add' }"
@@ -194,13 +197,9 @@
     <canvas class="m-auto" id="canvas"></canvas>
   </div>
 
-  <div
-    class="col-xs-12 col-md-12 col-lg-9 m-auto p-4"
-    id="action-buttons"
-    v-if="signedState !== 'signed'"
-  >
+  <div class="col-xs-12 col-md-12 col-lg-9 m-auto p-4" id="action-buttons">
     <div class="row">
-      <div class="col-4">
+      <div class="col-4" v-if="signedState !== 'signed'">
         <button
           class="btn btn-action me-2"
           :disabled="!userSignatureZone"
@@ -209,10 +208,18 @@
           {{ $t("sign") }}
         </button>
       </div>
+      <div class="col-4" v-else></div>
       <div class="col-8 d-flex justify-content-end">
-        <a class="btn btn-delete" :href="getReturnPath()">
+        <a
+          class="btn btn-delete"
+          v-if="signedState !== 'signed'"
+          :href="getReturnPath()"
+        >
           {{ $t("cancel_signing") }}
         </a>
+        <a class="btn btn-cancel" v-else :href="getReturnPath()">
+          {{ $t("return") }}
+        </a>
       </div>
     </div>
   </div>
@@ -274,7 +281,7 @@ const mountPdf = async (url: string) => {
   const loadingTask = pdfjsLib.getDocument(url);
   pdf = await loadingTask.promise;
   pageCount.value = pdf.numPages;
-  await setPage(1);
+  await setPage(page.value);
 };
 
 const getRenderContext = (pdfPage: PDFPageProxy) => {
@@ -297,6 +304,8 @@ const setPage = async (page: number) => {
   await pdfPage.render(renderContext);
 };
 
+const init = () => downloadAndOpen().then(initPdf);
+
 async function downloadAndOpen(): Promise<Blob> {
   let raw;
   try {
@@ -309,7 +318,6 @@ async function downloadAndOpen(): Promise<Blob> {
     throw e;
   }
   await mountPdf(URL.createObjectURL(raw));
-  initPdf();
   return raw;
 }
 
@@ -444,7 +452,7 @@ const drawZone = (
 const drawAllZones = (page: number) => {
   const canvas = document.querySelectorAll("canvas")[0];
   const ctx = canvas.getContext("2d");
-  if (ctx) {
+  if (ctx && signedState.value !== "signed") {
     signature.zones
       .filter((z) => z.PDFPage.index + 1 === page)
       .map((z) => {
@@ -461,7 +469,7 @@ const drawAllZones = (page: number) => {
 
 const checkSignature = () => {
   const url = `/api/1.0/document/workflow/${signature.id}/check-signature`;
-  return makeFetch<CheckSignature, CheckSignature>("GET", url)
+  return makeFetch<null, CheckSignature>("GET", url)
     .then((r) => {
       signedState.value = r.state;
       signature.storedObject = r.storedObject;
@@ -592,7 +600,7 @@ const getReturnPath = () =>
       window.location.pathname
     : window.location.pathname;
 
-downloadAndOpen();
+init();
 </script>
 
 <style scoped lang="scss">
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
index 6f2ddafe9..c6ae996b2 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
@@ -23,6 +23,7 @@ const appMessages = {
         electronic_signature_in_progress: 'Signature électronique en cours...',
         loading: 'Chargement...',
         remove_sign_zone: 'Enlever la zone',
+        return: 'Retour',
     }
 }
 

From 119668e415c9220406cc40536e7cf88261914fd4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 17:02:45 +0200
Subject: [PATCH 14/18] Signature: allow for null index in signature zone

---
 .../Controller/SignatureRequestController.php               | 6 ++++--
 .../Signature/Driver/BaseSigner/RequestPdfSignMessage.php   | 2 +-
 .../Service/Signature/PDFSignatureZone.php                  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
index 14e33cca3..2a6e0e223 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
@@ -80,8 +80,10 @@ class SignatureRequestController
         return new JsonResponse(
             [
                 'state' => $signature->getState(),
-                'storedObject' => $this->normalizer->normalize($storedObject, 'json')
+                'storedObject' => $this->normalizer->normalize($storedObject, 'json'),
             ],
-            JsonResponse::HTTP_OK, []);
+            JsonResponse::HTTP_OK,
+            []
+        );
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessage.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessage.php
index 144a738e1..95d83c2b4 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessage.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessage.php
@@ -21,7 +21,7 @@ final readonly class RequestPdfSignMessage
     public function __construct(
         public int $signatureId,
         public PDFSignatureZone $PDFSignatureZone,
-        public int $signatureZoneIndex,
+        public ?int $signatureZoneIndex,
         public string $reason,
         public string $signerText,
         public string $content,
diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php
index c21b2fdc2..4c5db70f8 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php
@@ -17,7 +17,7 @@ final readonly class PDFSignatureZone
 {
     public function __construct(
         #[Groups(['read'])]
-        public int $index,
+        public ?int $index,
         #[Groups(['read'])]
         public float $x,
         #[Groups(['read'])]

From 59c34dabd78567476140510d54415dcd8198ffcc Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 12 Sep 2024 17:18:13 +0200
Subject: [PATCH 15/18] Signature: allow for null index in signature zone

---
 .../Service/Signature/Driver/BaseSigner/PdfSignedMessage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessage.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessage.php
index 3116e3b62..9368f188b 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessage.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessage.php
@@ -18,7 +18,7 @@ final readonly class PdfSignedMessage
 {
     public function __construct(
         public readonly int $signatureId,
-        public readonly int $signatureZoneIndex,
+        public readonly ?int $signatureZoneIndex,
         public readonly string $content,
     ) {}
 }

From f0e8df38aff5b3418ddeb77e0ffd6b17da88f870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Sep 2024 16:03:06 +0200
Subject: [PATCH 16/18] remove the left-arrow on the "retour" button, because
 it was placed on the right of the page

---
 .../Resources/public/vuejs/DocumentSignature/App.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index 0f6b8bcdf..e63997bcd 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -217,7 +217,7 @@
         >
           {{ $t("cancel_signing") }}
         </a>
-        <a class="btn btn-cancel" v-else :href="getReturnPath()">
+        <a class="btn btn-misc" v-else :href="getReturnPath()">
           {{ $t("return") }}
         </a>
       </div>

From 8e984f2006aa5b346288829e2cb5552d59dd4bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Sep 2024 16:16:42 +0200
Subject: [PATCH 17/18] do not allow to sign if the signature is already
 applyied

---
 .../Controller/SignatureRequestController.php      |  7 +++++++
 .../Controller/WorkflowAddSignatureController.php  | 14 ++++++++++++++
 .../WorkflowAddSignatureControllerTest.php         |  5 ++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
index 2a6e0e223..26fc1b098 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php
@@ -15,11 +15,13 @@ use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\RequestPdfSignMessa
 use Chill\DocStoreBundle\Service\Signature\PDFPage;
 use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderManagerInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
@@ -40,6 +42,11 @@ class SignatureRequestController
     public function processSignature(EntityWorkflowStepSignature $signature, Request $request): JsonResponse
     {
         $entityWorkflow = $signature->getStep()->getEntityWorkflow();
+
+        if (EntityWorkflowSignatureStateEnum::PENDING !== $signature->getState()) {
+            return new JsonResponse([], status: Response::HTTP_CONFLICT);
+        }
+
         $storedObject = $this->entityWorkflowManager->getAssociatedStoredObject($entityWorkflow);
         $content = $this->storedObjectManager->read($storedObject);
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php
index 8ee8138fa..deb90119b 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php
@@ -12,12 +12,15 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\DocStoreBundle\Service\Signature\PDFSignatureZoneAvailable;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Twig\Environment;
 
@@ -28,6 +31,7 @@ final readonly class WorkflowAddSignatureController
         private PDFSignatureZoneAvailable $PDFSignatureZoneAvailable,
         private NormalizerInterface $normalizer,
         private Environment $twig,
+        private UrlGeneratorInterface $urlGenerator,
     ) {}
 
     #[Route(path: '/{_locale}/main/workflow/signature/{id}/sign', name: 'chill_main_workflow_signature_add', methods: 'GET')]
@@ -35,6 +39,16 @@ final readonly class WorkflowAddSignatureController
     {
         $entityWorkflow = $signature->getStep()->getEntityWorkflow();
 
+        if (EntityWorkflowSignatureStateEnum::PENDING !== $signature->getState()) {
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return new RedirectResponse(
+                $this->urlGenerator->generate('chill_main_workflow_show', ['id' => $entityWorkflow->getId()])
+            );
+        }
+
         $storedObject = $this->entityWorkflowManager->getAssociatedStoredObject($entityWorkflow);
         if (null === $storedObject) {
             throw new NotFoundHttpException('No stored object found');
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/WorkflowAddSignatureControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/WorkflowAddSignatureControllerTest.php
index 81c8d095e..4b6fd38e2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/WorkflowAddSignatureControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/WorkflowAddSignatureControllerTest.php
@@ -23,6 +23,7 @@ use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use Chill\PersonBundle\Entity\Person;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Twig\Environment;
 
@@ -62,7 +63,9 @@ class WorkflowAddSignatureControllerTest extends TestCase
         $twig->method('render')->with('@ChillMain/Workflow/_signature_sign.html.twig', $this->isType('array'))
             ->willReturn('ok');
 
-        $controller = new WorkflowAddSignatureController($entityWorkflowManager, $pdfSignatureZoneAvailable, $normalizer, $twig);
+        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
+
+        $controller = new WorkflowAddSignatureController($entityWorkflowManager, $pdfSignatureZoneAvailable, $normalizer, $twig, $urlGenerator);
 
         $actual = $controller($signature, new Request());
 

From 911dfc287859727d56b4e5ba111591f638c8eb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Sep 2024 16:22:09 +0200
Subject: [PATCH 18/18] fix rector errors

---
 .../Templating/Entity/ChillEntityRenderExtension.php       | 2 +-
 .../Templating/Entity/ChillEntityRenderManager.php         | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
index 8a9e70229..cc2664f55 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -19,7 +19,7 @@ use Twig\TwigFilter;
  */
 class ChillEntityRenderExtension extends AbstractExtension
 {
-    public function __construct(private ChillEntityRenderManagerInterface $renderManager) {}
+    public function __construct(private readonly ChillEntityRenderManagerInterface $renderManager) {}
 
     /**
      * @return array|TwigFilter[]
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
index 6437a9c24..51315a6d6 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderManager.php
@@ -15,15 +15,12 @@ final readonly class ChillEntityRenderManager implements ChillEntityRenderManage
 {
     private ChillEntityRender $defaultRender;
 
-    /**
+    public function __construct(/**
      * @var iterable<ChillEntityRenderInterface>
      */
-    private iterable $renders;
-
-    public function __construct(iterable $renders)
+    private iterable $renders)
     {
         $this->defaultRender = new ChillEntityRender();
-        $this->renders = $renders;
     }
 
     public function renderBox($entity, array $options = []): string