django-microsys 2.0.1__tar.gz → 2.0.3__tar.gz

{django_microsys-2.0.1 → django_microsys-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.0.1
+Version: 2.0.3
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

{django_microsys-2.0.1 → django_microsys-2.0.3}/django_microsys.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-microsys
-Version: 2.0.1
+Version: 2.0.3
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL

django_microsys-2.0.3/microsys/VERSION

@@ -0,0 +1 @@
+2.0.3

{django_microsys-2.0.1 → django_microsys-2.0.3}/microsys/static/microsys/forms/js/file_field.js

@@ -88,6 +88,7 @@
         const input = widget.querySelector('[data-archive-file-input="true"]');
         const drop = widget.querySelector("[data-archive-file-drop]");
         const uploadButton = widget.querySelector("[data-archive-file-upload]");
+        const scanButton = widget.querySelector("[data-archive-file-scan]");
         const clearButton = widget.querySelector("[data-archive-file-clear]");
         const clearCheckbox = widget.querySelector(".archive-file-clear-checkbox");
 
@@ -101,7 +102,23 @@
             });
         }
 
+        if (scanButton) {
+            ["pointerdown", "pointerup", "mousedown", "mouseup", "click", "dblclick"].forEach((eventName) => {
+                scanButton.addEventListener(eventName, function (event) {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    if (typeof event.stopImmediatePropagation === "function") {
+                        event.stopImmediatePropagation();
+                    }
+                });
+            });
+        }
+
         drop.addEventListener("click", function (event) {
+            if (event.target.closest("[data-archive-file-upload]")) return;
+            if (event.target.closest("[data-archive-file-scan]")) return;
+            if (event.target.closest("[data-archive-file-clear]")) return;
+            if (event.target.closest("[data-archive-file-link]")) return;
             if (event.target.closest("a, button")) return;
             input.click();
         });

{django_microsys-2.0.1 → django_microsys-2.0.3}/microsys/static/microsys/helpers/scan_link/js/scan_button.js

@@ -18,6 +18,37 @@
         };
     }
 
+    function widgetForButton(button) {
+        return button.closest("[data-archive-file-widget]");
+    }
+
+    function setWidgetStatus(button, message) {
+        const widget = widgetForButton(button);
+        if (!widget) return;
+
+        const meta = widget.querySelector("[data-archive-file-meta]");
+        if (!meta) return;
+
+        if (!button.dataset.scanOriginalMeta) {
+            button.dataset.scanOriginalMeta = meta.textContent || "";
+        }
+
+        meta.textContent = message;
+    }
+
+    function restoreWidgetStatus(button) {
+        const widget = widgetForButton(button);
+        if (!widget) return;
+
+        const meta = widget.querySelector("[data-archive-file-meta]");
+        if (!meta) return;
+
+        if (button.dataset.scanOriginalMeta !== undefined) {
+            meta.textContent = button.dataset.scanOriginalMeta;
+            delete button.dataset.scanOriginalMeta;
+        }
+    }
+
     function setVisualState(button, state, title) {
         const icons = {
             idle: '<i class="bi bi-printer"></i>',
@@ -37,12 +68,14 @@
         button.disabled = false;
         delete button.dataset.scanJobId;
         delete button.dataset.scanBusyFlag;
+        restoreWidgetStatus(button);
         setVisualState(button, "idle", messages.label);
     }
 
     function setWorkingState(button, message) {
         button.disabled = true;
         button.dataset.scanBusyFlag = "true";
+        setWidgetStatus(button, message);
         setVisualState(button, "working", message);
     }
 
@@ -50,6 +83,7 @@
         const messages = messagesFor(button);
         button.disabled = false;
         delete button.dataset.scanBusyFlag;
+        restoreWidgetStatus(button);
         setVisualState(button, "complete", messages.completed);
     }
 
@@ -99,10 +133,8 @@
     }
 
     function assignBlobToInput(fileInput, blob) {
-        const safeName = (fileInput.name || fileInput.id || "scanned_document")
-            .replace(/[^a-z0-9_-]+/gi, "_")
-            .replace(/^_+|_+$/g, "") || "scanned_document";
-        const file = new File([blob], `${safeName}.pdf`, { type: "application/pdf" });
+        const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
+        const file = new File([blob], `scanned-document-${timestamp}.pdf`, { type: "application/pdf" });
         const dataTransfer = new DataTransfer();
         dataTransfer.items.add(file);
         fileInput.files = dataTransfer.files;
@@ -154,7 +186,13 @@
         document.querySelectorAll(".scan-btn").forEach((button) => {
             setVisualState(button, "idle", messagesFor(button).label);
 
-            button.addEventListener("click", async function () {
+            button.addEventListener("click", async function (event) {
+                event.preventDefault();
+                event.stopPropagation();
+                if (typeof event.stopImmediatePropagation === "function") {
+                    event.stopImmediatePropagation();
+                }
+
                 if (button.dataset.scanBusyFlag === "true") {
                     return;
                 }
@@ -191,12 +229,15 @@
                     button.dataset.scanJobId = jobId;
                     activeButtonsByJobId.set(jobId, button);
 
-                    const blob = await scanner.waitForResult(jobId);
+                    const blob = await scanner.waitForResult(jobId, {
+                        timeoutMs: 5 * 60 * 1000,
+                    });
                     assignBlobToInput(fileInput, blob);
                     setCompletedState(button);
                 } catch (error) {
                     const message = resolveErrorMessage(button, error);
                     resetButton(button);
+                    setWidgetStatus(button, message);
                     showButtonError(button, message);
                 } finally {
                     if (jobId) {
@@ -204,6 +245,7 @@
                     }
                     delete button.dataset.scanJobId;
                     if (button.innerHTML.indexOf("bi-check-lg") === -1) {
+                        button.disabled = false;
                         delete button.dataset.scanBusyFlag;
                     }
                 }

{django_microsys-2.0.1 → django_microsys-2.0.3}/microsys/templates/microsys/forms/file_input.html

@@ -56,6 +56,7 @@
                         data-scan-busy="{{ MS_TRANS.scan_busy_message|default:'Another scan is already running. Wait for it to finish, then try again.' }}"
                         data-scan-cancelled="{{ MS_TRANS.scan_cancelled_message|default:'The scan was cancelled.' }}"
                         data-scan-timeout="{{ MS_TRANS.scan_timeout_message|default:'The scan took too long to finish.' }}"
+                        data-scan-stalled="{{ MS_TRANS.scan_stalled_message|default:'The scan helper appears to be stuck. Check the ScanLink tray app, scanner dialog, or scanner driver and try again.' }}"
                         data-scan-no-scanners="{{ MS_TRANS.scan_no_scanners_message|default:'No TWAIN scanner is available on this computer.' }}"
                         data-scan-open-source="{{ MS_TRANS.scan_open_source_failed_message|default:'The selected scanner could not be opened.' }}"
                         data-scan-failed="{{ MS_TRANS.scan_failed_message|default:'The scan could not be completed.' }}"

django_microsys-2.0.1/microsys/VERSION

@@ -1 +0,0 @@
-2.0.1