photo size fixed

public/userarea/error_log.txt

@@ -12,6 +12,3 @@
 2025-08-26 16:49:24 - Risposta non JSON valida: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="DevExpress.ExpressApp.SystemModule" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="DashboardViewItemDescriptor"><Key><PropertyRef Name="ViewId" /></Key><Property Name="ViewId" Type="Edm.String" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem" BaseType="DevExpress.ExpressApp.NonPersistentLiteObject" Abstract="true"><Property Name="Visibility" Type="DevExpress.ExpressApp.Editors.ViewItemVisibility" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem_1OfIModelDashboardViewItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem" Abstract="true" /><EntityType Name="ViewDashboardOrganizationItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem_1OfIModelDashboardViewItem"><Property Name="ObjectType" Type="System.Type" /><Proper
 2025-08-26 16:50:23 - Risposta non JSON valida: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="DevExpress.ExpressApp.SystemModule" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="DashboardViewItemDescriptor"><Key><PropertyRef Name="ViewId" /></Key><Property Name="ViewId" Type="Edm.String" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem" BaseType="DevExpress.ExpressApp.NonPersistentLiteObject" Abstract="true"><Property Name="Visibility" Type="DevExpress.ExpressApp.Editors.ViewItemVisibility" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem_1OfIModelDashboardViewItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem" Abstract="true" /><EntityType Name="ViewDashboardOrganizationItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem_1OfIModelDashboardViewItem"><Property Name="ObjectType" Type="System.Type" /><Proper
 2025-09-08 08:39:17 - Risposta non JSON valida: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="DevExpress.ExpressApp.SystemModule" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="DashboardViewItemDescriptor"><Key><PropertyRef Name="ViewId" /></Key><Property Name="ViewId" Type="Edm.String" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem" BaseType="DevExpress.ExpressApp.NonPersistentLiteObject" Abstract="true"><Property Name="Visibility" Type="DevExpress.ExpressApp.Editors.ViewItemVisibility" Nullable="false" /></EntityType><EntityType Name="DashboardOrganizationItem_1OfIModelDashboardViewItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem" Abstract="true" /><EntityType Name="ViewDashboardOrganizationItem" BaseType="DevExpress.ExpressApp.SystemModule.DashboardOrganizationItem_1OfIModelDashboardViewItem"><Property Name="ObjectType" Type="System.Type" /><Proper
-2025-09-16 13:37:03 - Autenticazione fallita: HTTP 400, Errore cURL: , Risposta: {"title":"Bad Request","status":400,"detail":"Cannot persist the object. It was modified or deleted (purged) by another application.","instance":"POST /api/authentication/authenticate","errorCode":"96bfc1252b"}
-2025-09-16 13:37:51 - Autenticazione fallita: HTTP 400, Errore cURL: , Risposta: {"title":"Bad Request","status":400,"detail":"Cannot persist the object. It was modified or deleted (purged) by another application.","instance":"POST /api/authentication/authenticate","errorCode":"96bfc1252b"}
-2025-09-16 13:44:24 - Autenticazione fallita: HTTP 400, Errore cURL: , Risposta: {"title":"Bad Request","status":400,"detail":"Cannot persist the object. It was modified or deleted (purged) by another application.","instance":"POST /api/authentication/authenticate","errorCode":"96bfc1252b"}

public/userarea/historical_trf.php

@@ -128,9 +128,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
     <?php include('cssinclude.php'); ?>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     <style>
         input.auto-input,
         select.auto-input {
@@ -950,7 +947,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             <?php include('include/footer.php'); ?>
         </div>
         <?php include('jsinclude.php'); ?>
-
+        <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
         <script src="photos.js"></script>
         <script src="parts.js"></script>

public/userarea/jsinclude.php

@@ -1,7 +1,7 @@
    <!-- Bootstrap JS -->
    <script src="assets/js/bootstrap.bundle.min.js"></script>
    <!--plugins-->
-
+   <script src="assets/js/jquery.min.js"></script>
    <script src="assets/plugins/simplebar/js/simplebar.min.js"></script>
    <script src="assets/plugins/metismenu/js/metisMenu.min.js"></script>
    <script src="assets/plugins/perfect-scrollbar/js/perfect-scrollbar.js"></script>

public/userarea/load_parts.php

@@ -14,9 +14,9 @@ if (!$iddatadb) {
 }
 
 try {
-    $stmt = $pdo->prepare("SELECT id, iddatadb, part_number, part_description, idmatrice FROM identification_parts WHERE iddatadb = :iddatadb ORDER BY part_number ASC");
+    $stmt = $pdo->prepare("SELECT id, iddatadb, part_number, part_description FROM identification_parts WHERE iddatadb = :iddatadb ORDER BY part_number ASC");
     $stmt->execute([':iddatadb' => $iddatadb]);
-    $parts = $stmt->fetchAll(PDO::FETCH_ASSOC);
+    $parts = $stmt->fetchAll();
 
     echo json_encode(['success' => true, 'parts' => $parts]);
 } catch (PDOException $e) {

public/userarea/modal_parts.php

@@ -9,12 +9,10 @@
             <div class="modal-body">
                 <div class="row">
                     <div class="col-md-6">
-                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; min-width: 0;">
+                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
                             <h6 style="margin: 0; white-space: nowrap;">Elenco Parti</h6>
-                            <div style="display: flex; align-items: center; min-width: 0;">
+                            <div style="display: flex; align-items: center;">
-                                <select id="global-matrice" class="ms-2" style="width: 250px !important; min-width: 250px !important;">
+                                <input type="checkbox" id="showMixParts" name="showMixParts" style="margin-right: 5px;">
-                                </select>
-                                <input type="checkbox" id="showMixParts" name="showMixParts" style="margin-right: 5px; margin-left: 10px;">
                                 <label for="showMixParts" style="font-size: 0.9rem; margin-right: 10px;">Mix</label>
                                 <button type="button" class="btn btn-info btn-sm" id="renumberPartsBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Rinumera Parti</button>
                                 <button type="button" class="btn btn-secondary btn-sm ms-2" id="toggleVoiceBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;"><i class="fas fa-microphone"></i> Voce</button>
@@ -172,6 +170,7 @@
     /* Unsaved changes */
     #savePhotoBtn.unsaved {
         background-color: #dc3545 !important;
+        /* Rosso */
         border-color: #dc3545 !important;
         color: white !important;
         animation: pulse 1.2s infinite;
@@ -192,58 +191,37 @@
         }
     }
 
-    /* Stili per Select2 in #partsList e #global-matrice */
+    /* Stile per il selettore personalizzato dei colori */
-    #partsList .select2-container,
+    .color-picker-container {
-    .select2-container--default #global-matrice {
+        position: relative;
-        width: 250px !important;
+        display: inline-block;
-        min-width: 250px !important;
-        margin-left: 10px;
     }
 
-    #partsList .select2-selection--single,
+    .color-picker {
-    .select2-container--default #global-matrice .select2-selection--single {
+        display: none;
-        height: 26px !important;
+        position: absolute;
-        padding: 0.2rem 0.5rem !important;
+        top: 25px;
-        font-size: 0.9rem !important;
+        left: 0;
-        border: 1px solid #ced4da !important;
+        background: #fff;
-        background-color: #fff !important;
+        border: 1px solid #ccc;
+        padding: 5px;
+        z-index: 1002;
+        box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+        flex-wrap: wrap;
+        width: 120px;
     }
 
-    #partsList .select2-selection__rendered,
+    .color-option {
-    .select2-container--default #global-matrice .select2-selection__rendered {
+        width: 24px;
-        line-height: 24px !important;
+        height: 24px;
-        overflow: hidden !important;
+        margin: 3px;
-        text-overflow: ellipsis !important;
+        border: 1px solid #000;
-        white-space: nowrap !important;
+        cursor: pointer;
+        display: inline-block;
     }
 
-    #partsList .select2-selection__arrow,
+    .color-option:hover {
-    .select2-container--default #global-matrice .select2-selection__arrow {
+        border: 2px solid #000;
-        height: 26px !important;
+        margin: 2px;
-    }
-
-    #partsList .save-status,
-    #partsList .save-loading {
-        margin-left: 5px;
-    }
-
-    .select2-container--open .select2-dropdown {
-        z-index: 1051 !important;
-        border: 1px solid #aaa !important;
-        border-radius: 4px !important;
-        background: white !important;
-        overflow-y: auto !important;
-        max-height: 200px !important;
-    }
-
-    .select2-container--default .select2-search--dropdown .select2-search__field {
-        width: 100% !important;
-        padding: 0.2rem !important;
-    }
-
-    .select2-container--default .part-matrice,
-    .select2-container--default #global-matrice {
-        width: 250px !important;
-        min-width: 250px !important;
     }
 </style>

public/userarea/parts.js

@@ -16,15 +16,10 @@ $(document).ready(function () {
     let photoAnnotations = {};
     // colors keyed by part number
     let partColors = {};
-    // matrice IDs keyed by part number
-    let partMatrice = {};
 
     // selection
     let selectedPartNumber = null;
 
-    // lista delle matrici precaricata
-    let matrici = [];
-
     // ===================
     // VOICE RECOGNITION SETUP
     // ===================
@@ -32,13 +27,13 @@ $(document).ready(function () {
         window.SpeechRecognition || window.webkitSpeechRecognition;
     let recognition = null;
     let isVoiceActive = false;
-    const magicWord = "salva"; // Parola magica scelta
+    const magicWord = "salva"; // Parola magica scelta: "prossima" (fa andare alla riga successiva)
 
     if (SpeechRecognition) {
         recognition = new SpeechRecognition();
-        recognition.lang = "it-IT";
+        recognition.lang = "it-IT"; // Lingua italiana
-        recognition.continuous = true;
+        recognition.continuous = true; // Ascolto continuo
-        recognition.interimResults = false;
+        recognition.interimResults = false; // Solo risultati finali per semplicità
 
         recognition.onresult = function (event) {
             const transcript = event.results[
@@ -48,10 +43,11 @@ $(document).ready(function () {
                 .toLowerCase();
             console.log("Transcript vocale:", transcript);
 
-            const $currentRow = $("#partsTableBody tr:last");
+            const $currentRow = $("#partsTableBody tr:last"); // Ultima riga corrente
             const $descriptionInput = $currentRow.find(".part-description");
 
             if (transcript.includes(magicWord)) {
+                // Rimuovi la parola magica e aggiungi il resto alla descrizione corrente
                 const cleanedTranscript = transcript
                     .replace(magicWord, "")
                     .trim();
@@ -63,8 +59,9 @@ $(document).ready(function () {
                             cleanedTranscript
                         ).trim(),
                     );
-                    $descriptionInput.trigger("blur");
+                    $descriptionInput.trigger("blur"); // Salva se necessario
                 }
+                // Aggiungi nuova riga (simile a click su +)
                 const maxPartNumber = Math.max(
                     ...$("#partsTableBody tr")
                         .map(function () {
@@ -76,19 +73,22 @@ $(document).ready(function () {
                         .get(),
                 );
                 addNewRow(maxPartNumber + 1);
+                // Focus sulla nuova descrizione
                 const $newRow = $("#partsTableBody tr:last");
                 $newRow.find(".part-description").focus();
             } else {
+                // Aggiungi il transcript alla descrizione corrente
                 $descriptionInput.val(
                     ($descriptionInput.val() + " " + transcript).trim(),
                 );
-                $descriptionInput.trigger("blur");
+                $descriptionInput.trigger("blur"); // Salva se necessario
             }
         };
 
         recognition.onerror = function (event) {
             console.error("Errore riconoscimento vocale:", event.error);
             if (event.error === "no-speech" || event.error === "aborted") {
+                // Riavvia se necessario
                 if (isVoiceActive) recognition.start();
             } else {
                 alert("Errore nel riconoscimento vocale: " + event.error);
@@ -97,15 +97,18 @@ $(document).ready(function () {
         };
 
         recognition.onend = function () {
-            if (isVoiceActive) recognition.start();
+            if (isVoiceActive) {
+                recognition.start(); // Riavvia per ascolto continuo
+            }
         };
     } else {
         console.warn("Riconoscimento vocale non supportato dal browser.");
-        $("#toggleVoiceBtn").hide();
+        $("#toggleVoiceBtn").hide(); // Nascondi pulsante se non supportato
     }
 
     function toggleVoiceRecognition() {
         if (!recognition) return;
+
         isVoiceActive = !isVoiceActive;
         const $btn = $("#toggleVoiceBtn");
         if (isVoiceActive) {
@@ -113,6 +116,7 @@ $(document).ready(function () {
                 '<i class="fas fa-microphone-slash"></i> Stop Voce',
             );
             recognition.start();
+            // Focus iniziale sull'ultima descrizione
             const $currentRow = $("#partsTableBody tr:last");
             $currentRow.find(".part-description").focus();
         } else {
@@ -150,39 +154,8 @@ $(document).ready(function () {
             $("#trfHeader").text(`${iddatadb} - ${importRef} - ${description}`);
             $("#partsModal").data("iddatadb", iddatadb);
 
-            // Precarica le matrici una volta sola
+            loadPhoto(iddatadb);
-            if (matrici.length === 0) {
+            loadExistingParts(iddatadb);
-                $.ajax({
-                    url: "get_matrice.php",
-                    method: "GET",
-                    dataType: "json",
-                    success: function (data) {
-                        matrici = data.value || [];
-                        console.log(
-                            "Matrici precaricate (una volta sola):",
-                            matrici,
-                        );
-                        initializeGlobalSelect2();
-                        loadPhoto(iddatadb);
-                        loadExistingParts(iddatadb);
-                    },
-                    error: function (xhr, status, error) {
-                        console.error(
-                            "Errore nel precaricamento delle matrici:",
-                            error,
-                        );
-                        alert("Errore nel caricamento delle matrici: " + error);
-                        matrici = [];
-                        loadPhoto(iddatadb);
-                        loadExistingParts(iddatadb);
-                    },
-                });
-            } else {
-                console.log("Matrici già precaricate, riutilizzo.");
-                initializeGlobalSelect2();
-                loadPhoto(iddatadb);
-                loadExistingParts(iddatadb);
-            }
 
             if (partsModal) {
                 const modal = new bootstrap.Modal(partsModal);
@@ -277,7 +250,7 @@ $(document).ready(function () {
 
     function loadSinglePhoto(photoPath) {
         const img = $("#samplePhoto");
-        img.off("load");
+        img.off("load"); // avoid stacking multiple handlers
         img.attr("src", photoPath);
 
         img.on("load", function () {
@@ -308,6 +281,7 @@ $(document).ready(function () {
 
             canvas.width = naturalWidth;
             canvas.height = naturalHeight;
+
             canvas.style.width = `${displayWidth}px`;
             canvas.style.height = `${displayHeight}px`;
 
@@ -347,6 +321,7 @@ $(document).ready(function () {
             </tr>`;
         $("#partsTableBody").append(newRow);
         updateRowButtons();
+        // Initialize color for the new part
         const partNumber = nextPartNumber || 1;
         partColors[partNumber] = defaultColor;
     }
@@ -402,10 +377,9 @@ $(document).ready(function () {
                     if (response.success) {
                         $row.remove();
                         delete partColors[partNumber];
-                        delete partMatrice[partNumber];
                         updateRowButtons();
                         updatePartsList();
-                        clearCanvasMarkers(false);
+                        clearCanvasMarkers(false); // Preserve descriptions
                     } else {
                         alert("Errore nell'eliminazione: " + response.message);
                     }
@@ -424,7 +398,6 @@ $(document).ready(function () {
         } else {
             $row.remove();
             delete partColors[partNumber];
-            delete partMatrice[partNumber];
             updateRowButtons();
             updatePartsList();
         }
@@ -439,6 +412,7 @@ $(document).ready(function () {
         const $saveLoading = $row.find(".save-loading");
         const iddatadb = $("#partsModal").data("iddatadb");
         const isMix = partDescription.startsWith("Mix") ? "Y" : "N";
+
         const partId = $row.data("part-id") || null;
 
         if (partDescription && iddatadb) {
@@ -483,168 +457,6 @@ $(document).ready(function () {
         }
     });
 
-    $(document).on("change", ".part-color", function () {
-        const partNumber = $(this).closest("li").data("part-number");
-        const partColor = $(this).val();
-        partColors[partNumber] = partColor;
-        updateMarkers();
-        markUnsaved();
-    });
-
-    // Funzione per inizializzare Select2 sulle tendine delle matrici
-    function initializeSelect2($select, partNumber, partId, idmatrice) {
-        if (typeof $.fn.select2 === "undefined") {
-            console.error("Select2 non disponibile per parte " + partNumber);
-            $select.replaceWith(
-                '<input type="text" class="form-control form-control-sm" placeholder="Select2 non disponibile" disabled>',
-            );
-            return;
-        }
-
-        // Popola con i dati precaricati
-        const options = matrici.map(function (matrice) {
-            return {
-                id: matrice.IdMatrice,
-                text: matrice.NomeMatriceTraduzione,
-            };
-        });
-
-        $select.select2({
-            placeholder: "Seleziona matrice",
-            allowClear: true,
-            data: options, // Carica la lista completa all'apertura
-            dropdownParent: $("#partsModal"),
-            matcher: function (params, data) {
-                // Filtraggio lato client sulla descrizione
-                if (!params.term || params.term.length < 3) {
-                    return data; // Mostra tutto se meno di 3 caratteri
-                }
-                const term = params.term.toUpperCase();
-                if (data.text.toUpperCase().indexOf(term) >= 0) {
-                    return data;
-                }
-                return null;
-            },
-        });
-
-        // Carica la matrice esistente, se presente
-        if (partId && partId !== "new" && idmatrice) {
-            const matrice = matrici.find((m) => m.IdMatrice == idmatrice);
-            if (matrice) {
-                console.log(
-                    "Preselezione matrice per partNumber " + partNumber + ":",
-                    matrice,
-                );
-                const option = new Option(
-                    matrice.NomeMatriceTraduzione,
-                    matrice.IdMatrice,
-                    true,
-                    true,
-                );
-                $select.append(option).trigger("change");
-                partMatrice[partNumber] = matrice.IdMatrice;
-            } else {
-                console.warn(
-                    "Matrice con ID " +
-                        idmatrice +
-                        " non trovata per partNumber " +
-                        partNumber,
-                );
-            }
-        }
-
-        // Gestione del cambio della matrice
-        $select.on("change", function () {
-            const idmatrice = $(this).val();
-            const $listItem = $(this).closest("li");
-            const $saveStatus = $listItem.find(".save-status");
-            const $saveLoading = $listItem.find(".save-loading");
-
-            console.log(
-                "Cambio matrice per partNumber:",
-                partNumber,
-                "nuovo idmatrice:",
-                idmatrice,
-            );
-            partMatrice[partNumber] = idmatrice || null;
-
-            if (partId && partId !== "new") {
-                $saveLoading.show();
-                $saveStatus.hide();
-
-                $.ajax({
-                    url: "save_matrice.php",
-                    method: "POST",
-                    data: JSON.stringify({
-                        iddatadb: $("#partsModal").data("iddatadb"),
-                        parts: [
-                            {
-                                id: partId,
-                                idmatrice: idmatrice || null,
-                            },
-                        ],
-                    }),
-                    contentType: "application/json",
-                    success: function (response) {
-                        if (response.success) {
-                            $saveLoading.hide();
-                            $saveStatus.show();
-                            setTimeout(() => $saveStatus.hide(), 2000);
-                        } else {
-                            alert(
-                                "Errore nel salvataggio della matrice: " +
-                                    response.message,
-                            );
-                            $saveLoading.hide();
-                        }
-                    },
-                    error: function (xhr, status, error) {
-                        alert("Errore nel salvataggio della matrice: " + error);
-                        $saveLoading.hide();
-                    },
-                });
-            }
-        });
-    }
-
-    // Funzione per inizializzare Select2 sul dropdown globale
-    function initializeGlobalSelect2() {
-        const $select = $("#global-matrice");
-        if (typeof $.fn.select2 === "undefined") {
-            console.error("Select2 non disponibile per il dropdown globale");
-            $select.replaceWith(
-                '<input type="text" class="form-control form-control-sm" placeholder="Select2 non disponibile" disabled>',
-            );
-            return;
-        }
-
-        // Popola con i dati precaricati
-        const options = matrici.map(function (matrice) {
-            return {
-                id: matrice.IdMatrice,
-                text: matrice.NomeMatriceTraduzione,
-            };
-        });
-
-        $select.select2({
-            placeholder: "Seleziona matrice globale",
-            allowClear: true,
-            data: options, // Carica la lista completa all'apertura
-            dropdownParent: $("#partsModal"),
-            matcher: function (params, data) {
-                // Filtraggio lato client sulla descrizione
-                if (!params.term || params.term.length < 3) {
-                    return data; // Mostra tutto se meno di 3 caratteri
-                }
-                const term = params.term.toUpperCase();
-                if (data.text.toUpperCase().indexOf(term) >= 0) {
-                    return data;
-                }
-                return null;
-            },
-        });
-    }
-
     function loadExistingParts(iddatadb) {
         $.ajax({
             url: "load_parts.php",
@@ -673,9 +485,6 @@ $(document).ready(function () {
                                 </tr>`;
                             $("#partsTableBody").append(newRow);
                             partColors[part.part_number] = defaultColor;
-                            if (part.idmatrice) {
-                                partMatrice[part.part_number] = part.idmatrice;
-                            }
                         });
                     } else {
                         addNewRow(1);
@@ -700,10 +509,22 @@ $(document).ready(function () {
     function updatePartsList() {
         const showMixParts = $("#showMixParts").is(":checked");
         $("#partsList").empty();
+
+        // Definizione di 8 colori predefiniti
+        const predefinedColors = [
+            "#ff0000", // Rosso
+            "#0000ff", // Blu
+            "#00ff00", // Verde
+            "#01832cff", // Giallo
+            "#ff00ff", // Magenta
+            "#00ffff", // Ciano
+            "#800080", // Viola
+            "#ffa500", // Arancione
+        ];
+
         $("#partsTableBody tr").each(function () {
             const partNumber = $(this).find(".part-number").val();
             const partDescription = $(this).find(".part-description").val();
-            const partId = $(this).data("part-id");
             const partColor =
                 partColors[partNumber] ||
                 (partDescription.startsWith("Mix") ? "#0000ff" : "#ff0000");
@@ -712,30 +533,56 @@ $(document).ready(function () {
                 partDescription &&
                 (showMixParts || !partDescription.startsWith("Mix"))
             ) {
+                const colorOptions = predefinedColors
+                    .map(
+                        (color) =>
+                            `<div class="color-option" style="background-color: ${color};" data-color="${color}"></div>`,
+                    )
+                    .join("");
+
                 const listItem = `
-            <li class="list-group-item" data-part-number="${partNumber}" data-part-id="${partId}">
+                <li class="list-group-item" data-part-number="${partNumber}">
-                ${partNumber} - ${partDescription}
+                    ${partNumber} - ${partDescription}
-                <div style="display: flex; align-items: center;">
+                    <div style="display: flex; align-items: center;">
-                    <button type="button" class="btn btn-primary btn-sm propagate-matrice-btn" style="padding: 0.1rem 0.3rem; font-size: 0.8rem; margin-right: 3px;"><i class="fas fa-arrow-right fa-xs"></i></button>
+                        <button type="button" class="btn btn-success btn-sm add-to-mix-btn" style="padding: 0.1rem 0.3rem; font-size: 0.8rem;"><i class="fas fa-plus fa-xs"></i></button>
-                    <select class="part-matrice" style="width: 250px !important; margin-right: 10px;"></select>
+                        <div class="color-picker-container">
-                    <button type="button" class="btn btn-success btn-sm add-to-mix-btn" style="padding: 0.1rem 0.3rem; font-size: 0.8rem;"><i class="fas fa-plus fa-xs"></i></button>
+                            <div class="color-option selected-color" style="background-color: ${partColor}; margin-left: 5px;"></div>
-                    <input type="color" class="part-color" value="${partColor}" style="margin-left: 5px;">
+                            <div class="color-picker">${colorOptions}</div>
-                    <span class="save-status text-success" style="display: none; margin-left: 5px;"><i class="fas fa-check fa-xs"></i></span>
+                        </div>
-                    <span class="save-loading text-warning" style="display: none; margin-left: 5px;"><i class="fas fa-spinner fa-spin fa-xs"></i></span>
+                    </div>
-                </div>
+                </li>`;
-            </li>`;
                 $("#partsList").append(listItem);
-                const $select = $("#partsList").find(
-                    `li[data-part-number="${partNumber}"] .part-matrice`,
-                );
-                initializeSelect2(
-                    $select,
-                    partNumber,
-                    partId,
-                    partMatrice[partNumber],
-                );
             }
         });
+
+        // Gestione del selettore colori personalizzato
+        $(".selected-color").on("click", function (e) {
+            e.stopPropagation();
+            const $picker = $(this).siblings(".color-picker");
+            $(".color-picker").not($picker).hide(); // Chiude altri selettori aperti
+            $picker.toggle();
+        });
+
+        $(".color-option").on("click", function (e) {
+            e.stopPropagation();
+            const $this = $(this);
+            const color = $this.data("color");
+            const $listItem = $this.closest("li");
+            const partNumber = $listItem.data("part-number");
+            partColors[partNumber] = color;
+            $listItem.find(".selected-color").css("background-color", color);
+            $this.closest(".color-picker").hide(); // Chiude il selettore dopo la scelta
+            updateMarkers();
+            markUnsaved();
+        });
+
+        // Chiude il selettore se si clicca fuori
+        $(document).on("click", function (e) {
+            if (!$(e.target).closest(".color-picker-container").length) {
+                $(".color-picker").hide();
+            }
+        });
+
         updateMarkers();
     }
 
@@ -743,8 +590,8 @@ $(document).ready(function () {
         const $rows = $("#partsTableBody tr");
         const iddatadb = $("#partsModal").data("iddatadb");
         let newPartColors = {};
-        let newPartMatrice = {};
 
+        // Raccogli tutte le righe con i loro dati attuali
         let partsData = $rows
             .map(function (index) {
                 const $row = $(this);
@@ -755,21 +602,23 @@ $(document).ready(function () {
             })
             .get();
 
+        // Rinumera in modo sequenziale
         partsData.forEach((part, index) => {
             const newNumber = index + 1;
             newPartColors[newNumber] = partColors[part.partNumber] || "#ff0000";
-            newPartMatrice[newNumber] = partMatrice[part.partNumber] || null;
             part.partNumber = newNumber;
         });
 
+        // Aggiorna i valori nella tabella
         $rows.each(function (index) {
             const $row = $(this);
             $row.find(".part-number").val(index + 1);
         });
 
+        // Aggiorna partColors
         partColors = newPartColors;
-        partMatrice = newPartMatrice;
 
+        // Aggiorna i marker nelle annotazioni
         const currentPhoto = $("#samplePhoto").attr("src");
         if (photoAnnotations[currentPhoto]) {
             photoAnnotations[currentPhoto].markers.forEach((marker) => {
@@ -784,12 +633,12 @@ $(document).ready(function () {
             });
         }
 
+        // Salva le modifiche nel database
         const partsToSave = partsData.map((part) => ({
             id: part.partId || null,
             part_number: part.partNumber,
             part_description: part.partDescription,
             mix: part.partDescription.startsWith("Mix") ? "Y" : "N",
-            idmatrice: partMatrice[part.partNumber] || null,
         }));
 
         console.log(
@@ -800,7 +649,10 @@ $(document).ready(function () {
         $.ajax({
             url: "renumber_parts.php",
             method: "POST",
-            data: JSON.stringify({ iddatadb: iddatadb, parts: partsToSave }),
+            data: JSON.stringify({
+                iddatadb: iddatadb,
+                parts: partsToSave,
+            }),
             contentType: "application/json",
             success: function (response) {
                 console.log("Risposta da renumber_parts.php:", response);
@@ -878,23 +730,10 @@ $(document).ready(function () {
         updatePartsList();
     });
 
-    $(document).on("click", ".propagate-matrice-btn", function () {
-        const $listItem = $(this).closest("li");
-        const globalVal = $("#global-matrice").val();
-        if (globalVal) {
-            $listItem.find(".part-matrice").val(globalVal).trigger("change");
-        } else {
-            alert("Seleziona una matrice globale prima di propagare.");
-        }
-    });
-
     $("#partsList").on("click", "li", function (e) {
         if (
             $(e.target).hasClass("add-to-mix-btn") ||
-            $(e.target).hasClass("part-color") ||
+            $(e.target).hasClass("part-color")
-            $(e.target).hasClass("part-matrice") ||
-            $(e.target).hasClass("propagate-matrice-btn") ||
-            $(e.target).closest(".select2-container").length
         )
             return;
         selectedPartNumber = $(this).data("part-number");
@@ -908,7 +747,6 @@ $(document).ready(function () {
     $("#renumberPartsBtn").on("click", function () {
         renumberParts();
     });
-
     // ===================
     // MARKERS & DESCRIPTIONS
     // ===================
@@ -922,7 +760,7 @@ $(document).ready(function () {
         const clickX = e.clientX - rect.left;
         const clickY = e.clientY - rect.top;
 
-        const x = clickX / photoData.scale;
+        const x = clickX / photoData.scale; // convert to NATURAL coords
         const y = clickY / photoData.scale;
 
         const currentPhoto = $("#samplePhoto").attr("src");
@@ -1163,7 +1001,7 @@ $(document).ready(function () {
     });
 
     $("#removeAnnotationsBtn").on("click", function () {
-        clearCanvasMarkers(true);
+        clearCanvasMarkers(true); // Remove only descriptions
     });
 
     $("#undoMarkerBtn").on("click", function () {
@@ -1172,6 +1010,7 @@ $(document).ready(function () {
 
     let unsavedChanges = false;
 
+    // --- helper functions ---
     function markUnsaved() {
         if (!unsavedChanges) {
             unsavedChanges = true;
@@ -1184,10 +1023,12 @@ $(document).ready(function () {
         $("#savePhotoBtn").removeClass("unsaved").text("Salva Foto con Nome");
     }
 
+    // --- event listeners ---
     $(document).on("input change", "#partsTableBody input", markUnsaved);
     $(document).on("click", ".add-row, .add-mix-row, .remove-row", markUnsaved);
     $(document).on("markerChanged descriptionChanged", markUnsaved);
 
+    // --- modal close protection ---
     $("#partsModal").on("hide.bs.modal", function (e) {
         if (unsavedChanges) {
             if (!confirm("Hai modifiche non salvate. Vuoi davvero uscire?")) {
@@ -1196,6 +1037,7 @@ $(document).ready(function () {
         }
     });
 
+    // --- SAVE BUTTON ---
     $("#savePhotoBtn").on("click", function () {
         const canvas = document.getElementById("photoCanvas");
         const ctx = canvas.getContext("2d");
@@ -1283,10 +1125,11 @@ $(document).ready(function () {
 
             ctx.beginPath();
             ctx.arc(x, y, radius, 0, 2 * Math.PI);
-            ctx.fillStyle = markerColor;
+            ctx.fillStyle = markerColor; // Use the stored color
             ctx.fill();
+
             ctx.lineWidth = 3;
-            ctx.strokeStyle = markerColor;
+            ctx.strokeStyle = markerColor; // Use the same color for the border
             ctx.stroke();
 
             ctx.fillStyle = "#ffffff";
@@ -1323,7 +1166,7 @@ $(document).ready(function () {
                         );
                         $("#samplePhoto").attr("src", response.file_path);
                         loadPhoto(iddatadb);
-                        clearCanvasMarkers(false);
+                        clearCanvasMarkers(false); // Preserve descriptions
                         clearUnsaved();
                     } else {
                         alert("Errore: " + response.message);

public/userarea/photos_popup.php

@@ -192,7 +192,7 @@ $result->saveToFile($qrCodeFile);
             <button id="addToCanvasBtn">Aggiungi Selezionate al Canvas</button>
 
             <!-- Canvas per editing -->
-            <canvas id="collageCanvas" width="800" height="600" style="border: 1px solid #ccc; margin-top: 20px;"></canvas>
+            <canvas id="collageCanvas" width="960" height="720" style="border: 1px solid #ccc; margin-top: 20px;"></canvas>
 
             <!-- Pannello dei livelli -->
             <div id="layersPanel" style="width: 120px; max-height: 600px; overflow-y: auto; background: #f8f9fa; padding: 10px; position: absolute; right: 0; top: 60px;">

public/userarea/save_matrice.php

@@ -1,44 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$data = json_decode(file_get_contents('php://input'), true);
-
-$iddatadb = $data['iddatadb'] ?? null;
-$parts = $data['parts'] ?? [];
-
-if (!$iddatadb || empty($parts)) {
-    echo json_encode(['success' => false, 'message' => 'Dati mancanti']);
-    exit;
-}
-
-$part = $parts[0];
-$partId = $part['id'] ?? null;
-$idmatrice = $part['idmatrice'] ?? null;
-
-if (!$partId) {
-    echo json_encode(['success' => false, 'message' => 'ID della parte mancante']);
-    exit;
-}
-
-try {
-    $stmt = $pdo->prepare("UPDATE identification_parts 
-                           SET idmatrice = :idmatrice, updated_at = NOW() 
-                           WHERE id = :id AND iddatadb = :iddatadb");
-    $stmt->execute([
-        ':idmatrice' => $idmatrice,
-        ':id' => $partId,
-        ':iddatadb' => $iddatadb
-    ]);
-
-    if ($stmt->rowCount() > 0) {
-        echo json_encode(['success' => true, 'message' => 'Matrice salvata con successo']);
-    } else {
-        echo json_encode(['success' => false, 'message' => 'Nessuna riga aggiornata. Verifica l\'ID della parte.']);
-    }
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio della matrice: ' . $e->getMessage()]);
-}