Merge branch 'master' into 369-duplicate-evaluation-document

2025-10-01 02:49:42 +00:00 · 2025-08-20 15:28:19 +02:00
parent a0b2d92ba2 c0826bc65c
commit 7dcb8abe38
846 changed files with 35209 additions and 38186 deletions
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts
@@ -10,6 +10,9 @@ const startApp = (
    collectionEntry: null | HTMLLIElement,
 ): void => {
    console.log("app started", divElement);
+
+    const inputTitle = collectionEntry?.querySelector("input[type='text']");
+
    const input_stored_object: HTMLInputElement | null =
        divElement.querySelector("input[data-stored-object]");
    if (null === input_stored_object) {
@@ -26,9 +29,10 @@ const startApp = (
    const app = createApp({
        template:
            '<drop-file-widget :existingDoc="this.$data.existingDoc" :allowRemove="true" @addDocument="this.addDocument" @removeDocument="removeDocument"></drop-file-widget>',
-        data(vm) {
+        data() {
            return {
                existingDoc: existingDoc,
+                inputTitle: inputTitle,
            };
        },
        components: {
@@ -38,10 +42,13 @@ const startApp = (
            addDocument: function ({
                stored_object,
                stored_object_version,
+                file_name,
            }: {
                stored_object: StoredObject;
                stored_object_version: StoredObjectVersion;
+                file_name: string;
            }): void {
+                stored_object.title = file_name;
                console.log("object added", stored_object);
                console.log("version added", stored_object_version);
                this.$data.existingDoc = stored_object;
@@ -49,6 +56,11 @@ const startApp = (
                input_stored_object.value = JSON.stringify(
                    this.$data.existingDoc,
                );
+                if (this.$data.inputTitle) {
+                    if (!this.$data.inputTitle?.value) {
+                        this.$data.inputTitle.value = file_name;
+                    }
+                }
            },
            removeDocument: function (object: StoredObject): void {
                console.log("catch remove document", object);
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -2,26 +2,28 @@
    <teleport to="body">
        <modal v-if="modalOpen" @close="modalOpen = false">
            <template v-slot:header>
-                <h2>{{ $t("signature_confirmation") }}</h2>
+                <h2>{{ trans(SIGNATURES_SIGNATURE_CONFIRMATION) }}</h2>
            </template>
            <template v-slot:body>
                <div class="signature-modal-body text-center" v-if="loading">
-                    <p>{{ $t("electronic_signature_in_progress") }}</p>
+                    <p>
+                        {{ trans(SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS) }}
+                    </p>
                    <div class="loading">
                        <i
                            class="fa fa-circle-o-notch fa-spin fa-3x"
-                            :title="$t('loading')"
+                            :title="trans(SIGNATURES_LOADING)"
                        ></i>
                    </div>
                </div>
                <div class="signature-modal-body text-center" v-else>
-                    <p>{{ $t("you_are_going_to_sign") }}</p>
-                    <p>{{ $t("are_you_sure") }}</p>
+                    <p>{{ trans(SIGNATURES_YOU_ARE_GOING_TO_SIGN) }}</p>
+                    <p>{{ trans(SIGNATURES_ARE_YOU_SURE) }}</p>
                </div>
            </template>
            <template v-slot:footer>
                <button class="btn btn-action" @click.prevent="confirmSign">
-                    {{ $t("yes") }}
+                    {{ trans(SIGNATURES_YES) }}
                </button>
            </template>
        </modal>
@@ -39,7 +41,7 @@
                >
                    <option value="" selected disabled>Zoom</option>
                    <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
-                        {{ z.label.fr }}
+                        {{ localizeString(z.label) }}
                    </option>
                </select>
                <template v-if="pageCount > 1">
@@ -82,28 +84,39 @@
                        @change="toggleMultiPage"
                    />
                    <label class="form-check-label" for="checkboxMulti">
-                        {{ $t("all_pages") }}
+                        {{ trans(SIGNATURES_ALL_PAGES) }}
                    </label>
                </template>
            </div>
            <div
-                v-if="signature.zones.length > 0"
+                v-if="signature.zones.length === 1 && signedState !== 'signed'"
                class="col-5 p-0 text-center turnSignature"
            >
                <button
-                    :disabled="isFirstSignatureZone"
+                    class="btn btn-light btn-sm"
+                    @click="goToSignatureZoneUnique"
+                >
+                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
+                </button>
+            </div>
+            <div
+                v-if="signature.zones.length > 1"
+                class="col-5 p-0 text-center turnSignature"
+            >
+                <button
+                    :disabled="isFirstSignatureZone()"
                    class="btn btn-light btn-sm"
                    @click="turnSignature(-1)"
                >
-                    {{ $t("last_zone") }}
+                    {{ trans(SIGNATURES_LAST_ZONE) }}
                </button>
                <span>|</span>
                <button
-                    :disabled="isLastSignatureZone"
+                    :disabled="isLastSignatureZone()"
                    class="btn btn-light btn-sm"
                    @click="turnSignature(1)"
                >
-                    {{ $t("next_zone") }}
+                    {{ trans(SIGNATURES_NEXT_ZONE) }}
                </button>
            </div>
            <div class="col text-end" v-if="signedState !== 'signed'">
@@ -112,9 +125,9 @@
                    :hidden="!userSignatureZone"
                    @click="undoSign"
                    v-if="signature.zones.length > 1"
-                    :title="$t('choose_another_signature')"
+                    :title="trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE)"
                >
-                    {{ $t("another_zone") }}
+                    {{ trans(SIGNATURES_ANOTHER_ZONE) }}
                </button>
                <button
                    class="btn btn-misc btn-sm"
@@ -122,7 +135,7 @@
                    @click="undoSign"
                    v-else
                >
-                    {{ $t("cancel") }}
+                    {{ trans(SIGNATURES_CANCEL) }}
                </button>
                <button
                    v-if="userSignatureZone === null"
@@ -134,7 +147,7 @@
                        active: canvasEvent === 'add',
                    }"
                    @click="toggleAddZone()"
-                    :title="$t('add_sign_zone')"
+                    :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
                >
                    <template v-if="canvasEvent === 'add'">
                        <div
@@ -160,7 +173,7 @@
                >
                    <option value="" selected disabled>Zoom</option>
                    <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
-                        {{ z.label.fr }}
+                        {{ localizeString(z.label) }}
                    </option>
                </select>
                <template v-if="pageCount > 1">
@@ -186,48 +199,70 @@
                        @change="toggleMultiPage"
                    />
                    <label class="form-check-label" for="checkboxMulti">
-                        {{ $t("see_all_pages") }}
+                        {{ trans(SIGNATURES_SEE_ALL_PAGES) }}
                    </label>
                </template>
            </div>
            <div
-                v-if="signature.zones.length > 0 && signedState !== 'signed'"
+                v-if="signature.zones.length === 1 && signedState !== 'signed'"
                class="col-4 d-xl-none text-center turnSignature p-0"
            >
                <button
-                    :disabled="!hasSignatureZoneSelected"
                    class="btn btn-light btn-sm"
-                    @click="turnSignature(-1)"
+                    @click="goToSignatureZoneUnique"
                >
-                    {{ $t("last_zone") }}
-                </button>
-                <span>|</span>
-                <button
-                    :disabled="isLastSignatureZone"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(1)"
-                >
-                    {{ $t("next_zone") }}
+                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
                </button>
            </div>
            <div
-                v-if="signature.zones.length > 0 && signedState !== 'signed'"
-                class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
+                v-if="signature.zones.length > 1 && signedState !== 'signed'"
+                class="col-4 d-xl-none text-center turnSignature p-0"
            >
                <button
-                    :disabled="isFirstSignatureZone"
+                    :disabled="isFirstSignatureZone()"
                    class="btn btn-light btn-sm"
                    @click="turnSignature(-1)"
                >
-                    {{ $t("last_sign_zone") }}
+                    {{ trans(SIGNATURES_LAST_ZONE) }}
                </button>
                <span>|</span>
                <button
-                    :disabled="isLastSignatureZone"
+                    :disabled="isLastSignatureZone()"
                    class="btn btn-light btn-sm"
                    @click="turnSignature(1)"
                >
-                    {{ $t("next_sign_zone") }}
+                    {{ trans(SIGNATURES_NEXT_ZONE) }}
+                </button>
+            </div>
+            <div
+                v-if="signature.zones.length === 1 && signedState !== 'signed'"
+                class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
+            >
+                <button
+                    class="btn btn-light btn-sm"
+                    @click="goToSignatureZoneUnique"
+                >
+                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
+                </button>
+            </div>
+            <div
+                v-if="signature.zones.length > 1 && signedState !== 'signed'"
+                class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
+            >
+                <button
+                    :disabled="isFirstSignatureZone()"
+                    class="btn btn-light btn-sm"
+                    @click="turnSignature(-1)"
+                >
+                    {{ trans(SIGNATURES_LAST_SIGN_ZONE) }}
+                </button>
+                <span>|</span>
+                <button
+                    :disabled="isLastSignatureZone()"
+                    class="btn btn-light btn-sm"
+                    @click="turnSignature(1)"
+                >
+                    {{ trans(SIGNATURES_NEXT_SIGN_ZONE) }}
                </button>
            </div>
            <div class="col text-end" v-if="signedState !== 'signed'">
@@ -237,7 +272,7 @@
                    @click="undoSign"
                    v-if="signature.zones.length > 1"
                >
-                    {{ $t("choose_another_signature") }}
+                    {{ trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE) }}
                </button>
                <button
                    class="btn btn-misc btn-sm"
@@ -245,7 +280,7 @@
                    @click="undoSign"
                    v-else
                >
-                    {{ $t("cancel") }}
+                    {{ trans(SIGNATURES_CANCEL) }}
                </button>
                <button
                    v-if="userSignatureZone === null"
@@ -257,13 +292,13 @@
                        active: canvasEvent === 'add',
                    }"
                    @click="toggleAddZone()"
-                    :title="$t('add_sign_zone')"
+                    :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
                >
                    <template v-if="canvasEvent !== 'add'">
-                        {{ $t("add_zone") }}
+                        {{ trans(SIGNATURES_ADD_ZONE) }}
                    </template>
                    <template v-else>
-                        {{ $t("click_on_document") }}
+                        {{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
                        <div
                            class="spinner-border spinner-border-sm"
                            role="status"
@@ -297,10 +332,10 @@
                    v-if="signedState !== 'signed'"
                    :href="getReturnPath()"
                >
-                    {{ $t("cancel") }}
+                    {{ trans(SIGNATURES_CANCEL) }}
                </a>
                <a class="btn btn-misc" v-else :href="getReturnPath()">
-                    {{ $t("return") }}
+                    {{ trans(SIGNATURES_RETURN) }}
                </a>
            </div>
            <div class="col text-end" v-if="signedState !== 'signed'">
@@ -309,7 +344,7 @@
                    :disabled="!userSignatureZone"
                    @click="sign"
                >
-                    {{ $t("sign") }}
+                    {{ trans(SIGNATURES_SIGN) }}
                </button>
            </div>
            <div class="col-4" v-else></div>
@@ -318,7 +353,7 @@
 </template>

 <script setup lang="ts">
-import { ref, Ref, computed } from "vue";
+import { ref, Ref } from "vue";
 import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 import {
@@ -329,13 +364,39 @@ import {
    SignedState,
    ZoomLevel,
 } from "../../types";
-import { makeFetch } from "../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import * as pdfjsLib from "pdfjs-dist";
 import {
    PDFDocumentProxy,
    PDFPageProxy,
 } from "pdfjs-dist/types/src/display/api";

+import {
+    SIGNATURES_YES,
+    SIGNATURES_ARE_YOU_SURE,
+    SIGNATURES_YOU_ARE_GOING_TO_SIGN,
+    SIGNATURES_SIGNATURE_CONFIRMATION,
+    SIGNATURES_SIGN,
+    SIGNATURES_CHOOSE_ANOTHER_SIGNATURE,
+    SIGNATURES_CANCEL,
+    SIGNATURES_LAST_SIGN_ZONE,
+    SIGNATURES_NEXT_SIGN_ZONE,
+    SIGNATURES_ADD_SIGN_ZONE,
+    SIGNATURES_CLICK_ON_DOCUMENT,
+    SIGNATURES_LAST_ZONE,
+    SIGNATURES_NEXT_ZONE,
+    SIGNATURES_ADD_ZONE,
+    SIGNATURES_ANOTHER_ZONE,
+    SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS,
+    SIGNATURES_LOADING,
+    SIGNATURES_RETURN,
+    SIGNATURES_SEE_ALL_PAGES,
+    SIGNATURES_ALL_PAGES,
+    SIGNATURES_GO_TO_SIGNATURE_UNIQUE,
+    trans,
+} from "translator";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
 // @ts-ignore incredible but the console.log is needed
 import * as PdfWorker from "pdfjs-dist/build/pdf.worker.mjs";
 console.log(PdfWorker);
@@ -416,19 +477,15 @@ const $toast = useToast();
 const signature = window.signature;

 const isFirstSignatureZone = () =>
-    userSignatureZone.value?.index ? userSignatureZone.value.index < 1 : false;
+    userSignatureZone.value?.index != null
+        ? userSignatureZone.value.index < 1
+        : false;
+
 const isLastSignatureZone = () =>
    userSignatureZone.value?.index
        ? userSignatureZone.value.index >= signature.zones.length - 1
        : false;

-/**
- * Return true if the user has selected a user zone (existing on the doc or created by the user)
- */
-const hasSignatureZoneSelected = computed<boolean>(
-    () => userSignatureZone.value !== null,
-);
-
 const setZoomLevel = async (zoomLevel: string) => {
    zoom.value = Number.parseFloat(zoomLevel);
    await resetPages();
@@ -600,6 +657,15 @@ const turnPage = async (upOrDown: number) => {
    }
 };

+const selectZoneInCanvas = (signatureZone: SignatureZone) => {
+    page.value = signatureZone.PDFPage.index + 1;
+    const canvas = getCanvas(signatureZone.PDFPage.index + 1);
+    selectZone(signatureZone, canvas);
+    canvas.scrollIntoView();
+};
+
+const goToSignatureZoneUnique = () => selectZoneInCanvas(signature.zones[0]);
+
 const turnSignature = async (upOrDown: number) => {
    let zoneIndex = userSignatureZone.value?.index ?? -1;
    if (zoneIndex < -1) {
@@ -612,10 +678,7 @@ const turnSignature = async (upOrDown: number) => {
    }
    let currentZone = signature.zones[zoneIndex];
    if (currentZone) {
-        page.value = currentZone.PDFPage.index + 1;
-        const canvas = getCanvas(currentZone.PDFPage.index + 1);
-        selectZone(currentZone, canvas);
-        canvas.scrollIntoView();
+        selectZoneInCanvas(currentZone);
    }
 };

--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue
@@ -23,6 +23,7 @@ const emit =
            {
                stored_object_version: StoredObjectVersionCreated,
                stored_object: StoredObject,
+                file_name: string,
            },
        ) => void
    >();
@@ -114,7 +115,21 @@ const handleFile = async (file: File): Promise<void> => {
        persisted: false,
    };

-    emit("addDocument", { stored_object, stored_object_version });
+    const fileName = file.name;
+    let file_name = "Nouveau document";
+    const file_name_split = fileName.split(".");
+    if (file_name_split.length > 1) {
+        const extension = file_name_split
+            ? file_name_split[file_name_split.length - 1]
+            : "";
+        file_name = fileName.replace(extension, "").slice(0, -1);
+    }
+
+    emit("addDocument", {
+        stored_object,
+        stored_object_version,
+        file_name: file_name,
+    });
    uploading.value = false;
 };
 </script>
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
@@ -21,6 +21,7 @@ const emit = defineEmits<{
        {
            stored_object: StoredObject,
            stored_object_version: StoredObjectVersion,
+            file_name: string,
        },
    ): void;
    (e: "removeDocument"): void;
@@ -43,14 +44,16 @@ const buttonState = computed<"add" | "replace">(() => {
 function onAddDocument({
    stored_object,
    stored_object_version,
+    file_name,
 }: {
    stored_object: StoredObject;
    stored_object_version: StoredObjectVersion;
+    file_name: string;
 }): void {
    const message =
        buttonState.value === "add" ? "Document ajouté" : "Document remplacé";
    $toast.success(message);
-    emit("addDocument", { stored_object_version, stored_object });
+    emit("addDocument", { stored_object_version, stored_object, file_name });
    state.showModal = false;
 }

--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue
@@ -19,6 +19,7 @@ const emit = defineEmits<{
        {
            stored_object: StoredObject,
            stored_object_version: StoredObjectVersion,
+            file_name: string,
        },
    ): void;
    (e: "removeDocument"): void;
@@ -53,11 +54,13 @@ const dav_link_href = computed<string | undefined>(() => {
 const onAddDocument = ({
    stored_object,
    stored_object_version,
+    file_name,
 }: {
    stored_object: StoredObject;
    stored_object_version: StoredObjectVersion;
+    file_name: string;
 }): void => {
-    emit("addDocument", { stored_object, stored_object_version });
+    emit("addDocument", { stored_object, stored_object_version, file_name });
 };

 const onRemoveDocument = (e: Event): void => {
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
@@ -53,7 +53,7 @@ const onRestored = ({
 <template>
    <template v-if="props.versions.length > 0">
        <div class="container">
-            <template v-for="v in props.versions">
+            <template v-for="v in props.versions" :key="v.id">
                <history-button-list-item
                    :version="v"
                    :can-edit="canEdit"
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
@@ -32,13 +32,17 @@ const onRestore = ({
    emit("restoreVersion", { newVersion });
 };

-const isKeptBeforeConversion = computed<boolean>(() =>
-    props.version["point-in-times"].reduce(
-        (accumulator: boolean, pit: StoredObjectPointInTime) =>
-            accumulator || "keep-before-conversion" === pit.reason,
-        false,
-    ),
-);
+const isKeptBeforeConversion = computed<boolean>(() => {
+    if ("point-in-times" in props.version) {
+        return props.version["point-in-times"].reduce(
+            (accumulator: boolean, pit: StoredObjectPointInTime) =>
+                accumulator || "keep-before-conversion" === pit.reason,
+            false,
+        );
+    } else {
+        return false;
+    }
+});

 const isRestored = computed<boolean>(
    () => props.version.version > 0 && null !== props.version["from-restored"],
@@ -90,11 +94,11 @@ const classes = computed<{
        <div class="col-12">
            <file-icon :type="version.type"></file-icon>
            <span
-                ><strong>#{{ version.version + 1 }}</strong></span
+                ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
            >
            <template
                v-if="version.createdBy !== null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">Créé par</strong
+                ><strong v-if="version.version == 0">créé par</strong
                ><strong v-else>modifié par</strong>
                <span class="badge-user"
                    ><UserRenderBoxBadge