change marker dimension

- partsTable: reduce excessive height to prevent oversized rendering
- annotationsModal: fix "Torna alle Parti" button behavior to return to parts view

.env.example

@@ -1,16 +1,16 @@
 APP_ENV=production
-APP_DEBUG=false
+APP_DEBUG=true
-APP_KEY=
+APP_KEY=base64:C+sutHm6xP5sE4QXhoZFhYjArlVN11s2mDU1F8beUkM=
 APP_URL=http://vanguard.test
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=localhost
+DB_HOST="localhost"
-DB_DATABASE=vanguard
+DB_DATABASE="trfcertest"
-DB_USERNAME=homestead
+DB_USERNAME="solocla"
-DB_PASSWORD=secret
+DB_PASSWORD="xxxxxxx"
-DB_PREFIX=vg_
+DB_PREFIX="auth_"
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -39,3 +39,21 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+# Credenziali API VisualLims
+SIMULATE_EXPORT_LIMS=true
+API_BASE_URL=https://93.43.5.102/limsapi
+API_USERNAME=xxxx
+API_PASSWORD=XXXX
+
+BASE_URL=http://localhost:8000/userarea/
+
+# Credenziali ENTRAID
+
+AZURE_CLIENT_ID=your-client-id
+AZURE_CLIENT_SECRET=your-client-secret
+AZURE_REDIRECT_URI=https://your-app.com/auth/azure/callback
+AZURE_TENANT_ID=
+
+MICROSOFT_CLIENT_ID=your_client_id_here
+MICROSOFT_CLIENT_SECRET=your_client_secret_here  
+MICROSOFT_REDIRECT_URI="${APP_URL}/auth/microsoft/callback"

public/userarea/apply_routine.php

@@ -0,0 +1,50 @@
+<?php
+ob_start();
+session_start();
+require_once '../../vendor/autoload.php';
+
+$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '', 'excel_data' => []];
+
+try {
+    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+        $input = json_decode(file_get_contents('php://input'), true);
+        $template_id = isset($input['template_id']) ? intval($input['template_id']) : 0;
+        $filename = $input['routine_data']['filename'] ?? '';
+        $headerrow = $input['routine_data']['headerrow'] ?? 1;
+        $excelData = $input['excel_data'] ?? [];
+        $routineData = $input['routine_data'] ?? [];
+
+        if (!$filename || empty($excelData)) {
+            throw new Exception("Dati della routine mancanti.");
+        }
+
+        $routineFile = __DIR__ . '/routines/' . $filename;
+        if (file_exists($routineFile)) {
+            include_once $routineFile;
+            $routineData['xls_headers'] = $_SESSION['headers'] ?? [];
+            applyRoutine($excelData, $routineData); // Modifica $excelData in place
+            error_log("Routine {$routineData['name']} applicata (file: {$filename}) per template {$template_id}, header row: {$headerrow}");
+        } else {
+            throw new Exception("File della routine non trovato: $routineFile");
+        }
+
+        // Aggiorna la sessione con i dati modificati
+        $_SESSION['excel_data'] = $excelData;
+
+        $response['excel_data'] = $excelData;
+        $response['rows'] = array_column($excelData, 'data');
+        $response['columns'] = $_SESSION['headers'];
+        $response['template_id'] = $template_id;
+        $response['filename'] = $input['filename'] ?? '';
+    } else {
+        $response['error'] = "Richiesta non valida.";
+    }
+} catch (Exception $e) {
+    $response['error'] = "Errore durante l'applicazione della routine: " . $e->getMessage();
+    error_log("Exception in apply_routine.php: " . $e->getMessage());
+}
+
+ob_end_clean();
+header('Content-Type: application/json');
+echo json_encode($response);
+exit;

public/userarea/checkpatch.php

@@ -0,0 +1,131 @@
+<?php
+require_once "class/VisualLimsApiClient.class.php";
+include('include/headscript.php');
+
+$dbHandler = DBHandlerSelect::getInstance();
+$pdo = $dbHandler->getConnection();
+
+header("Content-Type: application/json");
+
+// 🔹 Configura directory log (creala se non esiste)
+$logDir = __DIR__ . '/logs/api/';
+if (!is_dir($logDir)) {
+    mkdir($logDir, 0755, true);
+}
+
+// 🔹 Base URL API
+$apiBaseUrl = 'https://93.43.5.102/limsapi/api/odata/';
+
+// 🔹 Hardcoded values
+$iddatadb = 846;
+$commessaId = 533357;
+
+try {
+    // 🔹 STEP 4: Fetch Field Values with Labels (usa dati reali per iddatadb=845)
+    $stmt = $pdo->prepare("
+        SELECT
+          idd.field_value,
+          m.field_label,
+          m.schema_id,
+          m.field_id
+        FROM
+          import_data_details as idd
+          JOIN template_mapping m ON idd.mapping_id = m.id
+        WHERE idd.id = :iddatadb
+    ");
+    $stmt->execute(['iddatadb' => $iddatadb]);
+    $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    $fieldValues = [];
+    $valueMap = [];  // Mappa per field_id -> valore
+    foreach ($rows as $row) {
+        $fieldValues[] = [
+            "IdCommesseCustomFields" => (int) $row['field_id'],
+            "Valore" => $row['field_value'],
+            "FieldLabel" => $row['field_label']
+        ];
+        $valueMap[(int) $row['field_id']] = $row['field_value'];  // Mappa per ID definizione
+    }
+
+    // Logga i fieldValues in error_log
+    $logFieldValues = "FieldValues dal DB (iddatadb={$iddatadb}):\n" . json_encode($fieldValues, JSON_PRETTY_PRINT);
+    error_log($logFieldValues);
+
+    // 🔹 Initialize API client
+    $api = VisualLimsApiClient::getInstance();
+
+    // 🔹 STEP A: GET iniziale per CommesseCustomFields con espansione CustomField
+    $expand = "CommesseCustomFields(\$expand=CustomField)";  // Espansione come da istruzioni fornitore
+    $commessaWithFields = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
+
+    // 🔹 STEP B: Prepara payload PATCH (tutti i campi, sovrascrivi se match su CustomField.IdCustomField == field_id)
+    $commessaCustomFields = [];
+    foreach ($commessaWithFields["CommesseCustomFields"] as $customField) {
+        $definitionId = (int) ($customField["CustomField"]["IdCustomField"] ?? 0);  // Usa IdCustomField dal CustomField
+        $currentValue = $customField["Valore"] ?? '';
+        $newValue = isset($valueMap[$definitionId]) ? $valueMap[$definitionId] : $currentValue;
+
+        $commessaCustomFields[] = [
+            "IdCommesseCustomFields" => (int) $customField["IdCommesseCustomFields"],
+            "Valore" => $newValue
+        ];
+    }
+
+    // 🔹 Unico file di log per tutto
+    $logFile = $logDir . "commessa_{$commessaId}_patch_and_get_" . time() . ".txt";
+    $logContent = "FieldValues dal DB (iddatadb={$iddatadb}):\n" . json_encode($fieldValues, JSON_PRETTY_PRINT) . "\n\n";
+
+    // Log curl-like per GET iniziale
+    $logContent .= "GET iniziale:\n" .
+        "curl --location --request GET '{$apiBaseUrl}CommessaWeb({$commessaId})?\$expand=CommesseCustomFields(\$expand=CustomField)' \\\n" .
+        "--header 'Authorization: Bearer ••••••'\n\n" .
+        "RESPONSE:\n" . json_encode($commessaWithFields, JSON_PRETTY_PRINT) . "\n\n---\n";
+
+    if (!empty($commessaCustomFields)) {
+        $updatePayload = ["CommesseCustomFields" => $commessaCustomFields];
+
+        // Log curl-like per PATCH
+        $jsonPayload = json_encode($updatePayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        $logContent .= "PATCH:\n" .
+            "curl --location --request PATCH '{$apiBaseUrl}CommessaWeb({$commessaId})' \\\n" .
+            "--header 'Content-Type: application/json' \\\n" .
+            "--header 'Authorization: Bearer ••••••' \\\n" .
+            "--data '{$jsonPayload}'\n\n";
+
+        $patchResponse = $api->patch("CommessaWeb({$commessaId})", $updatePayload);
+
+        $logContent .= "PATCH RESPONSE:\n" . json_encode($patchResponse, JSON_PRETTY_PRINT) . "\n\n---\n";
+    } else {
+        $logContent .= "PATCH: Nessun campo custom da aggiornare\n\n---\n";
+    }
+
+    // 🔹 STEP C: GET di controllo post-PATCH
+    $commessaAfterPatch = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
+
+    // Log curl-like per GET di controllo
+    $logContent .= "GET di controllo:\n" .
+        "curl --location --request GET '{$apiBaseUrl}CommessaWeb({$commessaId})?\$expand=CommesseCustomFields(\$expand=CustomField)' \\\n" .
+        "--header 'Authorization: Bearer ••••••'\n\n" .
+        "RESPONSE:\n" . json_encode($commessaAfterPatch, JSON_PRETTY_PRINT);
+
+    // Salva log unico
+    file_put_contents($logFile, $logContent);
+
+    // 🔹 Output a schermo
+    echo json_encode([
+        "success" => true,
+        "message" => "PATCH eseguito su commessa {$commessaId} con dati da iddatadb {$iddatadb}",
+        "commessaAfterPatch" => $commessaAfterPatch,
+        "totalCustomFieldsUpdated" => count($commessaCustomFields),
+        "fieldValues" => $fieldValues,
+        "logFile" => $logFile
+    ]);
+} catch (Exception $e) {
+    error_log("Patch Error: " . $e->getMessage() . "\nTrace: " . $e->getTraceAsString());
+
+    echo json_encode([
+        "success" => false,
+        "message" => "Patch failed: " . $e->getMessage(),
+        "logFile" => $logFile ?? 'Nessun log generato'
+    ]);
+}

public/userarea/class/VisualLimsApiClient.class.php

@@ -29,7 +29,7 @@ class VisualLimsApiClient
         return self::$instance;
     }
 
-    private function authenticate()
+    private function authenticate($retryCount = 0, $maxRetries = 3)
     {
         $ch = curl_init("{$this->baseUrl}/api/authentication/authenticate");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -45,16 +45,22 @@ class VisualLimsApiClient
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
         curl_setopt($ch, CURLOPT_VERBOSE, true);
-        $log = fopen(__DIR__ . '/curl_auth_debug.log', 'w') ?: fopen('php://stderr', 'w');
+        $log = fopen(__DIR__ . '/curl_auth_debug.log', 'a') ?: fopen('php://stderr', 'w');
         curl_setopt($ch, CURLOPT_STDERR, $log);
 
         $response = curl_exec($ch);
         $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         $curl_error = curl_error($ch);
+        $log_message = date('Y-m-d H:i:s') . " - Auth attempt {$retryCount}: HTTP {$http_code}, Error: {$curl_error}, Response: " . substr($response, 0, 1000) . "\n";
+        fwrite($log, $log_message);
         fclose($log);
         curl_close($ch);
 
         if ($response === false || $http_code != 200) {
+            if ($http_code === 400 && strpos($response, 'Cannot persist the object') !== false && $retryCount < $maxRetries) {
+                usleep(500000); // Ritardo di 500ms
+                return $this->authenticate($retryCount + 1, $maxRetries); // Riprova
+            }
             throw new Exception("Autenticazione fallita: HTTP {$http_code}, Errore cURL: {$curl_error}, Risposta: " . substr($response, 0, 1000));
         }
 
@@ -120,4 +126,75 @@ class VisualLimsApiClient
 
         return $data;
     }
+
+    public function post($endpoint, $payload)
+    {
+        $token = $this->getToken();
+        $url = "{$this->baseUrl}/api/odata/{$endpoint}";
+
+        $ch = curl_init($url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            "Authorization: Bearer {$token}",
+            "Content-Type: application/json",
+            "Accept: application/json"
+        ]);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+
+        $response = curl_exec($ch);
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $curl_error = curl_error($ch);
+        curl_close($ch);
+
+        if ($response === false) {
+            throw new Exception("Errore nella richiesta POST: {$curl_error}");
+        }
+
+        if ($http_code < 200 || $http_code >= 300) {
+            throw new Exception("POST fallito: HTTP {$http_code}, Risposta: " . substr($response, 0, 1000));
+        }
+
+        return json_decode($response, true);
+    }
+
+    public function patch($endpoint, $payload)
+    {
+        $token = $this->getToken();
+        $url = "{$this->baseUrl}/api/odata/{$endpoint}";
+
+        $ch = curl_init($url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PATCH");
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            "Authorization: Bearer {$token}",
+            "Content-Type: application/json",
+            "Accept: application/json"
+        ]);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+
+        $response = curl_exec($ch);
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $curl_error = curl_error($ch);
+        curl_close($ch);
+
+        if ($response === false) {
+            throw new Exception("Errore nella richiesta PATCH: {$curl_error}");
+        }
+
+        if ($http_code < 200 || $http_code >= 300) {
+            throw new Exception("PATCH fallito: HTTP {$http_code}, Risposta: " . substr($response, 0, 1000));
+        }
+
+        return json_decode($response, true);
+    }
+
+    public function getBaseUrl()
+    {
+        return $this->baseUrl;
+    }
 }

public/userarea/cronfiles/get_matrici_cron.php

@@ -0,0 +1,103 @@
+<?php
+require_once dirname(__DIR__, 3) . '/vendor/autoload.php'; // Risale a root/vendor/
+require_once dirname(__FILE__) . '/../class/VisualLimsApiClient.class.php'; // In root/public/userarea/class/
+
+use Dotenv\Dotenv;
+
+// Debug: Log the path where we expect the .env file
+$envPath = dirname(__DIR__, 3);
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Expected .env path: ' . $envPath . PHP_EOL, FILE_APPEND);
+
+// Carica il file .env dalla root del progetto
+try {
+    $dotenv = Dotenv::createImmutable($envPath);
+    $dotenv->load();
+} catch (Exception $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore caricamento .env: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    exit(1);
+}
+
+// Recupera le variabili d'ambiente
+$dbHost = $_ENV['DB_HOST'];
+$dbName = $_ENV['DB_DATABASE'];
+$dbUser = $_ENV['DB_USERNAME'];
+$dbPass = $_ENV['DB_PASSWORD'];
+$dbPrefix = $_ENV['DB_PREFIX'];
+
+// Debug: Log database connection details (excluding password)
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . " - DB Connection: host=$dbHost, dbname=$dbName, user=$dbUser, prefix=$dbPrefix" . PHP_EOL, FILE_APPEND);
+
+// Connessione al database MySQL
+try {
+    $pdo = new PDO("mysql:host=$dbHost;dbname=$dbName;charset=utf8mb4", $dbUser, $dbPass);
+    $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+} catch (PDOException $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore connessione DB: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    exit(1);
+}
+
+try {
+    $api = VisualLimsApiClient::getInstance();
+
+    // Endpoint per recuperare le Matrici
+    $endpoint = 'Matrice';
+
+    // (Opzionale) aggiungi parametri
+    $options = []; // es. ['$top' => 100]
+
+    // Debug: salva URL usato
+    $base_url = 'https://93.43.5.102/limsapi/api/odata/';
+    $query = http_build_query($options);
+    $full_url = $base_url . $endpoint . ($query ? '?' . $query : '');
+    file_put_contents(__DIR__ . '/last_url.txt', $full_url . PHP_EOL, FILE_APPEND);
+
+    // Chiamata API
+    $data = $api->get($endpoint, $options);
+
+    // Debug: Log the API response size
+    file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - API response received, value count: ' . (isset($data['value']) ? count($data['value']) : 0) . PHP_EOL, FILE_APPEND);
+
+    // Salva il JSON in locale (opzionale, per debug)
+    file_put_contents(__DIR__ . '/matrici_response.json', json_encode($data, JSON_PRETTY_PRINT));
+
+    // Svuota la tabella (dump rapido)
+    $pdo->exec("TRUNCATE TABLE {$dbPrefix}matrici");
+
+    // Debug: Log after truncate
+    file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Table truncated: ' . $dbPrefix . 'matrici' . PHP_EOL, FILE_APPEND);
+
+    // Prepara l'insert
+    $stmt = $pdo->prepare("
+           INSERT INTO {$dbPrefix}matrici (
+               IdMatrice, NomeMatriceTraduzione, DescrizioneTraduzione, MacroMatrice, NomeMatrice, Descrizione
+           ) VALUES (
+               :IdMatrice, :NomeMatriceTraduzione, :DescrizioneTraduzione, :MacroMatrice, :NomeMatrice, :Descrizione
+           )
+       ");
+
+    // Inserisci i dati
+    $insertedRows = 0;
+    if (isset($data['value']) && is_array($data['value'])) {
+        foreach ($data['value'] as $item) {
+            $stmt->execute([
+                ':IdMatrice' => $item['IdMatrice'],
+                ':NomeMatriceTraduzione' => $item['NomeMatriceTraduzione'],
+                ':DescrizioneTraduzione' => $item['DescrizioneTraduzione'] ?? null,
+                ':MacroMatrice' => $item['MacroMatrice'] ?? null,
+                ':NomeMatrice' => $item['NomeMatrice'],
+                ':Descrizione' => $item['Descrizione'] ?? null,
+            ]);
+            $insertedRows++;
+            // Debug: Log each inserted row
+            file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Inserted row with IdMatrice: ' . $item['IdMatrice'] . PHP_EOL, FILE_APPEND);
+        }
+    }
+
+    // Log successo
+    file_put_contents(__DIR__ . '/success_log.txt', date('Y-m-d H:i:s') . ' - Aggiornamento completato: ' . $insertedRows . ' record inseriti.' . PHP_EOL, FILE_APPEND);
+} catch (Exception $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    exit(1);
+}
+
+exit(0); // Esci con successo per cron

public/userarea/edit_template_xls.php

@@ -99,6 +99,30 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                     <input type="text" name="target_table" class="form-control" value="<?php echo htmlspecialchars($template['target_table']); ?>" readonly required>
                                 </div>
 
+                                <div class="mb-3">
+                                    <label class="form-label">Button Size</label>
+                                    <select name="button_size" class="form-control">
+                                        <option value="small" <?php echo ($template['button_size'] ?? 'medium') === 'small' ? 'selected' : ''; ?>>Small</option>
+                                        <option value="medium" <?php echo ($template['button_size'] ?? 'medium') === 'medium' ? 'selected' : ''; ?>>Medium</option>
+                                        <option value="large" <?php echo ($template['button_size'] ?? 'medium') === 'large' ? 'selected' : ''; ?>>Large</option>
+                                    </select>
+                                </div>
+
+                                <div class="mb-3">
+                                    <label class="form-label">Button Background Color</label>
+                                    <input type="color" name="button_bg_color" class="form-control" value="<?php echo htmlspecialchars($template['button_bg_color'] ?? '#007bff'); ?>">
+                                </div>
+
+                                <div class="mb-3">
+                                    <label class="form-label">Button Text Color</label>
+                                    <input type="color" name="button_text_color" class="form-control" value="<?php echo htmlspecialchars($template['button_text_color'] ?? '#ffffff'); ?>">
+                                </div>
+
+                                <div class="mb-3">
+                                    <label class="form-label">Button Label</label>
+                                    <input type="text" name="button_label" class="form-control" value="<?php echo htmlspecialchars($template['button_label'] ?? 'Click Me'); ?>">
+                                </div>
+
                                 <div class="mb-3">
                                     <label class="form-label">Select Client *</label>
                                     <select name="client_id" id="clientSelect" class="form-control" required>

public/userarea/export_to_lims.php

@@ -1,243 +1,291 @@
 <?php
-// File: export_to_lims.php
+require_once "class/VisualLimsApiClient.class.php";
-ini_set('display_errors', '0');
+include('include/headscript.php');
-error_reporting(E_ALL);
-ini_set('log_errors', 1);
-ini_set('error_log', __DIR__ . '/logsapi/export_lims_error.log');
 
-// Includi il file con la connessione al database e Dotenv
+$dbHandler = DBHandlerSelect::getInstance();
-require_once __DIR__ . '/include/headscript.php';
+$pdo = $dbHandler->getConnection();
-require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
-require_once __DIR__ . '/class/VisualLimsApiClient.class.php';
 
-use Dotenv\Dotenv;
+header("Content-Type: application/json");
 
-// Carica il file .env
+// 🔹 Configura directory log (creala se non esiste)
-$dotenv = Dotenv::createImmutable(dirname(__DIR__, 3)); // Torna al livello di public
+$logDir = __DIR__ . '/logs/api/';
-$dotenv->load();
-
-// Leggi la variabile SIMULATE_EXPORT_LIMS
-$simulate = filter_var($_ENV['SIMULATE_EXPORT_LIMS'] ?? true, FILTER_VALIDATE_BOOLEAN);
-
-header('Content-Type: application/json');
-
-try {
-    // Verifica che la richiesta sia POST e contenga iddatadb
-    if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['iddatadb'])) {
-        throw new Exception('Richiesta non valida: iddatadb mancante');
-    }
-
-    $iddatadb = (int)$_POST['iddatadb'];
-
-    // Crea la cartella logsapi se non esiste
-    $logDir = __DIR__ . '/logsapi';
 if (!is_dir($logDir)) {
     mkdir($logDir, 0755, true);
 }
 
-    // Ottieni connessione al database
+// 🔹 Base URL API
-    $db = DBHandlerSelect::getInstance();
+$apiBaseUrl = 'https://93.43.5.102/limsapi/api/odata/';
-    $pdo = $db->getConnection();
 
-    // Step 1: Creazione payload per CommessaWeb
+// 🔹 Funzione per validare e convertire date
-    $queryCommessa = "
+function validateDate($value)
-        SELECT 
+{
-            d.iddatadb, 
+    // Prova a validare come data (accetta formati comuni)
-            e.idclient AS Cliente, 
+    $date = DateTime::createFromFormat('Y-m-d', $value) ?: DateTime::createFromFormat('Y-m-d H:i:s', $value);
-            e.idschema AS SchemaCustomField
+    if ($date) {
-        FROM datadb d
+        return $date->format('Y-m-d\TH:i:sP'); // Formato ISO 8601
-        LEFT JOIN excel_templates e ON d.templateid = e.id
+    }
+    return null; // Imposta null se non è una data valida
+}
+
+try {
+    $iddatadb = $_POST['iddatadb'] ?? null;
+    if (!$iddatadb) {
+        throw new Exception("Missing iddatadb");
+    }
+
+    // 🔹 STEP 1+2: Fetch Cliente ID from datadb and Schema ID from excel_templates
+    $stmt = $pdo->prepare("
+    SELECT d.idclient AS clienteId, et.idschema AS schemaId
+    FROM datadb as d
+    INNER JOIN excel_templates as et ON d.templateid = et.id
     WHERE d.iddatadb = :iddatadb
-    ";
+    LIMIT 1
+");
+    $stmt->execute(['iddatadb' => $iddatadb]);
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
 
-    $stmtCommessa = $pdo->prepare($queryCommessa);
+    if (!$result) {
-    $stmtCommessa->execute(['iddatadb' => $iddatadb]);
+        throw new Exception("No Cliente/Schema found for iddatadb {$iddatadb}");
-    $recordCommessa = $stmtCommessa->fetch(PDO::FETCH_ASSOC);
-
-    if (!$recordCommessa) {
-        throw new Exception("Nessun record trovato per iddatadb: {$iddatadb}");
     }
 
-    // Validazione payload
+    $clienteId = (int) $result['clienteId'];
-    if (empty($recordCommessa['Cliente']) || empty($recordCommessa['SchemaCustomField'])) {
+    $schemaId  = (int) $result['schemaId'];
-        throw new Exception("Dati mancanti per CommessaWeb: Cliente o SchemaCustomField non validi");
-    }
 
-    // Payload per creazione CommessaWeb
+    // 🔹 STEP 3: Fetch Parts (including idmatrice)
-    $payloadCommessa = [
+    $stmt = $pdo->prepare("
-        'Cliente' => (int)$recordCommessa['Cliente'],
+        SELECT part_number, part_description, material, color, mix, idmatrice
-        'SchemaCustomField' => (int)$recordCommessa['SchemaCustomField'],
-        'Richiedente' => null,
-        'Descrizione' => 'example'
-    ];
-
-    // Step 2: Creazione payload per campi custom (CommesseCustomFields)
-    $queryCustomFields = "
-        SELECT 
-            tm.field_id AS IdCommesseCustomFields, 
-            idd.field_value AS Valore
-        FROM import_data_details idd
-        JOIN template_mapping tm ON idd.mapping_id = tm.id
-        WHERE idd.id = :iddatadb
-    ";
-
-    $stmtCustomFields = $pdo->prepare($queryCustomFields);
-    $stmtCustomFields->execute(['iddatadb' => $iddatadb]);
-    $customFields = $stmtCustomFields->fetchAll(PDO::FETCH_ASSOC);
-
-    // Costruisci l'array CommesseCustomFields
-    $commesseCustomFields = [];
-    foreach ($customFields as $field) {
-        $commesseCustomFields[] = [
-            'IdCommesseCustomFields' => (int)$field['IdCommesseCustomFields'],
-            'Valore' => $field['Valore'] ?? ''
-        ];
-    }
-
-    // Payload per aggiornamento campi custom
-    $payloadCustomFields = [
-        'CommesseCustomFields' => $commesseCustomFields
-    ];
-
-    // Step 3: Creazione payload per Campioni (da identification_parts)
-    $queryCampioni = "
-        SELECT 
-            part_number,
-            idmatrice AS Matrice,
-            part_description AS NoteWeb
         FROM identification_parts
         WHERE iddatadb = :iddatadb
-    ";
+    ");
+    $stmt->execute(['iddatadb' => $iddatadb]);
+    $parts = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-    $stmtCampioni = $pdo->prepare($queryCampioni);
+    // 🔹 STEP 4: Fetch Field Values with Labels
-    $stmtCampioni->execute(['iddatadb' => $iddatadb]);
+    $stmt = $pdo->prepare("
-    $campioni = $stmtCampioni->fetchAll(PDO::FETCH_ASSOC);
+        SELECT
+          idd.field_value,
+          m.field_label,
+          m.schema_id,
+          m.field_id
+        FROM
+          import_data_details as idd
+          JOIN template_mapping m ON idd.mapping_id = m.id
+        WHERE idd.id = :iddatadb
+    ");
+    $stmt->execute(['iddatadb' => $iddatadb]);
+    $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-    $payloadsCampioni = [];
+    $fieldValues = [];
-    foreach ($campioni as $campione) {
+    $valueMap = [];
-        if (empty($campione['Matrice'])) {
+    foreach ($rows as $row) {
-            throw new Exception("Matrice non valida per campione: {$campione['part_number']}");
+        $fieldValues[] = [
-        }
+            "IdCommesseCustomFields" => (int) $row['field_id'],
-        $payloadCampione = [
+            "Valore" => $row['field_value'],
-            'Commessa' => null, // Sarà impostato dopo
+            "FieldLabel" => $row['field_label']
-            'Matrice' => (int)$campione['Matrice'],
-            'SottoMatrice' => null,
-            'SchemaCustomField' => 1,
-            'NoteWeb' => $campione['NoteWeb'] ?? ''
         ];
-        $payloadsCampioni[] = $payloadCampione;
+        $valueMap[(int) $row['field_id']] = $row['field_value'];
     }
 
-    // Step 4: Creazione payload per InviaCommessa
+    // Logga i fieldValues in error_log
-    $payloadInviaCommessa = [];
+    $logFieldValues = "FieldValues dal DB (iddatadb={$iddatadb}):\n" . json_encode($fieldValues, JSON_PRETTY_PRINT);
+    error_log($logFieldValues);
 
-    // Variabile per idcommessaweb
+    // 🔹 Initialize API client
-    $idcommessaweb = null;
+    $api = VisualLimsApiClient::getInstance();
-    $commessaweb = '';
 
-    if ($simulate) {
+    // 🔹 STEP 5: Create CommessaWeb (NOT WebOrder)
-        // Flusso simulato
+    $commessaWebPayload = [
-        $idcommessaweb = 10176; // Fittizio per il test
+        "Cliente" => $clienteId,
+        "SchemaCustomField" => $schemaId,
+        "Richiedente" => "Test Web Import",
+        "Descrizione" => "TEST CommessaWeb",
+    ];
 
-        // Salva idcommessaweb in datadb
+    // Costruisci log curl-like per STEP 5
-        $updateStmt = $pdo->prepare("UPDATE datadb SET idcommessaweb = :idcommessaweb WHERE iddatadb = :iddatadb");
+    $jsonPayload = json_encode($commessaWebPayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        $updateStmt->execute(['idcommessaweb' => $idcommessaweb, 'iddatadb' => $iddatadb]);
+    $logContentStep5 = "curl --location --request POST '{$apiBaseUrl}CommessaWeb' \\\n" .
+        "--header 'Content-Type: application/json' \\\n" .
+        "--header 'Authorization: Bearer ••••••' \\\n" .
+        "--data '{$jsonPayload}'";
 
-        // Salva i payload in file JSON
+    $commessaWeb = $api->post("CommessaWeb", $commessaWebPayload);
-        $outputFileCommessa = $logDir . "/commessaweb_create_{$iddatadb}.json";
-        file_put_contents($outputFileCommessa, json_encode($payloadCommessa, JSON_PRETTY_PRINT));
 
-        $outputFileCustomFields = $logDir . "/commessaweb_customfields_{$iddatadb}.json";
+    $logContentStep5 .= "\n\nRESPONSE:\n" . json_encode($commessaWeb, JSON_PRETTY_PRINT);
-        file_put_contents($outputFileCustomFields, json_encode($payloadCustomFields, JSON_PRETTY_PRINT));
 
-        foreach ($payloadsCampioni as $index => $payloadCampione) {
+    // Salva log
-            $payloadCampione['Commessa'] = $idcommessaweb;
+    $logFileStep5 = $logDir . "commessa_create_step5_" . $iddatadb . "_" . time() . ".txt";
-            $outputFileCampione = $logDir . "/campione_{$iddatadb}_{$campioni[$index]['part_number']}.json";
+    file_put_contents($logFileStep5, $logContentStep5);
-            file_put_contents($outputFileCampione, json_encode($payloadCampione, JSON_PRETTY_PRINT));
+
+    $commessaId = $commessaWeb["IdCommessa"];
+    $commessaWebCode = substr($commessaWeb["CodiceCommessa"] ?? "TEST CommessaWeb", 0, 30); // Limite a 30 caratteri
+
+    // 🔹 STEP 6: Create Campioni (Samples) for each part
+    $campioni = [];
+    $logContentStep6 = "";
+
+    foreach ($parts as $index => $part) {
+        $matriceId = (int) ($part["idmatrice"] ?? 0);
+
+        if ($matriceId <= 0) {
+            throw new Exception("Invalid or missing idmatrice for part: " . ($part["part_number"] ?? "Unknown"));
         }
 
-        $outputFileInviaCommessa = $logDir . "/commessaweb_invia_{$iddatadb}.json";
+        $campionePayload = [
-        file_put_contents($outputFileInviaCommessa, json_encode($payloadInviaCommessa, JSON_PRETTY_PRINT));
+            "Commessa" => $commessaId,
+            "Matrice" => $matriceId,
+            "SottoMatrice" => null,
+            "SchemaCustomField" => $schemaId,
+            "NoteWeb" => $part["part_description"] ?? ""
+        ];
 
-        // Aggiorna lo status a 'l' (To LIMS)
+        // Costruisci curl-like per questo campione
-        $updateStmt = $pdo->prepare("UPDATE datadb SET status = 'l' WHERE iddatadb = :iddatadb");
+        $jsonPayload = json_encode($campionePayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        $updateStmt->execute(['iddatadb' => $iddatadb]);
+        $logContentStep6 .= "CAMPIONE #{$index}\n" .
+            "curl --location --request POST '{$apiBaseUrl}Campione' \\\n" .
+            "--header 'Content-Type: application/json' \\\n" .
+            "--header 'Authorization: Bearer ••••••' \\\n" .
+            "--data '{$jsonPayload}'\n\n";
 
-        // Risposta di successo (simulazione)
+        $campione = $api->post("Campione", $campionePayload);
-        echo json_encode([
+
-            'success' => true,
+        $logContentStep6 .= "RESPONSE:\n" . json_encode($campione, JSON_PRETTY_PRINT) . "\n\n---\n";
-            'mode' => 'simulated',
+
-            'message' => "Payload generati e salvati in {$outputFileCommessa}, {$outputFileCustomFields}, file campioni e {$outputFileInviaCommessa}",
+        $campione["PartNumber"] = $part["part_number"] ?? "";
-            'idcommessaweb' => $idcommessaweb,
+        $campione["Material"] = $part["material"] ?? "";
-            'commessaweb' => $commessaweb,
+        $campione["Color"] = $part["color"] ?? "";
-            'payload_commessa' => $payloadCommessa,
+        $campione["Mix"] = $part["mix"] ?? "";
-            'payload_customfields' => $payloadCustomFields,
+
-            'payload_campioni' => $payloadsCampioni,
+        $campioni[] = $campione;
-            'payload_invia_commessa' => $payloadInviaCommessa
+    }
+
+    // Salva log per STEP 6
+    $logFileStep6 = $logDir . "commessa_{$commessaId}_campioni_step6_" . time() . ".txt";
+    file_put_contents($logFileStep6, $logContentStep6);
+
+    // 🔹 STEP 7: Update Custom Fields for CommessaWeb
+    if (!empty($fieldValues)) {
+        // GET con espansione per CustomField
+        $expand = "CommesseCustomFields(\$expand=CustomField)";
+        $commessaWithFields = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
+
+        // Logga il GET
+        $logContentGet = "curl --location --request GET '{$apiBaseUrl}CommessaWeb({$commessaId})?\$expand=CommesseCustomFields(\$expand=CustomField)' \\\n" .
+            "--header 'Authorization: Bearer ••••••'\n\n" .
+            "RESPONSE:\n" . json_encode($commessaWithFields, JSON_PRETTY_PRINT);
+        $logFileGet = $logDir . "commessa_{$commessaId}_get_step7_" . time() . ".txt";
+        file_put_contents($logFileGet, $logContentGet);
+
+        // Prepara payload PATCH
+        $commessaCustomFields = [];
+        foreach ($commessaWithFields["CommesseCustomFields"] as $customField) {
+            $definitionId = (int) ($customField["CustomField"]["IdCustomField"] ?? 0);
+            $fieldId = (int) $customField["IdCommesseCustomFields"];
+            $currentValue = $customField["Valore"] ?? '';
+            $fieldType = $customField["CustomField"]["Tipo"] ?? '';
+            $newValue = isset($valueMap[$definitionId]) ? $valueMap[$definitionId] : $currentValue;
+
+            // Valida se il campo è di tipo Data
+            if ($fieldType === 'Data' && $newValue !== $currentValue) {
+                $newValue = validateDate($newValue);
+            }
+
+            $commessaCustomFields[] = [
+                "IdCommesseCustomFields" => $fieldId,
+                "Valore" => $newValue
+            ];
+        }
+
+        if (!empty($commessaCustomFields)) {
+            $updatePayload = ["CommesseCustomFields" => $commessaCustomFields];
+
+            // Logga payload e response
+            $jsonPayload = json_encode($updatePayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+            $logContentStep7 = "curl --location --request PATCH '{$apiBaseUrl}CommessaWeb({$commessaId})' \\\n" .
+                "--header 'Content-Type: application/json' \\\n" .
+                "--header 'Authorization: Bearer ••••••' \\\n" .
+                "--data '{$jsonPayload}'";
+
+            $patchResponse = $api->patch("CommessaWeb({$commessaId})", $updatePayload);
+
+            $logContentStep7 .= "\n\nRESPONSE:\n" . json_encode($patchResponse, JSON_PRETTY_PRINT);
+            $logFileStep7 = $logDir . "commessa_{$commessaId}_update_step7_" . time() . ".txt";
+            file_put_contents($logFileStep7, $logContentStep7);
+        }
+    }
+
+    // 🔹 STEP 8: Update datadb with idcommessaweb, commessaweb, and status
+    $stmt = $pdo->prepare("
+        UPDATE datadb
+        SET idcommessaweb = :idcommessaweb, commessaweb = :commessaweb, status = 'l'
+        WHERE iddatadb = :iddatadb
+    ");
+    $stmt->execute([
+        'idcommessaweb' => $commessaId,
+        'commessaweb' => $commessaWebCode,
+        'iddatadb' => $iddatadb
     ]);
-    } else {
-        // Flusso reale
-        $apiClient = VisualLimsApiClient::getInstance();
 
-        // Step 1: Crea CommessaWeb
+    // 🔹 STEP 9: Send CommessaWeb to laboratory (commentato come richiesto)
-        $response = $apiClient->post('/api/odata/CommessaWeb', $payloadCommessa);
+    /*
-        if (!isset($response['success']) || !isset($response['CommessaId'])) {
+    $sendResult = $api->post("CommessaWeb({$commessaId})/InviaCommessa", []);
-            throw new Exception('Errore nella creazione della CommessaWeb: ' . json_encode($response));
-        }
-        $idcommessaweb = (int)$response['CommessaId'];
 
-        // Salva idcommessaweb in datadb
+    // Logga il POST
-        $updateStmt = $pdo->prepare("UPDATE datadb SET idcommessaweb = :idcommessaweb WHERE iddatadb = :iddatadb");
+    $logContentStep9 = "curl --location --request POST '{$apiBaseUrl}CommessaWeb({$commessaId})/InviaCommessa' \\\n" .
-        $updateStmt->execute(['idcommessaweb' => $idcommessaweb, 'iddatadb' => $iddatadb]);
+                       "--header 'Content-Type: application/json' \\\n" .
+                       "--header 'Authorization: Bearer ••••••' \\\n" .
+                       "--data '{}'\n\n" .
+                       "RESPONSE:\n" . json_encode($sendResult, JSON_PRETTY_PRINT);
+    $logFileStep9 = $logDir . "commessa_{$commessaId}_send_step9_" . time() . ".txt";
+    file_put_contents($logFileStep9, $logContentStep9);
+    */
 
-        // Logga il successo della creazione CommessaWeb
+    // 🔹 STEP 10: GET di controllo post-PATCH
-        file_put_contents($logDir . '/export_lims_success.log', date('Y-m-d H:i:s') . " - CommessaWeb creata: idcommessaweb {$idcommessaweb} per iddatadb {$iddatadb}\n", FILE_APPEND);
+    $expand = "CommesseCustomFields(\$expand=CustomField)";
+    $commessaAfterPatch = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
 
-        // Step 2: Aggiorna CommesseCustomFields
+    // Logga il GET di controllo
-        $apiClient->patch("/api/odata/CommessaWeb({$idcommessaweb})", $payloadCustomFields);
+    $logContentStep10 = "curl --location --request GET '{$apiBaseUrl}CommessaWeb({$commessaId})?\$expand=CommesseCustomFields(\$expand=CustomField)' \\\n" .
+        "--header 'Authorization: Bearer ••••••'\n\n" .
+        "RESPONSE:\n" . json_encode($commessaAfterPatch, JSON_PRETTY_PRINT);
+    $logFileStep10 = $logDir . "commessa_{$commessaId}_get_step10_" . time() . ".txt";
+    file_put_contents($logFileStep10, $logContentStep10);
 
-        // Step 3: Crea Campioni
+    // 🔹 STEP 11: Prepare final response
-        foreach ($payloadsCampioni as $index => $payloadCampione) {
+    $finalCommessa = [
-            $payloadCampione['Commessa'] = $idcommessaweb;
+        "Cliente" => $clienteId,
-            $apiClient->post('/api/odata/Campione', $payloadCampione);
+        "SchemaCustomField" => $schemaId,
-            $payloadsCampioni[$index] = $payloadCampione; // Aggiorna il payload con Commessa
+        "Richiedente" => $commessaWeb["Richiedente"] ?? "Web Import",
-        }
+        "Descrizione" => $commessaWeb["Descrizione"] ?? "",
+        "CommesseCustomFields" => $commessaAfterPatch["CommesseCustomFields"] ?? [],
+        "Campioni" => $campioni,
+        "Inviata" => 0 // Non inviato, come richiesto
+    ];
 
-        // Step 4: Invia Commessa
-        $apiClient->post("/api/odata/CommessaWeb({$idcommessaweb})/InviaCommessa", $payloadInviaCommessa);
-
-        // Step 5: Recupera il numero commessaweb (opzionale)
-        $commessaData = $apiClient->get("/api/odata/CommessaWeb({$idcommessaweb})");
-        $commessaweb = $commessaData['Numero'] ?? '';
-        if ($commessaweb) {
-            $updateStmt = $pdo->prepare("UPDATE datadb SET commessaweb = :commessaweb WHERE iddatadb = :iddatadb");
-            $updateStmt->execute(['commessaweb' => $commessaweb, 'iddatadb' => $iddatadb]);
-        }
-
-        // Aggiorna lo status a 'l' (To LIMS)
-        $updateStmt = $pdo->prepare("UPDATE datadb SET status = 'l' WHERE iddatadb = :iddatadb");
-        $updateStmt->execute(['iddatadb' => $iddatadb]);
-
-        // Risposta di successo (flusso reale)
     echo json_encode([
-            'success' => true,
+        "success" => true,
-            'mode' => 'real',
+        "commessaWeb" => $finalCommessa,
-            'message' => "Dati inviati al LIMS con successo",
+        "commessaWebApiResponse" => $commessaWeb, // Incluso per debug
-            'idcommessaweb' => $idcommessaweb,
+        "totalCampioni" => count($campioni),
-            'commessaweb' => $commessaweb,
+        "totalCustomFields" => count($commessaAfterPatch["CommesseCustomFields"] ?? []),
-            'payload_commessa' => $payloadCommessa,
+        "message" => "Export successful",
-            'payload_customfields' => $payloadCustomFields,
+        "logFiles" => [
-            'payload_campioni' => $payloadsCampioni,
+            "step5_create" => $logFileStep5,
-            'payload_invia_commessa' => $payloadInviaCommessa
+            "step6_campioni" => $logFileStep6,
+            "step7_patch" => $logFileStep7,
+            "step10_get" => $logFileStep10
+        ]
     ]);
-    }
 } catch (Exception $e) {
-    // Log dell'errore
+    error_log("LIMS Export Error: " . $e->getMessage() . "\nTrace: " . $e->getTraceAsString());
-    file_put_contents($logDir . '/export_lims_error.log', date('Y-m-d H:i:s') . ' - Flusso ' . ($simulate ? 'simulato' : 'reale') . ' fallito: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+
-    http_response_code(500);
     echo json_encode([
-        'success' => false,
+        "success" => false,
-        'mode' => $simulate ? 'simulated' : 'real',
+        "message" => "Export failed: " . $e->getMessage(),
-        'message' => 'Errore: ' . $e->getMessage()
+        "logFiles" => [
+            "step5_create" => $logFileStep5 ?? null,
+            "step6_campioni" => $logFileStep6 ?? null,
+            "step7_patch" => $logFileStep7 ?? null,
+            "step10_get" => $logFileStep10 ?? null
+        ]
     ]);
 }

public/userarea/get_clienti.php

@@ -1,24 +1,74 @@
 <?php
-require_once dirname(__DIR__, 2) . '/vendor/autoload.php'; // Torna al livello di public per trovare vendor/
+require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
-require_once dirname(__FILE__) . '/class/VisualLimsApiClient.class.php';
+require_once __DIR__ . '/class/VisualLimsApiClient.class.php';
 
 header('Content-Type: application/json');
 
-// Disabilita la visualizzazione degli errori PHP per evitare output HTML
+// Disable PHP error display
 ini_set('display_errors', '0');
 error_reporting(E_ALL);
 
 try {
     $api = VisualLimsApiClient::getInstance();
-    $data = $api->get("Cliente"); // Recupera i clienti
 
-    // Salva la risposta in un file per debug
+    // Parametri OData
-    file_put_contents(__DIR__ . '/clienti_response.json', json_encode($data));
+    $params = [
+        '$select' => 'IdCliente,Nominativo,CodiceNazioneFatturazione',
+        '$orderby' => 'Nominativo asc'
+    ];
+
+    // Costruisce query string con encoding corretto
+    $queryString = http_build_query($params);
+
+    // Componi endpoint finale
+    $endpoint = "Cliente?$queryString";
+
+    // Funzione per eseguire la chiamata con retry
+    function makeApiRequest($api, $endpoint, $maxRetries = 3)
+    {
+        for ($retry = 0; $retry < $maxRetries; $retry++) {
+            try {
+                // Tenta la chiamata API
+                $data = $api->get($endpoint);
+                // Salva risposta per debug
+                file_put_contents(__DIR__ . '/clienti_response.json', json_encode($data, JSON_PRETTY_PRINT));
+                return $data;
+            } catch (Exception $e) {
+                $errorMessage = $e->getMessage();
+                // Controlla se l'errore è legato all'autenticazione (HTTP 400 con messaggio specifico)
+                if (strpos($errorMessage, 'HTTP 400') !== false && strpos($errorMessage, 'Cannot persist the object') !== false) {
+                    // Forza il refresh del token
+                    try {
+                        // Assumi che VisualLimsApiClient abbia un metodo per il refresh del token
+                        $api->refreshToken(); // Da implementare in VisualLimsApiClient se non esiste
+                        error_log("Tentativo $retry: Refresh token eseguito per endpoint $endpoint");
+                    } catch (Exception $refreshEx) {
+                        error_log("Errore durante il refresh del token: " . $refreshEx->getMessage());
+                        throw new Exception("Impossibile eseguire il refresh del token: " . $refreshEx->getMessage());
+                    }
+                    // Ritarda leggermente prima del retry
+                    usleep(500000); // 500ms
+                    continue;
+                }
+                // Altri errori non gestiti dal retry
+                throw $e;
+            }
+        }
+        throw new Exception("Massimo numero di tentativi raggiunto per $endpoint");
+    }
+
+    // Esegui la chiamata con retry
+    $data = makeApiRequest($api, $endpoint);
 
     echo json_encode($data);
 } catch (Exception $e) {
     http_response_code(500);
-    echo json_encode([
+    $errorResponse = [
-        'error' => $e->getMessage()
+        'error' => $e->getMessage(),
-    ]);
+        'file' => $e->getFile(),
+        'line' => $e->getLine(),
+        'trace' => $e->getTraceAsString()
+    ];
+    error_log("Errore in get_clienti.php: " . json_encode($errorResponse));
+    echo json_encode($errorResponse);
 }

public/userarea/get_macro_matrici.php

@@ -0,0 +1,59 @@
+<?php
+require_once dirname(__DIR__, 2) . '/vendor/autoload.php'; // Risale a root/vendor/
+use Dotenv\Dotenv;
+
+// Set JSON header
+header('Content-Type: application/json');
+
+// Debug: Log the path where we expect the .env file
+$envPath = dirname(__DIR__, 2);
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Expected .env path: ' . $envPath . PHP_EOL, FILE_APPEND);
+
+// Carica il file .env dalla root del progetto
+try {
+    $dotenv = Dotenv::createImmutable($envPath);
+    $dotenv->load();
+} catch (Exception $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore caricamento .env: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore caricamento configurazione: ' . $e->getMessage()]);
+    exit(1);
+}
+
+// Recupera le variabili d'ambiente
+$dbHost = $_ENV['DB_HOST'];
+$dbName = $_ENV['DB_DATABASE'];
+$dbUser = $_ENV['DB_USERNAME'];
+$dbPass = $_ENV['DB_PASSWORD'];
+$dbPrefix = $_ENV['DB_PREFIX'];
+
+// Debug: Log database connection details (excluding password)
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . " - DB Connection: host=$dbHost, dbname=$dbName, user=$dbUser, prefix=$dbPrefix" . PHP_EOL, FILE_APPEND);
+
+// Connessione al database MySQL
+try {
+    $pdo = new PDO("mysql:host=$dbHost;dbname=$dbName;charset=utf8mb4", $dbUser, $dbPass);
+    $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+} catch (PDOException $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore connessione DB: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore connessione al database: ' . $e->getMessage()]);
+    exit(1);
+}
+
+try {
+    // Query per recuperare i valori distinti di MacroMatrice, escludendo quelli che iniziano con '*' e ordinandoli
+    $query = "SELECT DISTINCT MacroMatrice FROM {$dbPrefix}matrici WHERE MacroMatrice IS NOT NULL AND MacroMatrice NOT LIKE '*%' ORDER BY MacroMatrice ASC";
+    $stmt = $pdo->prepare($query);
+    $stmt->execute();
+    $macroMatrici = $stmt->fetchAll(PDO::FETCH_COLUMN);
+
+    // Debug: Log del numero di MacroMatrice recuperate
+    file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Retrieved ' . count($macroMatrici) . ' MacroMatrice from database' . PHP_EOL, FILE_APPEND);
+
+    // Restituisci risposta JSON
+    echo json_encode(['success' => true, 'value' => $macroMatrici]);
+} catch (PDOException $e) {
+    // Log errore e restituisci risposta di errore
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore nel recupero delle MacroMatrice: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore nel recupero delle MacroMatrice: ' . $e->getMessage()]);
+    exit(1);
+}

public/userarea/get_matrici_db.php

@@ -0,0 +1,59 @@
+<?php
+require_once dirname(__DIR__, 2) . '/vendor/autoload.php'; // Risale a root/vendor/
+use Dotenv\Dotenv;
+
+// Set JSON header
+header('Content-Type: application/json');
+
+// Debug: Log the path where we expect the .env file
+$envPath = dirname(__DIR__, 2);
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Expected .env path: ' . $envPath . PHP_EOL, FILE_APPEND);
+
+// Carica il file .env dalla root del progetto
+try {
+    $dotenv = Dotenv::createImmutable($envPath);
+    $dotenv->load();
+} catch (Exception $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore caricamento .env: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore caricamento configurazione: ' . $e->getMessage()]);
+    exit(1);
+}
+
+// Recupera le variabili d'ambiente
+$dbHost = $_ENV['DB_HOST'];
+$dbName = $_ENV['DB_DATABASE'];
+$dbUser = $_ENV['DB_USERNAME'];
+$dbPass = $_ENV['DB_PASSWORD'];
+$dbPrefix = $_ENV['DB_PREFIX'];
+
+// Debug: Log database connection details (excluding password)
+file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . " - DB Connection: host=$dbHost, dbname=$dbName, user=$dbUser, prefix=$dbPrefix" . PHP_EOL, FILE_APPEND);
+
+// Connessione al database MySQL
+try {
+    $pdo = new PDO("mysql:host=$dbHost;dbname=$dbName;charset=utf8mb4", $dbUser, $dbPass);
+    $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+} catch (PDOException $e) {
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore connessione DB: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore connessione al database: ' . $e->getMessage()]);
+    exit(1);
+}
+
+try {
+    // Query per recuperare le matrici, includendo MacroMatrice, escludendo quelle che iniziano con '*' e ordinandole
+    $query = "SELECT IdMatrice, NomeMatrice, MacroMatrice FROM {$dbPrefix}matrici WHERE NomeMatrice NOT LIKE '*%' ORDER BY NomeMatrice ASC";
+    $stmt = $pdo->prepare($query);
+    $stmt->execute();
+    $matrici = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    // Debug: Log del numero di matrici recuperate
+    file_put_contents(__DIR__ . '/debug_log.txt', date('Y-m-d H:i:s') . ' - Retrieved ' . count($matrici) . ' matrices from database' . PHP_EOL, FILE_APPEND);
+
+    // Restituisci risposta JSON
+    echo json_encode(['success' => true, 'value' => $matrici]);
+} catch (PDOException $e) {
+    // Log errore e restituisci risposta di errore
+    file_put_contents(__DIR__ . '/error_log.txt', date('Y-m-d H:i:s') . ' - Errore nel recupero delle matrici: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    echo json_encode(['success' => false, 'message' => 'Errore nel recupero delle matrici: ' . $e->getMessage()]);
+    exit(1);
+}

public/userarea/get_rapporto_prova.php

@@ -9,7 +9,7 @@ error_reporting(E_ALL);
 
 try {
     $api = VisualLimsApiClient::getInstance();
-    $rapporto_id = 515081;
+    $rapporto_id = 533329;
 
     // Costruzione manuale dell'endpoint con espansione annidata
     $endpoint = "Rapporto($rapporto_id)?\$expand=CampioniDatiRapporto(\$expand=AnalisiDatiRapporto,CustomFieldsDatiRapporto)";

public/userarea/historical_trf.php

@@ -662,6 +662,11 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                             } else {
                                                 echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>";
                                             }
+                                            // Status (subito dopo main_field)
+                                            $fixedColumnsReduced = ['status'];
+                                            foreach ($fixedColumnsReduced as $col) {
+                                                echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>";
+                                            }
                                             // Campi automatici (escluso main_field)
                                             $autoIndex = ($mainFieldMapping && !$mainFieldMapping['is_manual']) ? 1 : 0;
                                             foreach ($allMappings as $mapping) {
@@ -712,11 +717,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     $manualIndex++;
                                                 }
                                             }
-                                            // Colonne status, Import Reference Code, filename_import
+                                            // Colonne Import Reference Code, filename_import
-                                            $fixedColumnsReduced = ['status'];
-                                            foreach ($fixedColumnsReduced as $col) {
-                                                echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>";
-                                            }
                                             echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>"; // Import Reference Code
                                             echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>"; // filename_import
                                             // AWB Number e Tracking Info
@@ -734,6 +735,12 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                 echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>" . htmlspecialchars($mainFieldMapping['field_label']) . "<div class='resizer'></div></div>";
                                                 $headerIndex++;
                                             }
+                                            // Header per status (subito dopo main_field)
+                                            foreach ($fixedColumnsReduced as $col) {
+                                                $displayName = $slugMapping[$col] ?? $col;
+                                                echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>$displayName<div class='resizer'></div></div>";
+                                                $headerIndex++;
+                                            }
                                             // Header per campi automatici (escluso main_field)
                                             foreach ($allMappings as $mapping) {
                                                 if (!$mapping['is_manual'] && $mapping['main_field'] != 1) {
@@ -748,12 +755,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     $headerIndex++;
                                                 }
                                             }
-                                            // Header per status, Import Reference Code, filename_import
+                                            // Header per Import Reference Code, filename_import
-                                            foreach ($fixedColumnsReduced as $col) {
-                                                $displayName = $slugMapping[$col] ?? $col;
-                                                echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>$displayName<div class='resizer'></div></div>";
-                                                $headerIndex++;
-                                            }
                                             echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>Import Reference Code<div class='resizer'></div></div>";
                                             $headerIndex++;
                                             echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>File<div class='resizer'></div></div>";
@@ -770,13 +772,11 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     <div style="display: flex; gap: 5px; justify-content: center;">
                                                         <?php if (!$is_readonly): ?>
                                                             <button type="button" class="save-btn action-btn" data-row="<?= $index ?>" style="background: #28a745; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-save"></i></button>
-                                                            <button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #007bff; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-camera"></i></button>
-                                                            <button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #ffc107; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-puzzle-piece"></i></button>
                                                         <?php else: ?>
                                                             <button type="button" class="save-btn action-btn" data-row="<?= $index ?>" style="background: #ccc; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: not-allowed; flex: 1;" disabled><i class="fas fa-save"></i></button>
-                                                            <button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #ccc; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: not-allowed; flex: 1;" disabled><i class="fas fa-camera"></i></button>
-                                                            <button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #ccc; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: not-allowed; flex: 1;" disabled><i class="fas fa-puzzle-piece"></i></button>
                                                         <?php endif; ?>
+                                                        <button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #007bff; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-camera"></i></button>
+                                                        <button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" style="background: #ffc107; color: white; border: none; padding: 8px 12px; border-radius: 5px; cursor: pointer; flex: 1;"><i class="fas fa-puzzle-piece"></i></button>
                                                     </div>
                                                 </div>
                                                 <?php
@@ -806,6 +806,25 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     echo "</div>";
                                                     $cellIndex++;
                                                 }
+                                                // Status (subito dopo main_field)
+                                                $fixedColumnsReduced = ['status'];
+                                                foreach ($fixedColumnsReduced as $col) {
+                                                    $value = $row[$col] ?? '';
+                                                    echo "<div class='grid-cell editable-cell' data-col='$col' data-row='$index' data-index='$cellIndex' style='flex: 0 0 150px;'>";
+                                                    if ($col === 'status') {
+                                                        $badgeClass = $value === 'i' ? 'status-i' : ($value === 'P' ? 'status-P' : 'status-l');
+                                                        $badgeText = $value === 'i' ? 'Imported' : ($value === 'P' ? 'Progress' : 'LIMS');
+                                                        // Aggiungi il numero di commessaweb se lo status è 'l'
+                                                        if ($value === 'l') {
+                                                            $commessaWeb = isset($row['commessaweb']) ? htmlspecialchars($row['commessaweb']) : '';
+                                                            $badgeText .= " ($commessaWeb)";
+                                                        }
+                                                        echo "<span class='status-badge $badgeClass'>" . htmlspecialchars($badgeText) . "</span>";
+                                                        echo "<input type='hidden' name='rows[$index][$col]' value='" . htmlspecialchars($value ?? 'i') . "'>";
+                                                    }
+                                                    echo "</div>";
+                                                    $cellIndex++;
+                                                }
                                                 // Campi automatici (escluso main_field)
                                                 $autoIndex = ($mainFieldMapping && !$mainFieldMapping['is_manual']) ? 1 : 0;
                                                 foreach ($allMappings as $mapping) {
@@ -863,20 +882,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                         $manualIndex++;
                                                     }
                                                 }
-                                                // Colonna status
-                                                $fixedColumnsReduced = ['status'];
-                                                foreach ($fixedColumnsReduced as $col) {
-                                                    $value = $row[$col] ?? '';
-                                                    echo "<div class='grid-cell editable-cell' data-col='$col' data-row='$index' data-index='$cellIndex' style='flex: 0 0 150px;'>";
-                                                    if ($col === 'status') {
-                                                        $badgeClass = $value === 'i' ? 'status-i' : ($value === 'P' ? 'status-P' : 'status-l');
-                                                        $badgeText = $value === 'i' ? 'Imported' : ($value === 'P' ? 'Progress' : 'LIMS');
-                                                        echo "<span class='status-badge $badgeClass'>" . htmlspecialchars($badgeText) . "</span>";
-                                                        echo "<input type='hidden' name='rows[$index][$col]' value='" . htmlspecialchars($value ?? 'i') . "'>";
-                                                    }
-                                                    echo "</div>";
-                                                    $cellIndex++;
-                                                }
                                                 // Colonne Import Reference Code e filename_import
                                                 echo "<div class='grid-cell' data-col='importreferencecode' data-row='$index' data-index='$cellIndex' style='flex: 0 0 150px;'>";
                                                 echo "<span>" . htmlspecialchars($row['importreferencecode']) . "</span>";

public/userarea/import_insert.php

@@ -17,23 +17,27 @@ if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['template_id']) || !i
     header("Location: xlstemplates_grid.php?status=error&message=" . urlencode("Richiesta non valida"));
     exit;
 }
+
 $template_id = intval($_POST['template_id']);
-$selected_rows = $_POST['selected_rows'];
+$selected_rows = array_map('intval', $_POST['selected_rows']);
-$columns = json_decode($_POST['columns'], true); // Header dell'XLS
+$columns = json_decode($_POST['columns'], true);
-$rows = json_decode($_POST['rows'], true);       // Dati dell'XLS
+$rows = json_decode($_POST['rows'], true);
+$excelrows = json_decode($_POST['excelrows'], true);
 $newFilename = htmlspecialchars($_POST['filename']);
 
 $_SESSION['template_id'] = $template_id;
 $_SESSION['selected_rows'] = $selected_rows;
 $_SESSION['columns'] = $columns;
 $_SESSION['rows'] = $rows;
+$_SESSION['excelrows'] = $excelrows;
 $_SESSION['filename'] = $newFilename;
 
 error_log("Received Data - Template ID: $template_id, Selected Rows: " . json_encode($selected_rows));
 error_log("Columns: " . json_encode($columns));
 error_log("Rows: " . json_encode($rows));
+error_log("Excelrows: " . json_encode($excelrows));
 
-$user_id = $iduserlogin ?? 1; // Default a 1 se non definito
+$user_id = $iduserlogin ?? 1;
 
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
@@ -60,30 +64,45 @@ foreach ($allMappings as $mapping) {
     }
 }
 
-// Inserisci le righe selezionate in datadb (solo campi generici con templateid)
+// Inserisci le righe selezionate in datadb
 $insertedIds = [];
 foreach ($selected_rows as $rowIndex) {
-    $row = $rows[$rowIndex];
+    $row = $rows[$rowIndex] ?? null;
+    $excelrow = $excelrows[$rowIndex] ?? null;
+
+    if ($row === null || $excelrow === null) {
+        error_log("Errore: riga o excelrow mancante per rowIndex $rowIndex");
+        continue;
+    }
+
+    // Recupera l'idclient di default dal template
+    $template_stmt = $pdo->prepare("SELECT idclient FROM excel_templates WHERE id = ?");
+    $template_stmt->execute([$template_id]);
+    $template = $template_stmt->fetch(PDO::FETCH_ASSOC);
+    $default_idclient = $template['idclient'] ?? null;
+
     $values = [
-        $template_id,         // templateid
+        $template_id,
-        $importReferenceCode, // importreferencecode
+        $importReferenceCode,
-        $newFilename,         // filename_import
+        $newFilename,
-        'i',                  // status
+        'i',
-        $user_id,             // user_id
+        $user_id,
-        null,                 // limscode
+        null,
-        date('Y-m-d')         // importdate
+        date('Y-m-d'),
+        $excelrow,
+        $default_idclient // Aggiungi idclient
     ];
-    $sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate) VALUES (?, ?, ?, ?, ?, ?, ?)";
+    $sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate, excelrow, idclient) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
     $stmt = $pdo->prepare($sql);
     $stmt->execute($values);
 
     $iddatadb = $pdo->lastInsertId();
     $insertedIds[] = $iddatadb;
 
-    // Inserisci tutti i campi (automatici e manuali) in import_data_details
+    // Inserisci tutti i campi in import_data_details
     foreach ($allMappings as $mapping) {
         $fieldValue = null;
-        if (!$mapping['is_manual']) { // Campi automatici dall'XLS
+        if (!$mapping['is_manual']) {
             $excelColumn = trim($mapping['excel_column']);
             $excelColumnIndex = array_search($excelColumn, array_map('trim', $columns));
             if ($excelColumnIndex !== false && isset($row[$excelColumnIndex]) && $row[$excelColumnIndex] !== '') {
@@ -109,7 +128,7 @@ foreach ($selected_rows as $rowIndex) {
                     $fieldValue = !empty($fieldValue) ? htmlspecialchars((string)$fieldValue) : ($mapping['manual_default'] ?? '');
                     break;
             }
-        } else { // Campi manuali
+        } else {
             $fieldValue = $mapping['manual_default'] ?? '';
             if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today') {
                 $fieldValue = date('Y-m-d');
@@ -136,22 +155,19 @@ $params = [
 <form id="redirectForm" action="import_edit2.php" method="post">
     <input type="hidden" name="template_id" value="<?= htmlspecialchars($template_id) ?>">
     <input type="hidden" name="filename" value="<?= htmlspecialchars($newFilename) ?>">
-
     <?php foreach ($selected_rows as $row): ?>
         <input type="hidden" name="selected_rows[]" value="<?= htmlspecialchars($row) ?>">
     <?php endforeach; ?>
-
     <?php foreach ($insertedIds as $id): ?>
         <input type="hidden" name="inserted_ids[]" value="<?= htmlspecialchars($id) ?>">
     <?php endforeach; ?>
-
     <input type="hidden" name="columns" value='<?= json_encode($columns) ?>'>
     <input type="hidden" name="rows" value='<?= json_encode($rows) ?>'>
+    <input type="hidden" name="excelrows" value='<?= json_encode($excelrows) ?>'>
 </form>
 <script>
     document.getElementById('redirectForm').submit();
 </script>
 <?php
-
 exit;
-
+?>

public/userarea/import_xls2.php

@@ -21,6 +21,11 @@ if (!$template) {
     exit;
 }
 
+// Verifica i mapping
+$stmt = $pdo->prepare("SELECT id FROM template_mapping WHERE template_id = ?");
+$stmt->execute([$id]);
+$hasMappings = $stmt->fetch(PDO::FETCH_ASSOC);
+
 // Debug del template
 error_log("Loaded template: " . print_r($template, true));
 ?>
@@ -33,6 +38,7 @@ error_log("Loaded template: " . print_r($template, true));
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
     <?php include('cssinclude.php'); ?>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
     <style>
         .table-container {
             overflow-x: auto;
@@ -140,43 +146,55 @@ error_log("Loaded template: " . print_r($template, true));
                             </div>
                         </div>
                     </div>
-
                     <div class="card-body">
-                        <!-- Form per caricare il file -->
+                        <?php if (!$hasMappings): ?>
+                            <div class="alert alert-warning" role="alert">
+                                Nessun mapping trovato per questo template. Configura i mapping prima di procedere.
+                            </div>
+                        <?php endif; ?>
                         <form id="uploadForm" enctype="multipart/form-data" class="mb-4">
                             <div class="mb-3">
                                 <label for="excel_file" class="form-label">Upload XLS File</label>
                                 <input type="file" class="form-control" id="excel_file" name="excel_file" accept=".xls,.xlsx" required>
                             </div>
-                            <button type="submit" class="btn btn-primary">Upload</button>
+                            <button type="submit" class="btn btn-primary" <?= !$hasMappings ? 'disabled' : '' ?>>Upload</button>
                             <div class="loader" id="loader"></div>
                         </form>
 
-                        <!-- Contenitore per messaggi di errore -->
                         <div id="errorContainer" class="alert alert-danger mt-3" style="display: none;"></div>
 
-                        <!-- Contenitore per la tabella -->
                         <div id="tableContainer"></div>
+
+                        <div class="modal fade" id="routineConfirmModal" tabindex="-1" aria-labelledby="routineConfirmModalLabel" aria-hidden="true">
+                            <div class="modal-dialog">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h5 class="modal-title" id="routineConfirmModalLabel">Conferma Applicazione Routine</h5>
+                                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <p><strong>Routine:</strong> <span id="routineName"></span></p>
+                                        <p><strong>Descrizione:</strong> <span id="routineDescription"></span></p>
+                                        <p>Vuoi applicare questa routine al file caricato?</p>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="cancelRoutineBtn">Annulla</button>
+                                        <button type="button" class="btn btn-primary" id="confirmRoutineBtn">Applica</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-        <!--end page wrapper -->
         <div class="overlay toggle-icon"></div>
         <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
         <?php include('include/footer.php'); ?>
     </div>
-    <!--end wrapper-->
 
-    <!-- search modal -->
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
-    <?php //include('include/searchmodal.php');
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.min.js"></script>
-    ?>
-    <!-- end search modal -->
-
-    <!--start switcher-->
-    <?php //include('include/themeswitcher.php');
-    ?>
-    <!--end switcher-->
     <?php include('jsinclude.php'); ?>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
@@ -184,6 +202,12 @@ error_log("Loaded template: " . print_r($template, true));
             const loader = document.getElementById('loader');
             const errorContainer = document.getElementById('errorContainer');
             const tableContainer = document.getElementById('tableContainer');
+            const routineModal = new bootstrap.Modal(document.getElementById('routineConfirmModal'));
+            const confirmRoutineBtn = document.getElementById('confirmRoutineBtn');
+            const cancelRoutineBtn = document.getElementById('cancelRoutineBtn');
+            let routineData = null;
+            let excelData = null;
+            let responseData = null;
 
             form.addEventListener('submit', function(e) {
                 e.preventDefault();
@@ -202,18 +226,88 @@ error_log("Loaded template: " . print_r($template, true));
                         method: 'POST',
                         body: formData
                     })
-                    .then(response => response.json())
+                    .then(response => {
+                        console.log('Stato risposta:', response.status);
+                        return response.json();
+                    })
                     .then(data => {
+                        console.log('Risposta JSON:', data);
                         loader.style.display = 'none';
                         if (data.error) {
                             errorContainer.textContent = data.error;
                             errorContainer.style.display = 'block';
+                        } else if (data.apply_routine) {
+                            console.log('Routine rilevata:', data.routine_data);
+                            routineData = data.routine_data;
+                            excelData = data.excel_data;
+                            responseData = data;
+                            document.getElementById('routineName').textContent = routineData.name || 'Sconosciuta';
+                            document.getElementById('routineDescription').textContent = routineData.instruction || 'Nessuna descrizione';
+                            routineModal.show();
                         } else {
+                            console.log('Nessuna routine, procedo con tabella');
+                            showTable(data);
+                        }
+                    })
+                    .catch(error => {
+                        console.log('Errore fetch:', error);
+                        loader.style.display = 'none';
+                        errorContainer.textContent = 'Errore durante il caricamento del file: ' + error.message;
+                        errorContainer.style.display = 'block';
+                    });
+            });
+
+            confirmRoutineBtn.addEventListener('click', function() {
+                console.log('Conferma routine:', routineData);
+                routineModal.hide();
+
+                fetch('apply_routine.php', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify({
+                            template_id: <?= $id ?>,
+                            filename: routineData.filename,
+                            headerrow: routineData.headerrow,
+                            excel_data: excelData,
+                            routine_data: routineData
+                        })
+                    })
+                    .then(response => {
+                        console.log('Stato apply_routine:', response.status);
+                        return response.json();
+                    })
+                    .then(data => {
+                        console.log('Risposta apply_routine:', data);
+                        if (data.error) {
+                            errorContainer.textContent = data.error;
+                            errorContainer.style.display = 'block';
+                        } else {
+                            showTable(data);
+                        }
+                    })
+                    .catch(error => {
+                        console.log('Errore apply_routine:', error);
+                        errorContainer.textContent = 'Errore durante l\'applicazione della routine: ' + error.message;
+                        errorContainer.style.display = 'block';
+                    });
+            });
+
+            cancelRoutineBtn.addEventListener('click', function() {
+                console.log('Routine annullata, procedo con tabella');
+                routineModal.hide();
+                showTable(responseData);
+            });
+
+            function showTable(data) {
+                console.log('Mostro tabella con dati:', data);
                 let html = `
                 <form id="selectRowsForm" action="import_insert.php" method="POST">
                     <input type="hidden" name="template_id" value="${data.template_id}">
                     <input type="hidden" name="columns" value='${JSON.stringify(data.columns)}'>
                     <input type="hidden" name="rows" value='${JSON.stringify(data.rows)}'>
+                    <input type="hidden" name="excelrows" value='${JSON.stringify(data.excel_data.map(row => row.excelrow))}'>
                     <input type="hidden" name="filename" value="${data.filename}">
                     <div class="search-container">
                         <input type="text" id="searchInput" class="form-control" placeholder="Cerca nelle righe...">
@@ -227,10 +321,10 @@ error_log("Loaded template: " . print_r($template, true));
                                 </tr>
                             </thead>
                             <tbody>
-                                    ${data.rows.map((row, index) => `
+                                ${data.excel_data.map((row, index) => `
                                     <tr>
-                                            <td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}"></td>
+                                        <td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}" data-excelrow="${row.excelrow}"></td>
-                                            ${row.map(cell => `<td>${cell}</td>`).join('')}
+                                        ${row.data.map(cell => `<td>${cell}</td>`).join('')}
                                     </tr>
                                 `).join('')}
                             </tbody>
@@ -241,17 +335,14 @@ error_log("Loaded template: " . print_r($template, true));
                 `;
                 tableContainer.innerHTML = html;
 
-                            // Inizializza le variabili dopo aver inserito la tabella
                 const proceedButton = document.getElementById('proceedButton');
                 const selectAllCheckbox = document.getElementById('selectAll');
                 const checkboxes = document.querySelectorAll('.row-checkbox');
 
-                            // Funzione per aggiornare lo stato del pulsante Prosegui
                 function updateProceedButton() {
                     proceedButton.disabled = !Array.from(checkboxes).some(cb => cb.checked);
                 }
 
-                            // Event listener per il checkbox "Seleziona tutto"
                 selectAllCheckbox.addEventListener('change', function() {
                     checkboxes.forEach(checkbox => {
                         checkbox.checked = this.checked;
@@ -259,17 +350,14 @@ error_log("Loaded template: " . print_r($template, true));
                     updateProceedButton();
                 });
 
-                            // Event listener per i checkbox delle righe
                 checkboxes.forEach(checkbox => {
                     checkbox.addEventListener('change', function() {
-                                    console.log('Checkbox changed, checked: ', this.checked); // Debug
+                        console.log('Checkbox changed, checked:', this.checked, 'excelrow:', this.dataset.excelrow);
-                                    // Aggiorna lo stato del checkbox "Seleziona tutto"
                         selectAllCheckbox.checked = Array.from(checkboxes).every(cb => cb.checked);
                         updateProceedButton();
                     });
                 });
 
-                            // Aggiungi logica per il ridimensionamento delle colonne
                 const thElements = document.querySelectorAll('.table th');
                 thElements.forEach((th, index) => {
                     if (index === 0) return;
@@ -305,7 +393,6 @@ error_log("Loaded template: " . print_r($template, true));
                     }
                 });
 
-                            // Aggiungi event listener per la ricerca
                 const searchInput = document.getElementById('searchInput');
                 const rows = document.querySelectorAll('.table tbody tr');
 
@@ -317,16 +404,8 @@ error_log("Loaded template: " . print_r($template, true));
                     });
                 });
 
-                            // Abilita il pulsante se ci sono checkbox selezionate all'inizio
                 updateProceedButton();
             }
-                    })
-                    .catch(error => {
-                        loader.style.display = 'none';
-                        errorContainer.textContent = 'Errore durante il caricamento del file: ' + error.message;
-                        errorContainer.style.display = 'block';
-                    });
-            });
         });
     </script>
 </body>

public/userarea/include/headscriptnologin.php

@@ -0,0 +1,25 @@
+<?php
+require_once(__DIR__ . '/../class/db-functions.php');
+
+$db = DBHandlerSelect::getInstance()->getConnection();
+
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL | E_STRICT);
+
+// Inizializza la sessione
+if (session_status() == PHP_SESSION_NONE) {
+    session_start();
+}
+
+// Imposta variabili di sessione di default per evitare errori
+$_SESSION['iduserlogin'] = '1'; // Nessun utente loggato
+$_SESSION['nameuser'] = 'Ospite';
+$_SESSION['surnameuser'] = '';
+$_SESSION['emailuser'] = '';
+$_SESSION['photouser'] = '';
+$photouser = $_SESSION['photouser'];
+$photousername = '';
+$iduserlogin = $_SESSION['iduserlogin'];
+// Include file di lingua, se necessario
+require_once(__DIR__ . '/../../languages/en/general.php');

public/userarea/load_parts.php

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

public/userarea/modal_annotations.php

@@ -0,0 +1,258 @@
+<!-- Modal per la gestione delle annotazioni -->
+<div class="modal fade" id="annotationsModal" tabindex="-1" aria-labelledby="annotationsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl" style="max-width: 90% !important; width: 90% !important;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="annotationsModalLabel">Annotazioni per TRF: <span id="trfHeaderAnnotations"></span></h5>
+
+                <!-- SLIDER PER DIMENSIONE MARKER -->
+                <div style="display: flex; align-items: center; gap: 10px; margin-left: 20px;">
+                    <label for="markerSizeSlider" style="margin: 0; font-size: 0.9rem; white-space: nowrap;">Dimensione marker:</label>
+                    <input type="range" id="markerSizeSlider" min="16" max="48" value="16" step="2" style="width: 120px;">
+                    <span id="markerSizeValue" style="font-weight: bold; min-width: 30px;">24px</span>
+                </div>
+
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <!-- COLONNA SINISTRA RIDOTTA -->
+                    <div class="col-md-6">
+                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+                            <h6 style="margin: 0;">Elenco Parti</h6>
+                            <div style="display: flex; align-items: center;">
+                                <input type="checkbox" id="showMixPartsAnnotations" name="showMixPartsAnnotations" style="margin-right: 5px;">
+                                <label for="showMixPartsAnnotations" style="font-size: 0.9rem;">Mix</label>
+                            </div>
+                        </div>
+                        <ul id="partsListAnnotations" class="list-group" style="max-height: 500px; overflow-y: auto;"></ul>
+                    </div>
+
+                    <!-- COLONNA DESTRA PIÙ GRANDE -->
+                    <div class="col-md-6">
+                        <h6>Foto del Campione</h6>
+                        <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                            <button type="button" class="btn btn-primary btn-sm" id="downloadPhotoBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem; margin-right: 10px;"><i class="fas fa-download"></i></button>
+                            <div id="photoSelectorContainerAnnotations" style="display: none;"></div>
+                        </div>
+                        <div style="position: relative; width: 100%; min-height: 500px; border: 1px solid #ddd; border-radius: 4px; overflow: hidden;">
+                            <img id="samplePhotoAnnotations" src="" alt="Foto del campione" style="max-width: 100%; max-height: 100%; object-fit: contain; position: absolute; top: 0; left: 0;">
+                            <canvas id="photoCanvasAnnotations" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></canvas>
+                            <canvas id="overlayCanvasAnnotations" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 1000;"></canvas>
+                            <div id="descriptionListAnnotations" class="draggable-description" style="display: none;"></div>
+                            <div id="markerContainerAnnotations"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary btn-sm" id="addDescriptionsBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Aggiungi Lista Descrizioni</button>
+                <button type="button" class="btn btn-danger btn-sm" id="removeAnnotationsBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Rimuovi Descrizioni</button>
+                <button type="button" class="btn btn-warning btn-sm" id="undoMarkerBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Undo Marker</button>
+                <button type="button" class="btn btn-success btn-sm" id="savePhotoBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Salva Foto con Nome</button>
+                <button type="button" class="btn btn-primary btn-sm" id="backToPartsBtnAnnotations" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Torna alle Parti</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Chiudi</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    #annotationsModal {
+        z-index: 1070 !important;
+    }
+
+    #annotationsModal .modal-backdrop {
+        z-index: 1065 !important;
+    }
+
+    #annotationsModal .modal-content {
+        width: 100% !important;
+        max-width: 100% !important;
+    }
+
+    #partsListAnnotations .list-group-item {
+        cursor: pointer;
+        transition: background-color 0.2s;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 5px 10px;
+    }
+
+    #partsListAnnotations .list-group-item:hover {
+        background-color: #f5f5f5;
+    }
+
+    #partsListAnnotations .list-group-item.active {
+        background-color: #e9ecef;
+        border-color: #dee2e6;
+    }
+
+    .draggable-description {
+        position: absolute;
+        background: rgba(255, 255, 255, 0.8);
+        padding: 5px;
+        font-family: Arial, sans-serif;
+        color: #000000;
+        cursor: move;
+        user-select: none;
+        z-index: 1000;
+        min-width: 100px;
+        min-height: 50px;
+        overflow: visible;
+        border: 1px solid #ccc;
+    }
+
+    .draggable-description.active-interaction {
+        border: 2px dashed #000;
+    }
+
+    .draggable-description div {
+        white-space: nowrap;
+    }
+
+    .resize-handle {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 10px;
+        height: 10px;
+        background: #888;
+        cursor: se-resize;
+    }
+
+    .draggable-marker {
+        position: absolute;
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        color: #ffffff;
+        text-align: center;
+        line-height: 24px;
+        font-size: 12px;
+        cursor: move;
+        user-select: none;
+        z-index: 1000;
+    }
+
+    #markerContainerAnnotations {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+    }
+
+    #savePhotoBtnAnnotations {
+        transition: all 0.3s ease-in-out;
+    }
+
+    #savePhotoBtnAnnotations.unsaved {
+        background-color: #dc3545 !important;
+        border-color: #dc3545 !important;
+        color: white !important;
+        animation: pulse 1.2s infinite;
+    }
+
+    @keyframes pulse {
+        0% {
+            box-shadow: 0 0 0 0 rgba(220, 53, 69, 0.7);
+        }
+
+        70% {
+            box-shadow: 0 0 10px 15px rgba(220, 53, 69, 0);
+        }
+
+        100% {
+            box-shadow: 0 0 0 0 rgba(220, 53, 69, 0);
+        }
+    }
+
+    .color-picker-container {
+        position: relative;
+        display: inline-block;
+        overflow: visible;
+        z-index: 2000;
+    }
+
+    .color-picker {
+        display: none;
+        position: absolute;
+        right: 0;
+        top: 25px;
+        background: #fff;
+        border: 1px solid #ccc;
+        padding: 5px;
+        z-index: 2000;
+        box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+        flex-wrap: wrap;
+        width: 120px;
+    }
+
+    .color-option {
+        width: 24px;
+        height: 24px;
+        margin: 3px;
+        border: 1px solid #000;
+        cursor: pointer;
+        display: inline-block;
+        pointer-events: auto;
+    }
+
+    .color-option:hover {
+        border: 2px solid #000;
+        margin: 2px;
+    }
+
+    .selected-color {
+        width: 24px;
+        height: 24px;
+        margin-left: 5px;
+        border: 1px solid #000;
+        cursor: pointer;
+        display: inline-block;
+        pointer-events: auto;
+    }
+
+    .selected-color:hover {
+        border: 2px solid #000;
+        margin-left: 4px;
+    }
+
+    .temp-alert {
+        position: absolute;
+        top: 10px;
+        left: 50%;
+        transform: translateX(-50%);
+        z-index: 3000;
+    }
+
+    /* Stile per lo slider */
+    #markerSizeSlider {
+        -webkit-appearance: none;
+        height: 6px;
+        border-radius: 3px;
+        background: #ddd;
+        outline: none;
+    }
+
+    #markerSizeSlider::-webkit-slider-thumb {
+        -webkit-appearance: none;
+        appearance: none;
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #007bff;
+        cursor: pointer;
+    }
+
+    #markerSizeSlider::-moz-range-thumb {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #007bff;
+        cursor: pointer;
+        border: none;
+    }
+</style>

public/userarea/modal_parts.php

@@ -1,4 +1,4 @@
-<!-- Modal modificato con pulsante per riconoscimento vocale e download -->
+<!-- Modal modificato con pulsante per riconoscimento vocale, download e selezione matrici -->
 <div class="modal fade" id="partsModal" tabindex="-1" aria-labelledby="partsModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl" style="max-width: 80% !important; width: 80% !important;">
         <div class="modal-content">
@@ -9,10 +9,12 @@
             <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;">
+                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; min-width: 0;">
                             <h6 style="margin: 0; white-space: nowrap;">Elenco Parti</h6>
-                            <div style="display: flex; align-items: center;">
+                            <div style="display: flex; align-items: center; min-width: 0;">
-                                <input type="checkbox" id="showMixParts" name="showMixParts" style="margin-right: 5px;">
+                                <select id="global-matrice" class="ms-2" style="width: 250px !important; min-width: 250px !important;">
+                                </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>
@@ -51,7 +53,8 @@
                         <div style="position: relative; width: 100%; min-height: 400px;">
                             <img id="samplePhoto" src="" alt="Foto del campione" style="max-width: 100%; max-height: 100%; object-fit: contain; position: absolute; top: 0; left: 0;">
                             <canvas id="photoCanvas" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></canvas>
-                            <canvas id="overlayCanvas" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 1000;"></canvas> <!-- Nuovo canvas per Fabric.js -->
+                            <canvas id="overlayCanvas" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 1000;"></canvas>
+                            <div id="descriptionList" class="draggable-description" style="display: none;"></div>
                             <div id="markerContainer"></div>
                         </div>
                     </div>
@@ -249,4 +252,59 @@
         border: 2px solid #000;
         margin: 2px;
     }
+
+    /* Stili per Select2 in #partsList e #global-matrice */
+    #partsList .select2-container,
+    .select2-container--default #global-matrice {
+        width: 250px !important;
+        min-width: 250px !important;
+        margin-left: 10px;
+    }
+
+    #partsList .select2-selection--single,
+    .select2-container--default #global-matrice .select2-selection--single {
+        height: 26px !important;
+        padding: 0.2rem 0.5rem !important;
+        font-size: 0.9rem !important;
+        border: 1px solid #ced4da !important;
+        background-color: #fff !important;
+    }
+
+    #partsList .select2-selection__rendered,
+    .select2-container--default #global-matrice .select2-selection__rendered {
+        line-height: 24px !important;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
+        white-space: nowrap !important;
+    }
+
+    #partsList .select2-selection__arrow,
+    .select2-container--default #global-matrice .select2-selection__arrow {
+        height: 26px !important;
+    }
+
+    #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/modal_partsTable.php

@@ -0,0 +1,469 @@
+<div class="modal fade" id="partsModal" tabindex="-1" aria-labelledby="partsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl" style="max-width: 80% !important;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="partsModalLabel">Parti per TRF: <span id="trfHeader"></span></h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="row parts-row">
+                    <div class="col-md-9">
+                        <!-- Prima riga: Elenco Parti, Rinumera, Voce -->
+                        <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+                            <h6 style="margin: 0;">Elenco Parti</h6>
+                            <div style="display: flex; align-items: center;">
+                                <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>
+								<button type="button" class="btn btn-primary btn-sm ms-2" id="showHideImageBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">
+									<i class="fas fa-eye-slash" style="font-size: 0.8rem;"></i>
+									<i class="fas fa-image ms-1" style="font-size: 0.8rem;"></i>
+								</button>
+                            </div>
+                        </div>
+                        <!-- Seconda riga: +, M, MacroMatrice, Matrice globale, Propaga -->
+                        <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                            <button type="button" class="btn btn-success btn-sm add-row-global" style="padding: 0.1rem 0.3rem; font-size: 0.8rem; margin-right: 5px;"><i class="fas fa-plus fa-xs"></i></button>
+                            <button type="button" class="btn btn-primary btn-sm add-mix-global" style="padding: 0.1rem 0.3rem; font-size: 0.8rem; margin-right: 10px;">M</button>
+                            <select id="macro-matrice-filter" class="form-control form-control-sm ms-2" style="width: 200px !important; min-width: 200px !important; margin-right: 10px;">
+                                <option value="">Tutte le MacroMatrici</option>
+                            </select>
+                            <select id="global-matrice" class="form-control form-control-sm" style="width: 350px !important; margin-right: 10px;"></select>
+                            <button type="button" class="btn btn-primary btn-sm propagate-all-btn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;"><i class="fas fa-arrow-right fa-xs"></i> Propaga a tutte</button>
+                        </div>
+                        <table class="table table-striped table-sm" id="partsTable">
+                            <thead>
+                                <tr>
+                                    <th style="width: 80px;">Numero</th>
+                                    <th>Descrizione</th>
+                                    <th style="width: 200px;">Matrice</th>
+                                    <th style="width: 150px;">
+                                        <input type="date" class="form-control form-control-sm propagate-date-input" style="width: 130px; margin-left: 5px; display: inline-block;" title="Propaga data a tutte le parti">
+                                    </th>
+                                    <th style="width: 200px;">
+                                        <button type="button" class="btn btn-light btn-sm propagate-note-btn" style="padding: 0.2rem 0.4rem; font-size: 0.9rem; margin-left: 5px;" title="Propaga nota a tutte le parti">
+                                            <i class="fas fa-sticky-note"></i>
+                                        </button>
+                                        Azioni
+
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody id="partsTableBody">
+                                <tr data-part-id="new">
+                                    <td><input type="number" class="form-control form-control-sm part-number" value="1" style="width: 80px;"></td>
+                                    <td><input type="text" class="form-control form-control-sm part-description" placeholder="Inserisci descrizione"></td>
+                                    <td>
+                                        <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>
+                                            <select class="part-matrice form-control form-control-sm" style="width: 150px;"></select>
+                                        </div>
+                                    </td>
+                                    <td><input type="date" class="form-control form-control-sm part-dateexpiry" style="width: 130px;"></td>
+                                    <td>
+                                        <button type="button" class="btn btn-light btn-sm note-btn" style="padding: 0.2rem 0.4rem; font-size: 0.9rem;" title="Aggiungi/Modifica nota"><i class="fas fa-sticky-note"></i></button>
+                                        <button type="button" class="btn btn-warning btn-sm add-mix-row" style="padding: 0.1rem 0.3rem; font-size: 0.8rem;">M+</button>
+                                        <button type="button" class="btn btn-danger btn-sm remove-row" style="padding: 0.1rem 0.3rem; font-size: 0.8rem; display: none;"><i class="fas fa-trash fa-xs"></i></button>
+                                        <span class="save-status text-success" style="display: none; margin-left: 5px;"><i class="fas fa-check fa-xs"></i></span>
+                                        <span class="save-loading text-warning" style="display: none; margin-left: 5px;"><i class="fas fa-spinner fa-spin fa-xs"></i></span>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="col-md-3">
+                        <h6>Foto del Campione</h6>
+                        <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                            <button type="button" class="btn btn-primary btn-sm" id="downloadPhotoBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem; margin-right: 10px;"><i class="fas fa-download"></i></button>
+                            <div id="photoSelectorContainer" style="display: none;"></div>
+                        </div>
+                        <div style="position: relative; width: 100%; min-height: 400px;">
+                            <img id="samplePhoto" src="" alt="Foto del campione" style="max-width: 100%; max-height: 400px; object-fit: contain;">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary btn-sm" id="openAnnotationsBtn">Apri Annotazioni</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Chiudi</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Modale per la nota -->
+<div class="modal fade" id="noteModal" tabindex="-1" aria-labelledby="noteModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-md">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="noteModalLabel">Nota per Parte</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <textarea class="form-control part-note" rows="5" placeholder="Inserisci una nota"></textarea>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Annulla</button>
+                <button type="button" class="btn btn-primary btn-sm save-note-btn">Salva</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="commonNoteModal" tabindex="-1" aria-labelledby="commonNoteModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="commonNoteModalLabel">Nota comune per tutte le parti</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <textarea class="form-control part-note" rows="4" placeholder="Inserisci nota comune"></textarea>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Chiudi</button>
+                <button type="button" class="btn btn-primary save-common-note-btn">Salva</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Modale di conferma per l'eliminazione -->
+<div class="modal fade" id="confirmDeleteModal" tabindex="-1" aria-labelledby="confirmDeleteModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="confirmDeleteModalLabel">Conferma Eliminazione</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                Sei sicuro di voler eliminare questa parte?
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Annulla</button>
+                <button type="button" class="btn btn-danger btn-sm" id="confirmDeleteBtn">Elimina</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    /* --- Base --- */
+    #partsModal {
+        z-index: 1060 !important
+    }
+
+    #partsModal .modal-backdrop {
+        z-index: 1055 !important
+    }
+
+    #partsModal .modal-content {
+        width: 100% !important;
+        max-width: 100% !important
+    }
+
+    /* Tabelle */
+    #partsTable tr {
+        display: table-row !important
+    }
+
+    #partsTable tr:hover {
+        background: #f5f5f5
+    }
+
+    #partsTable td,
+    #partsTable th {
+        padding: .2rem;
+        vertical-align: middle
+    }
+
+    #partsTable input,
+    #partsTable select {
+        height: 24px;
+        padding: .1rem .3rem
+    }
+
+    #partsTable button {
+        padding: .1rem .3rem;
+        margin: 0 2px
+    }
+
+    #partsTable i {
+        font-size: .6rem !important
+    }
+
+    /* --- Larghezze fisse header --- */
+    /* MacroMatrici = 250px */
+    #macro-matrice-filter {
+        width: 250px !important;
+        min-width: 250px !important;
+        max-width: 250px !important;
+        flex: 0 0 250px !important;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    #macro-matrice-filter.select2-hidden-accessible+.select2 {
+        width: 250px !important;
+        min-width: 250px !important;
+        max-width: 250px !important;
+        flex: 0 0 250px !important;
+    }
+
+    #macro-matrice-filter.select2-hidden-accessible+.select2 .select2-selection__rendered {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    /* Matrice globale = 450px */
+    #global-matrice {
+        width: 450px !important;
+        min-width: 450px !important;
+        max-width: 450px !important;
+        flex: 0 0 450px !important;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    #global-matrice.select2-hidden-accessible+.select2 {
+        width: 450px !important;
+        min-width: 450px !important;
+        max-width: 450px !important;
+        flex: 0 0 450px !important;
+    }
+
+    #global-matrice.select2-hidden-accessible+.select2 .select2-selection__rendered {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    /* Select delle righe (colonna Matrice) = 150px */
+    .part-matrice {
+        width: 300px !important;
+        min-width: 300px !important;
+        max-width: 300px !important;
+        flex: 0 0 300px !important;
+    }
+
+    .part-matrice.select2-hidden-accessible+.select2 {
+        width: 300px !important;
+        min-width: 300px !important;
+        max-width: 300px !important;
+        flex: 0 0 300px !important;
+    }
+
+    /* Colonna Descrizione (2ª colonna) = 420px */
+    #partsTable th:nth-child(2),
+    #partsTable td:nth-child(2) {
+        width: 350 !important;
+        min-width: 350px !important;
+        max-width: 350px !important;
+    }
+
+    #partsTable td:nth-child(2) .part-description {
+        width: 100% !important;
+        max-width: 100% !important;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    /* Aspetto Select2 */
+    .select2-container--default .select2-selection--single {
+        height: 24px !important;
+        padding: .1rem .3rem !important;
+        font-size: .8rem !important;
+        border: 1px solid #ced4da !important;
+    }
+
+    .select2-container--default .select2-selection__arrow {
+        height: 24px !important
+    }
+
+    .select2-container--open .select2-dropdown {
+        z-index: 1061 !important;
+        border: 1px solid #aaa !important;
+        border-radius: 4px !important;
+        background: #fff !important;
+        max-height: 200px !important;
+        overflow-y: auto !important;
+    }
+
+    /* Evita stretching del flex nella riga dei filtri */
+    #partsModal .modal-body>.row .col-md-9>div[style*="display: flex"]>* {
+        flex: 0 0 auto;
+    }
+
+    /* Altri modali e pulsanti */
+    .propagate-matrice-btn,
+    .propagate-all-btn {
+        padding: .1rem .3rem !important;
+        font-size: .8rem !important
+    }
+
+    .save-status,
+    .save-loading {
+        margin-left: 5px
+    }
+
+    #confirmDeleteModal {
+        z-index: 1070 !important
+    }
+
+    #confirmDeleteModal .modal-backdrop {
+        z-index: 1065 !important
+    }
+
+    .note-btn {
+        padding: .2rem .4rem !important;
+        font-size: .9rem !important
+    }
+
+    .note-btn.has-note {
+        color: #dc3545 !important
+    }
+
+    #noteModal {
+        z-index: 1090 !important
+    }
+
+    #noteModal .modal-backdrop {
+        z-index: 1085 !important
+    }
+
+    #noteModal .modal-dialog {
+        position: relative;
+        z-index: 1090 !important
+    }
+
+    #noteModal textarea,
+    #commonNoteModal textarea {
+        resize: vertical
+    }
+
+    #commonNoteModal {
+        z-index: 1095 !important
+    }
+
+    #commonNoteModal .modal-backdrop {
+        z-index: 1090 !important
+    }
+
+    #commonNoteModal .modal-dialog {
+        position: relative;
+        z-index: 1095 !important
+    }
+
+    /* Evidenza salvataggio riga nel parts table */
+    /* Aumenta la specificità per le classi di flash */
+    table#partsTable tr.row-saving {
+        background-color: #f0ad4e !important;
+        /* Arancione per salvataggio in corso */
+        transition: background-color 0.3s ease;
+    }
+
+    table#partsTable tr.row-success {
+        background-color: #5cb85c !important;
+        /* Verde per successo */
+        transition: background-color 0.3s ease;
+    }
+
+    table#partsTable tr.row-error {
+        background-color: #d9534f !important;
+        /* Rosso per errore */
+        transition: background-color 0.3s ease;
+    }
+
+    /* Stato base: nascosti (verrà sovrascritto dallo style inline di jQuery) */
+    #partsModal .save-loading,
+    #partsModal .save-status {
+        display: none;
+        align-items: center;
+        gap: 6px;
+        padding: 2px 8px;
+        border-radius: 999px;
+        font-weight: 700;
+        font-size: 12px;
+        line-height: 1.2;
+        margin-left: 5px;
+    }
+
+    /* Quando NON sono nascosti via style inline (jQuery .show()), forzali a inline-flex */
+    #partsModal .save-loading:not([style*="display: none"]),
+    #partsModal .save-status:not([style*="display: none"]) {
+        display: inline-flex;
+    }
+
+    /* Loading (giallo) */
+    /* Loading (giallo) */
+    #partsModal .save-loading {
+        background: #ffd753ff;
+        border: 1px solid #ffd042ff;
+        color: #111;
+        /* testo nero */
+    }
+
+    #partsModal .save-loading i {
+        color: #111;
+    }
+
+    /* icona nera */
+
+    #partsModal .save-loading::after {
+        content: " Salvataggio…";
+        color: #111;
+    }
+
+    /* Salvato (verde) */
+    #partsModal .save-status {
+        background: #5dff83ff;
+        border: 1px solid #4effafff;
+        color: #111;
+        /* testo nero */
+    }
+
+    #partsModal .save-status i {
+        color: #111;
+    }
+
+    /* icona nera */
+    #partsModal .save-status::after {
+        content: " Salvato";
+        color: #111;
+    }
+
+    /* Animazioni */
+    @keyframes pulse {
+
+        0%,
+        100% {
+            transform: scale(1);
+            opacity: .9
+        }
+
+        50% {
+            transform: scale(1.05);
+            opacity: 1
+        }
+    }
+
+    @keyframes pop {
+        0% {
+            transform: scale(.85);
+            opacity: 0
+        }
+
+        100% {
+            transform: scale(1);
+            opacity: 1
+        }
+    }
+
+
+    /* rosso */
+</style>

public/userarea/parts.js

@@ -12,11 +12,13 @@ $(document).ready(function () {
 
     let photoAnnotations = {};
     let partColors = {};
+    let partMatrice = {};
     let selectedPartNumber = null;
     let unsavedChanges = false;
     let fabricCanvas = null;
     let descriptionTextbox = null;
     let markerObjects = {};
+    let matrici = [];
 
     // ===================
     // VOICE RECOGNITION SETUP
@@ -137,22 +139,83 @@ $(document).ready(function () {
             .data("iddatadb", iddatadb)
             .data("idquotations", idquotations);
 
+        // Precarica le matrici se iddatadb (assumendo matrici solo per iddatadb)
+        if (iddatadb) {
+            if (matrici.length === 0) {
+                $.ajax({
+                    url: "get_matrici_db.php",
+                    method: "GET",
+                    dataType: "json",
+                    success: function (data) {
+                        matrici = data.value || [];
+                        initializeGlobalSelect2();
                         loadPhoto(iddatadb, idquotations);
                         loadExistingParts(iddatadb, idquotations);
-
+                    },
-        const modal = new bootstrap.Modal(
+                    error: function (xhr, status, error) {
-            document.getElementById("partsModal"),
+                        matrici = [];
+                        initializeGlobalSelect2();
+                        loadPhoto(iddatadb, idquotations);
+                        loadExistingParts(iddatadb, idquotations);
+                        const errorMsg = $(
+                            '<div class="alert alert-danger temp-alert" role="alert">Errore nel caricamento delle matrici: ' +
+                                error +
+                                " (" +
+                                xhr.status +
+                                ")</div>",
                         );
+                        $("#partsModal .modal-body").prepend(errorMsg);
+                        setTimeout(function () {
+                            errorMsg.fadeOut(500, function () {
+                                $(this).remove();
+                            });
+                        }, 5000);
+                    },
+                });
+            } else {
+                initializeGlobalSelect2();
+                loadPhoto(iddatadb, idquotations);
+                loadExistingParts(iddatadb, idquotations);
+            }
+        } else {
+            loadPhoto(iddatadb, idquotations);
+            loadExistingParts(iddatadb, idquotations);
+        }
+
+        const modalElement = document.getElementById("partsModal");
+        if (modalElement) {
+            // Verifica se il modale è già stato inizializzato
+            let modal = bootstrap.Modal.getInstance(modalElement);
+            if (!modal) {
+                modal = new bootstrap.Modal(modalElement, {
+                    backdrop: true,
+                    keyboard: true,
+                    focus: true,
+                });
+            }
             modal.show();
+        } else {
+            console.error("Elemento modale non trovato: #partsModal");
+            const errorMsg = $(
+                '<div class="alert alert-danger temp-alert" role="alert">Errore: Modale non trovato.</div>',
+            );
+            $("body").prepend(errorMsg);
+            setTimeout(function () {
+                errorMsg.fadeOut(500, function () {
+                    $(this).remove();
+                });
+            }, 5000);
+        }
     });
 
     $("#partsModal .close-btn, #partsModal").on("click", function (event) {
-        if (event.target === this) {
+        if (event.target === this || $(event.target).hasClass("close-btn")) {
-            const modal = bootstrap.Modal.getInstance(
+            const modalElement = document.getElementById("partsModal");
-                document.getElementById("partsModal"),
+            const modal = bootstrap.Modal.getInstance(modalElement);
-            );
+            if (modal) {
                 modal.hide();
             }
+        }
     });
 
     $("#partsModal").on("hide.bs.modal", function (e) {
@@ -165,7 +228,7 @@ $(document).ready(function () {
     });
 
     $("#partsModal").on("hidden.bs.modal", function () {
-        // Reset global state to initial values
+        // Resetta lo stato
         photoData = {
             naturalWidth: 0,
             naturalHeight: 0,
@@ -175,21 +238,33 @@ $(document).ready(function () {
         };
         photoAnnotations = {};
         partColors = {};
+        partMatrice = {};
         selectedPartNumber = null;
         unsavedChanges = false;
         if (fabricCanvas) {
-            fabricCanvas.off(); // Rimuove tutti gli eventi
+            fabricCanvas.off();
             fabricCanvas.dispose();
             fabricCanvas = null;
         }
         descriptionTextbox = null;
         markerObjects = {};
-        // Clear UI elements
+        matrici = [];
         $("#photoSelectorContainer").empty().hide();
         $("#samplePhoto").attr("src", "");
         $("#partsTableBody").empty();
-        // Remove any temporary messages
+        $("#global-matrice").empty();
         $(".temp-alert").remove();
+
+        // Rimuovi manualmente il backdrop e ripristina il body
+        const modalElement = document.getElementById("partsModal");
+        const modal = bootstrap.Modal.getInstance(modalElement);
+        if (modal) {
+            modal.dispose(); // Distrugge l'istanza del modale
+        }
+        $(".modal-backdrop").remove();
+        $("body").removeClass("modal-open");
+        $("body").css("padding-right", "");
+        $(":focus").blur();
     });
 
     // ===================
@@ -535,6 +610,7 @@ $(document).ready(function () {
                     if (response.success) {
                         $row.remove();
                         delete partColors[partNumber];
+                        delete partMatrice[partNumber];
                         if (markerObjects[partNumber]) {
                             fabricCanvas.remove(markerObjects[partNumber]);
                             delete markerObjects[partNumber];
@@ -576,6 +652,7 @@ $(document).ready(function () {
         } else {
             $row.remove();
             delete partColors[partNumber];
+            delete partMatrice[partNumber];
             if (markerObjects[partNumber]) {
                 fabricCanvas.remove(markerObjects[partNumber]);
                 delete markerObjects[partNumber];
@@ -717,6 +794,9 @@ $(document).ready(function () {
                             </tr>`;
                         $("#partsTableBody").append(newRow);
                         partColors[part.part_number] = defaultColor;
+                        if (part.idmatrice) {
+                            partMatrice[part.part_number] = part.idmatrice;
+                        }
                     });
                 } else {
                     addNewRow(1);
@@ -743,6 +823,163 @@ $(document).ready(function () {
         });
     }
 
+    // Funzione per inizializzare Select2 sulle tendine delle matrici
+    function initializeSelect2($select, partNumber, partId, idmatrice) {
+        if (typeof $.fn.select2 === "undefined") {
+            $select.replaceWith(
+                '<input type="text" class="form-control form-control-sm" placeholder="Select2 non disponibile" disabled>',
+            );
+            return;
+        }
+
+        const options = matrici.map(function (matrice) {
+            return {
+                id: matrice.IdMatrice,
+                text: matrice.NomeMatrice, // Updated to use NomeMatrice
+            };
+        });
+
+        $select.select2({
+            placeholder: "Seleziona matrice",
+            allowClear: true,
+            data: options,
+            dropdownParent: $("#partsModal"),
+            matcher: function (params, data) {
+                if (!params.term || params.term.length < 3) {
+                    return data;
+                }
+                const term = params.term.toUpperCase();
+                if (data.text.toUpperCase().indexOf(term) >= 0) {
+                    return data;
+                }
+                return null;
+            },
+        });
+
+        if (partId && partId !== "new" && idmatrice) {
+            const matrice = matrici.find((m) => m.IdMatrice == idmatrice);
+            if (matrice) {
+                const option = new Option(
+                    matrice.NomeMatrice, // Updated to use NomeMatrice
+                    matrice.IdMatrice,
+                    true,
+                    true,
+                );
+                $select.append(option).trigger("change");
+                partMatrice[partNumber] = matrice.IdMatrice;
+            }
+        }
+
+        $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");
+
+            partMatrice[partNumber] = idmatrice || null;
+
+            if (partId && partId !== "new") {
+                $saveLoading.show();
+                $saveStatus.hide();
+
+                const iddatadb = $("#partsModal").data("iddatadb");
+                const idquotations = $("#partsModal").data("idquotations");
+                const endpoint = idquotations
+                    ? "save_matrice_quotation.php"
+                    : "save_matrice.php";
+                const data = idquotations
+                    ? { idquotations: idquotations }
+                    : { iddatadb: iddatadb };
+
+                $.ajax({
+                    url: endpoint,
+                    method: "POST",
+                    data: JSON.stringify({
+                        ...data,
+                        parts: [
+                            {
+                                id: partId,
+                                idmatrice: idmatrice || null,
+                            },
+                        ],
+                    }),
+                    contentType: "application/json",
+                    success: function (response) {
+                        if (response.success) {
+                            $saveLoading.hide();
+                            $saveStatus.show();
+                            setTimeout(() => $saveStatus.hide(), 2000);
+                        } else {
+                            const errorMsg = $(
+                                '<div class="alert alert-danger temp-alert" role="alert">Errore nel salvataggio della matrice: ' +
+                                    response.message +
+                                    "</div>",
+                            );
+                            $("#partsModal .modal-body").prepend(errorMsg);
+                            setTimeout(function () {
+                                errorMsg.fadeOut(500, function () {
+                                    $(this).remove();
+                                });
+                            }, 5000);
+                            $saveLoading.hide();
+                        }
+                    },
+                    error: function (xhr, status, error) {
+                        const errorMsg = $(
+                            '<div class="alert alert-danger temp-alert" role="alert">Errore nel salvataggio della matrice: ' +
+                                error +
+                                " (" +
+                                xhr.status +
+                                ")</div>",
+                        );
+                        $("#partsModal .modal-body").prepend(errorMsg);
+                        setTimeout(function () {
+                            errorMsg.fadeOut(500, function () {
+                                $(this).remove();
+                            });
+                        }, 5000);
+                        $saveLoading.hide();
+                    },
+                });
+            }
+        });
+    }
+
+    // Funzione per inizializzare Select2 sul dropdown globale
+    function initializeGlobalSelect2() {
+        const $select = $("#global-matrice");
+        if (typeof $.fn.select2 === "undefined") {
+            $select.replaceWith(
+                '<input type="text" class="form-control form-control-sm" placeholder="Select2 non disponibile" disabled>',
+            );
+            return;
+        }
+
+        const options = matrici.map(function (matrice) {
+            return {
+                id: matrice.IdMatrice,
+                text: matrice.NomeMatrice, // Updated to use NomeMatrice
+            };
+        });
+
+        $select.select2({
+            placeholder: "Seleziona matrice globale",
+            allowClear: true,
+            data: options,
+            dropdownParent: $("#partsModal"),
+            matcher: function (params, data) {
+                if (!params.term || params.term.length < 3) {
+                    return data;
+                }
+                const term = params.term.toUpperCase();
+                if (data.text.toUpperCase().indexOf(term) >= 0) {
+                    return data;
+                }
+                return null;
+            },
+        });
+    }
+
     // ===================
     // PARTS LIST
     // ===================
@@ -763,6 +1000,7 @@ $(document).ready(function () {
         $("#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");
@@ -778,17 +1016,30 @@ $(document).ready(function () {
                     )
                     .join("");
                 const listItem = `
-                    <li class="list-group-item" data-part-number="${partNumber}">
+                    <li class="list-group-item" data-part-number="${partNumber}" data-part-id="${partId}">
                         ${partNumber} - ${partDescription}
                         <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>
+                            <select class="part-matrice" style="width: 250px !important; margin-right: 10px;"></select>
                             <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-picker-container">
                                 <div class="color-option selected-color" style="background-color: ${partColor}; margin-left: 5px;"></div>
                                 <div class="color-picker">${colorOptions}</div>
                             </div>
+                            <span class="save-status text-success" style="display: none; margin-left: 5px;"><i class="fas fa-check fa-xs"></i></span>
+                            <span class="save-loading text-warning" style="display: none; margin-left: 5px;"><i class="fas fa-spinner fa-spin fa-xs"></i></span>
                         </div>
                     </li>`;
                 $("#partsList").append(listItem);
+                const $select = $("#partsList").find(
+                    `li[data-part-number="${partNumber}"] .part-matrice`,
+                );
+                initializeSelect2(
+                    $select,
+                    partNumber,
+                    partId,
+                    partMatrice[partNumber],
+                );
             }
         });
 
@@ -862,11 +1113,32 @@ $(document).ready(function () {
         }
     });
 
+    $(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 {
+            const errorMsg = $(
+                '<div class="alert alert-danger temp-alert" role="alert">Seleziona una matrice globale prima di propagare.</div>',
+            );
+            $("#partsModal .modal-body").prepend(errorMsg);
+            setTimeout(function () {
+                errorMsg.fadeOut(500, function () {
+                    $(this).remove();
+                });
+            }, 5000);
+        }
+    });
+
     $("#partsList").on("click", "li", function (e) {
         if (
             $(e.target).hasClass("add-to-mix-btn") ||
             $(e.target).hasClass("color-option") ||
-            $(e.target).closest(".color-picker-container").length
+            $(e.target).closest(".color-picker-container").length ||
+            $(e.target).hasClass("part-matrice") ||
+            $(e.target).closest(".select2-container").length ||
+            $(e.target).hasClass("propagate-matrice-btn")
         )
             return;
         selectedPartNumber = $(this).data("part-number");
@@ -892,6 +1164,7 @@ $(document).ready(function () {
             ? { idquotations: idquotations }
             : { iddatadb: iddatadb };
         let newPartColors = {};
+        let newPartMatrice = {};
         let newMarkerObjects = {};
 
         let partsData = $rows
@@ -908,6 +1181,7 @@ $(document).ready(function () {
         partsData.forEach((part, index) => {
             const newNumber = index + 1;
             newPartColors[newNumber] = partColors[part.partNumber] || "#ff0000";
+            newPartMatrice[newNumber] = partMatrice[part.partNumber] || null;
             if (markerObjects[part.partNumber]) {
                 newMarkerObjects[newNumber] = markerObjects[part.partNumber];
             }
@@ -934,6 +1208,7 @@ $(document).ready(function () {
         }
 
         partColors = newPartColors;
+        partMatrice = newPartMatrice;
         markerObjects = newMarkerObjects;
 
         const partsToSave = partsData.map((part) => ({
@@ -941,6 +1216,7 @@ $(document).ready(function () {
             part_number: part.partNumber,
             part_description: part.partDescription,
             mix: part.partDescription.startsWith("Mix") ? "Y" : "N",
+            idmatrice: partMatrice[part.partNumber] || null,
         }));
 
         $.ajax({
@@ -1157,7 +1433,7 @@ $(document).ready(function () {
             width: annotations.descriptionSize.width,
             scaleX: 1,
             scaleY: 1,
-            backgroundColor: "rgba(255, 255, 255, 0.8)",
+            backgroundColor: "rgba(255, 255, 255, 0)", // Changed to fully transparent
             fontFamily: "Arial",
             fontSize: 24,
             fill: "#000000",

public/userarea/photos.js

@@ -185,13 +185,21 @@ document.addEventListener("DOMContentLoaded", function () {
             return;
         }
 
-        for (const file of files) {
+        loader.style.display = "flex";
+        console.log(`Inizio upload di ${files.length} file`);
+
+        let successCount = 0;
+        let errorMessages = [];
+        let uploadPromises = [];
+
+        for (let i = 0; i < files.length; i++) {
+            const file = files[i];
             if (!file.type.startsWith("image/")) {
-                alert("Per favore, carica solo immagini!");
+                alert(`File ${file.name} non è un'immagine, saltato!`);
                 continue;
             }
 
-            loader.style.display = "flex";
+            console.log(`Preparazione upload file ${i + 1}: ${file.name}`);
 
             const formData = new FormData();
             formData.append("photo", file);
@@ -201,23 +209,43 @@ document.addEventListener("DOMContentLoaded", function () {
                 formData.append("iddatadb", iddatadb);
             }
 
-            try {
+            const uploadPromise = fetch("upload_photo.php", {
-                const response = await fetch("upload_photo.php", {
                 method: "POST",
                 body: formData,
-                });
+            })
-                const result = await response.json();
+                .then((response) => response.json())
+                .then((result) => {
                     if (result.success) {
-                    loadPopupContent(iddatadb, idquotations);
+                        successCount++;
+                        console.log(`Successo per ${file.name}`);
                     } else {
-                    alert("Errore durante il caricamento: " + result.message);
+                        errorMessages.push(
+                            `Errore per ${file.name}: ${result.message}`,
+                        );
                     }
-            } catch (error) {
+                })
-                alert("Errore durante il caricamento: " + error.message);
+                .catch((error) => {
-            } finally {
+                    errorMessages.push(
+                        `Errore per ${file.name}: ${error.message}`,
+                    );
+                });
+
+            uploadPromises.push(uploadPromise);
+        }
+
+        await Promise.all(uploadPromises);
+
         loader.style.display = "none";
+        console.log(
+            `Fine upload: ${successCount} riusciti, ${errorMessages.length} errori`,
+        );
+
+        if (errorMessages.length > 0) {
+            alert("Errori durante l'upload:\n" + errorMessages.join("\n"));
         }
-        }
+
+        // Ricarica sempre alla fine per aggiornare la lista, anche se parziale successo
+        loadPopupContent(iddatadb, idquotations);
     }
 
     function attachPhotoEventListeners(iddatadb, idquotations) {

public/userarea/process_edit_template_xls.php

@@ -21,6 +21,10 @@ try {
     $idschema = intval($_POST['idschema'] ?? 0); // Nuovo campo
     $schemaname = trim($_POST['schemaname'] ?? ''); // Corretto da schemamaname
     $idroutine = isset($_POST['idroutine']) && $_POST['idroutine'] !== '' ? intval($_POST['idroutine']) : null; // Aggiunto idroutine
+    $button_size = trim($_POST['button_size'] ?? 'medium'); // Nuovo campo
+    $button_bg_color = trim($_POST['button_bg_color'] ?? '#007bff'); // Nuovo campo
+    $button_text_color = trim($_POST['button_text_color'] ?? '#ffffff'); // Nuovo campo
+    $button_label = trim($_POST['button_label'] ?? 'Click Me'); // Nuovo campo
 
     // Controllo sui campi obbligatori
     if (empty($id) || empty($name) || empty($header_row) || empty($start_column) || empty($target_table) || $idschema <= 0) {
@@ -36,10 +40,12 @@ try {
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
-    // Aggiorna il database, includendo idschema, schemaname e idroutine
+    // Aggiorna il database, includendo i nuovi campi
     $stmt = $pdo->prepare("UPDATE excel_templates 
                            SET name = ?, header_row = ?, start_column = ?, description = ?, target_table = ?, 
-                               idclient = ?, clientname = ?, schemaname = ?, idschema = ?, idroutine = ?, updated_at = NOW() 
+                               idclient = ?, clientname = ?, schemaname = ?, idschema = ?, idroutine = ?, 
+                               button_size = ?, button_bg_color = ?, button_text_color = ?, button_label = ?, 
+                               updated_at = NOW() 
                            WHERE id = ?");
     $stmt->execute([
         $name,
@@ -52,6 +58,10 @@ try {
         $schemaname,
         $idschema,
         $idroutine,
+        $button_size,
+        $button_bg_color,
+        $button_text_color,
+        $button_label,
         $id
     ]);
 

public/userarea/process_import_xls2.php

@@ -1,7 +1,7 @@
 <?php
 // Sopprime eventuali output di errori (li logghiamo invece di mostrarli)
 ob_start();
-ini_set('display_errors', 0); // Disattiva l'output degli errori a schermo
+ini_set('display_errors', 0);
 error_reporting(E_ALL);
 
 // Inizia la sessione
@@ -9,9 +9,9 @@ session_start();
 
 // Includi PHPSpreadsheet e la classe DBHandler
 require_once '../../vendor/autoload.php';
-require_once __DIR__ . '/class/db-functions.php'; // Assumo che DBHandlerSelect sia qui
+require_once __DIR__ . '/class/db-functions.php';
 
-$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => ''];
+$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '', 'apply_routine' => false];
 
 try {
     if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_FILES['excel_file'])) {
@@ -29,7 +29,7 @@ try {
         if ($fileError === UPLOAD_ERR_OK) {
             // Recupera l'ID dell'utente loggato
             if (!isset($iduserlogin)) {
-                $iduserlogin = 1; // Valore di default
+                $iduserlogin = 1;
                 error_log("Warning: iduserlogin non definito, usando 1 come default");
             }
 
@@ -69,7 +69,7 @@ try {
                 $worksheet = $spreadsheet->getActiveSheet();
                 $highestRow = $worksheet->getHighestRow();
                 $highestColumn = $worksheet->getHighestColumn();
-                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn); // Corretto
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
 
                 $startRow = max(1, $header_row);
                 $startColumn = max(1, $start_column);
@@ -93,7 +93,7 @@ try {
                         $headerRowData[] = htmlspecialchars($cellValue ?: '');
                     }
 
-                    // Estrai i dati a partire dalla riga successiva
+                    // Estrai i dati a partire dalla riga successiva, includendo excelrow
                     for ($row = $startRow + 1; $row <= $highestRow; $row++) {
                         $rowData = [];
                         for ($col = $startColumn; $col <= $highestColumnIndex; $col++) {
@@ -103,18 +103,49 @@ try {
                             $rowData[] = htmlspecialchars($cellValue ?: '');
                         }
                         if (!empty(array_filter($rowData))) {
-                            $excelData[] = $rowData;
+                            $excelData[] = ['data' => $rowData, 'excelrow' => $row];
                         }
                     }
 
+                    // Recupera routine dal template
+                    $stmt = $pdo->prepare("SELECT idroutine, idclient FROM excel_templates WHERE id = ?");
+                    $stmt->execute([$template_id]);
+                    $template = $stmt->fetch(PDO::FETCH_ASSOC);
+
+                    if ($template && $template['idroutine']) {
+                        $stmtRoutine = $pdo->prepare("SELECT idroutine, name, filename, headerrow, instruction FROM routine WHERE idroutine = ?");
+                        $stmtRoutine->execute([$template['idroutine']]);
+                        $routineData = $stmtRoutine->fetch(PDO::FETCH_ASSOC);
+
+                        if ($routineData) {
+                            $response['apply_routine'] = true;
+                            $response['routine_data'] = [
+                                'name' => $routineData['name'] ?? 'Routine Sconosciuta',
+                                'instruction' => $routineData['instruction'] ?? 'Nessuna descrizione disponibile',
+                                'filename' => $routineData['filename'] ?? '',
+                                'headerrow' => $routineData['headerrow'] ?? $header_row
+                            ];
+                            error_log("Routine rilevata per template {$template_id}: " . print_r($routineData, true));
+                        } else {
+                            error_log("Errore: Nessuna routine trovata per idroutine {$template['idroutine']}");
+                        }
+                    } else {
+                        error_log("Nessuna routine associata al template {$template_id}");
+                    }
+
+                    // Aggiungi idclient alla risposta
+                    $response['idclient'] = $template['idclient'] ?? null;
+
                     // Salva i dati in sessione
                     $_SESSION['excel_data'] = $excelData;
                     $_SESSION['template_id'] = $template_id;
                     $_SESSION['headers'] = $headerRowData;
-                    $_SESSION['mappings'] = $mappings; // Salva i mapping per l'importazione
+                    $_SESSION['mappings'] = $mappings;
 
-                    $response['rows'] = $excelData;
+                    // Includi excel_data nella risposta JSON in ogni caso
-                    $response['columns'] = $headerRowData; // Usa gli header reali
+                    $response['excel_data'] = $excelData;
+                    $response['rows'] = array_column($excelData, 'data');
+                    $response['columns'] = $headerRowData;
                     $response['template_id'] = $template_id;
                     $response['filename'] = $newFilename;
                 }

public/userarea/quotations.php

@@ -399,14 +399,18 @@ if (isset($_GET['edit_id'])) {
         <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
         <?php include('include/footer.php'); ?>
     </div>
-    <?php include('modal_parts.php'); ?>
+    <div id="partsModalContainer"></div>
-    <?php include('photos_functions.php'); ?>
+    <div id="annotationsModalContainer"></div>
+    <?php include 'photos_functions.php'; ?>
+
     <?php include('jsinclude.php'); ?>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
     <script src="photos.js"></script>
-    <script src="parts.js"></script>
+    <script src="annotationsModal.js"></script>
+    <script src="partsTable.js"></script>
+
     <script>
         document.addEventListener("DOMContentLoaded", function() {
             // Mostra messaggi di stato se presenti
@@ -423,6 +427,45 @@ if (isset($_GET['edit_id'])) {
                 }, 5000);
             }
 
+            $(document).on('click', '.parts-btn', function() {
+                const idquotations = $(this).data('idquotations');
+                $.ajax({
+                    url: 'modal_partsTable.php',
+                    method: 'GET',
+                    data: {
+                        idquotations: idquotations
+                    },
+                    success: function(response) {
+                        $('#partsModalContainer').html(response);
+                        const modalElement = document.getElementById('partsModal');
+                        if (!modalElement) return;
+                        $("#trfHeader").text(`Quotation #${idquotations}`);
+                        $("#partsModal").data("idquotations", idquotations);
+                        let modal = bootstrap.Modal.getInstance(modalElement) || new bootstrap.Modal(modalElement, {
+                            backdrop: true
+                        });
+                        modal.show();
+                        if (typeof window.loadParts === 'function') window.loadParts(null, idquotations);
+                    },
+                    error: function(xhr, status, error) {
+                        alert('Errore nel caricamento del modale: ' + error);
+                    }
+                });
+            });
+
+            $(document).on('hidden.bs.modal', '#partsModal', function() {
+                $('#partsModalContainer').empty();
+                $('.modal-backdrop').remove();
+                $('body').removeClass('modal-open').css('padding-right', '');
+            });
+
+            $(document).on('hidden.bs.modal', '#annotationsModal', function() {
+                $('#annotationsModalContainer').empty();
+                $('.modal-backdrop').remove();
+                $('body').removeClass('modal-open').css('padding-right', '');
+            });
+
+
             // Inizializza DataTables se non siamo in modalità modifica
             if (!document.querySelector('#editForm')) {
                 $('#quotationsTable').DataTable({
@@ -524,12 +567,7 @@ if (isset($_GET['edit_id'])) {
     </script>
 
     <!-- Modale per le foto in quotations.php -->
-    <div class="modal" id="photosModal">
+
-        <div class="modal-content">
-            <span class="close-btn">&times;</span>
-            <div class="popup-content"></div>
-        </div>
-    </div>
 
 </body>
 

public/userarea/routines/moncler.php

@@ -0,0 +1,108 @@
+<?php
+ini_set('log_errors', 1);
+ini_set('error_log', __DIR__ . '/routine_debug.log');
+
+function applyRoutine(&$excelData, $routineData)
+{
+    try {
+        // Log iniziale
+        error_log("Inizio esecuzione routine Moncler: " . date('Y-m-d H:i:s'));
+        error_log("Dati routine: " . print_r($routineData, true));
+        error_log("Dati excel_data: " . print_r($excelData, true));
+
+        // Verifica se excelData è vuoto
+        if (empty($excelData)) {
+            throw new Exception("excelData è vuoto o non valido.");
+        }
+
+        // Estrai informazioni dalla routine con valori predefiniti
+        $action1 = trim($routineData['action1'] ?? 'K');
+        $action2 = trim($routineData['action2'] ?? 'STYLE CODE + STYLE DESCRIPTION');
+        $action3 = trim($routineData['action3'] ?? 'STYLE CODE');
+        $action4 = trim($routineData['action4'] ?? 'STYLE DESCRIPTION');
+        $headers = $routineData['xls_headers'] ?? [];
+
+        if (empty($headers)) {
+            throw new Exception("Nessun header trovato per la routine Moncler.");
+        }
+        error_log("Header ricevuti: " . print_r($headers, true));
+
+        // Normalizza gli header (solo trim)
+        $normalized_headers = array_map('trim', $headers);
+        error_log("Header normalizzati: " . print_r($normalized_headers, true));
+        error_log("Action values - action1: '$action1', action2: '$action2', action3: '$action3', action4: '$action4'");
+
+        // Trova gli indici delle colonne
+        $action1_index = array_search($action1, $normalized_headers);
+        $action2_index = array_search($action2, $normalized_headers);
+        $action3_index = array_search($action3, $normalized_headers);
+        $action4_index = array_search($action4, $normalized_headers);
+
+        if ($action1_index === false || $action2_index === false || $action3_index === false || $action4_index === false) {
+            throw new Exception("Colonne non trovate - action1: '$action1' (index: " . var_export($action1_index, true) . "), action2: '$action2' (index: " . var_export($action2_index, true) . "), action3: '$action3' (index: " . var_export($action3_index, true) . "), action4: '$action4' (index: " . var_export($action4_index, true) . ")");
+        }
+
+        error_log("Indici colonne - action1: $action1_index, action2: $action2_index, action3: $action3_index, action4: $action4_index");
+
+        // Raggruppa le righe per il valore in action1 (colonna K)
+        $grouped_data = [];
+        foreach ($excelData as $row) {
+            if (!isset($row['data']) || !is_array($row['data'])) {
+                error_log("Riga non valida, manca 'data' per excelrow {$row['excelrow']}");
+                continue;
+            }
+            $key = $row['data'][$action1_index] ?? '';
+            $key = empty($key) ? '_empty_' : $key;
+            if (!isset($grouped_data[$key])) {
+                $grouped_data[$key] = [
+                    'data' => $row['data'],
+                    'excelrow' => [$row['excelrow']],
+                    'style_codes' => [],
+                    'style_descriptions' => []
+                ];
+            } else {
+                $grouped_data[$key]['excelrow'][] = $row['excelrow'];
+            }
+
+            // Separa il valore in action2 (STYLE CODE + STYLE DESCRIPTION)
+            $action2_value = $row['data'][$action2_index] ?? '';
+            if (!empty($action2_value)) {
+                $parts = explode(' - ', trim($action2_value));
+                $style_code = $parts[0] ?? '';
+                $style_description = $parts[1] ?? '';
+                if (!empty($style_code)) {
+                    $grouped_data[$key]['style_codes'][] = $style_code;
+                }
+                if (!empty($style_description)) {
+                    $grouped_data[$key]['style_descriptions'][] = $style_description;
+                }
+            } else {
+                error_log("Valore vuoto in action2 per excelrow {$row['excelrow']}");
+            }
+        }
+
+        // Crea il nuovo array excel_data aggregato
+        $new_excel_data = [];
+        foreach ($grouped_data as $key => $group) {
+            $row_data = $group['data'];
+            // Aggiorna action3 (STYLE CODE) e action4 (STYLE DESCRIPTION) con valori aggregati
+            $row_data[$action3_index] = implode(' - ', array_unique($group['style_codes']));
+            $row_data[$action4_index] = implode(' - ', array_unique($group['style_descriptions']));
+            // Concatena gli excelrow con '+' per le righe aggregate
+            $excelrow_value = count($group['excelrow']) > 1 ? implode('+', $group['excelrow']) : $group['excelrow'][0];
+            $new_excel_data[] = [
+                'data' => $row_data,
+                'excelrow' => $excelrow_value
+            ];
+        }
+
+        // Modifica excelData in-place
+        $excelData = $new_excel_data;
+
+        error_log("Routine Moncler completata - Righe aggregate: " . count($new_excel_data));
+        error_log("Excelrow aggregati: " . print_r(array_column($new_excel_data, 'excelrow'), true));
+    } catch (Exception $e) {
+        error_log("Eccezione nella routine Moncler: " . $e->getMessage());
+        throw $e;
+    }
+}

public/userarea/save_edited_row.php

@@ -11,13 +11,14 @@ try {
     }
 
     $iddatadb = intval($_POST['iddatadb']);
+    $idclient = isset($_POST['idclient']) ? (is_numeric($_POST['idclient']) ? intval($_POST['idclient']) : null) : null;
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
     $data = $_POST;
     $details = [];
 
-    // 1. POST-დან ამოვიღოთ მხოლოდ details
+    // 1. Estrarre i dettagli da POST
     foreach ($data as $key => $value) {
         if (preg_match('/^details(\d+)field_value$/', $key, $matches)) {
             $id = $matches[1];
@@ -25,16 +26,15 @@ try {
         }
     }
 
-    // 2. DB-დან წამოვიღოთ არსებული მნიშვნელობები
+    // 2. Recupera i valori esistenti da import_data_details
     $stmt = $pdo->prepare("SELECT mapping_id, field_value FROM import_data_details WHERE id = ?");
     $stmt->execute([$iddatadb]);
-
     $currentValues = [];
     while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
         $currentValues[$row['mapping_id']] = $row['field_value'];
     }
 
-    // 3. შევადაროთ POST-ს და DB-ს
+    // 3. Confronta i valori nuovi con quelli esistenti
     $changed = [];
     foreach ($details as $id => $newValue) {
         $oldValue = $currentValues[$id] ?? null;
@@ -46,7 +46,7 @@ try {
         }
     }
 
-    // 4. თუ არის ცვლილებები → UPDATE
+    // 4. Aggiorna i dettagli se ci sono modifiche
     if (!empty($changed)) {
         $updateStmt = $pdo->prepare("
             UPDATE import_data_details
@@ -61,14 +61,26 @@ try {
                 ':mappingId'  => $mappingId
             ]);
         }
+    }
+
+    // 5. Aggiorna idclient in datadb
+    if (isset($idclient)) {
+        $updateStmt = $pdo->prepare("
+            UPDATE datadb
+            SET idclient = :idclient
+            WHERE iddatadb = :iddatadb
+        ");
+        $updateStmt->execute([
+            ':idclient'   => $idclient,
+            ':iddatadb'   => $iddatadb
+        ]);
+        $response['message'] = !empty($changed) ? "Updated details and idclient successfully" : "Updated idclient successfully";
+    } else {
+        $response['message'] = !empty($changed) ? "Updated details successfully" : "No changes found";
+    }
 
     $response['success'] = true;
-        $response['message'] = "Updated successfully";
     $response['changed'] = $changed; // Debug / optional
-    } else {
-        $response['success'] = true;
-        $response['message'] = "No changes found";
-    }
 
 } catch (Exception $e) {
     $response['success'] = false;

public/userarea/save_matrice.php

@@ -0,0 +1,39 @@
+<?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 parte mancante']);
+    exit;
+}
+
+try {
+    $stmt = $pdo->prepare("UPDATE identification_parts
+        SET idmatrice = :idmatrice,
+            updated_at = NOW()
+        WHERE id = :id");
+    $stmt->execute([
+        ':id' => $partId,
+        ':idmatrice' => $idmatrice // Può essere NULL
+    ]);
+    echo json_encode(['success' => true, 'message' => 'Matrice aggiornata con successo']);
+} catch (PDOException $e) {
+    echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio della matrice: ' . $e->getMessage()]);
+}

public/userarea/save_parts.php

@@ -15,46 +15,64 @@ if (!$iddatadb || empty($parts)) {
     exit;
 }
 
-$part = $parts[0];
+try {
-$partId = $part['id'] ?? null;   // part_id თუ არსებობს
+    $pdo->beginTransaction();
+    $results = [];
+
+    foreach ($parts as $part) {
+        $partId = $part['id'] ?? null;
         $partNumber = $part['part_number'] ?? null;
         $partDescription = $part['part_description'] ?? '';
         $mix = $part['mix'] ?? 'N';
+        $idmatrice = $part['idmatrice'] ?? null;
+        $note = $part['note'] ?? null;
+        $dateexpiry = $part['dateexpiry'] ?? null;
 
-if ($partDescription) {
+        if ($partDescription || $note || $dateexpiry) {
-    try {
             if ($partId) {
-            // UPDATE თუ უკვე არსებობს part
+                // UPDATE se la parte esiste
                 $stmt = $pdo->prepare("UPDATE identification_parts
                     SET part_number = :part_number,
                         part_description = :part_description,
                         mix = :mix,
+                        idmatrice = :idmatrice,
+                        note = :note,
+                        dateexpiry = :dateexpiry,
                         updated_at = NOW()
                     WHERE id = :id");
                 $stmt->execute([
                     ':id' => $partId,
                     ':part_number' => $partNumber,
                     ':part_description' => $partDescription,
-                ':mix' => $mix
+                    ':mix' => $mix,
+                    ':idmatrice' => $idmatrice,
+                    ':note' => $note,
+                    ':dateexpiry' => $dateexpiry,
                 ]);
-            echo json_encode(['success' => true, 'part_id' => $partId, 'part_number'=>$partNumber, 'message' => 'Parte aggiornata con successo']);
+                $results[] = ['part_id' => $partId, 'part_number' => $partNumber, 'message' => 'Parte aggiornata con successo'];
             } else {
-            // INSERT თუ ახალია
+                // INSERT per nuova parte
                 $stmt = $pdo->prepare("INSERT INTO identification_parts
-                (iddatadb, part_number, part_description, mix, created_at, updated_at)
+                    (iddatadb, part_number, part_description, mix, idmatrice, note, dateexpiry, created_at, updated_at)
-                VALUES (:iddatadb, :part_number, :part_description, :mix, NOW(), NOW())");
+                    VALUES (:iddatadb, :part_number, :part_description, :mix, :idmatrice, :note, :dateexpiry, NOW(), NOW())");
                 $stmt->execute([
                     ':iddatadb' => $iddatadb,
                     ':part_number' => $partNumber,
                     ':part_description' => $partDescription,
-                ':mix' => $mix
+                    ':mix' => $mix,
+                    ':idmatrice' => $idmatrice,
+                    ':note' => $note,
+                    ':dateexpiry' => $dateexpiry,
                 ]);
                 $newId = $pdo->lastInsertId();
-            echo json_encode(['success' => true, 'part_id' => $newId, 'part_number'=>$partNumber,  'message' => 'Parte salvata con successo']);
+                $results[] = ['part_id' => $newId, 'part_number' => $partNumber, 'message' => 'Parte salvata con successo'];
             }
+        }
+    }
+
+    $pdo->commit();
+    echo json_encode(['success' => true, 'results' => $results]);
 } catch (PDOException $e) {
+    $pdo->rollBack();
     echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio: ' . $e->getMessage()]);
 }
-} else {
-    echo json_encode(['success' => false, 'message' => 'Descrizione mancante']);
-}

public/userarea/sendcheck.php

@@ -0,0 +1,68 @@
+<?php
+require_once "class/VisualLimsApiClient.class.php";
+include('include/headscript.php');
+
+header("Content-Type: application/json");
+
+// 🔹 Configura directory log (creala se non esiste)
+$logDir = __DIR__ . '/logs/api/';
+if (!is_dir($logDir)) {
+    mkdir($logDir, 0755, true);
+}
+
+// 🔹 Base URL API
+$apiBaseUrl = 'https://93.43.5.102/limsapi/api/odata/';
+
+// 🔹 Hardcoded commessaId
+$commessaId = 533357;
+
+try {
+    // 🔹 Initialize API client
+    $api = VisualLimsApiClient::getInstance();
+
+    // 🔹 STEP 1: POST InviaCommessa
+    $logContentStep1 = "curl --location --request POST '{$apiBaseUrl}CommessaWeb({$commessaId})/InviaCommessa' \\\n" .
+        "--header 'Content-Type: application/json' \\\n" .
+        "--header 'Authorization: Bearer ••••••' \\\n" .
+        "--data '{}'\n\n";
+
+    $sendResult = $api->post("CommessaWeb({$commessaId})/InviaCommessa", []);
+
+    $logContentStep1 .= "RESPONSE:\n" . json_encode($sendResult, JSON_PRETTY_PRINT);
+    $logFileStep1 = $logDir . "commessa_{$commessaId}_send_step1_" . time() . ".txt";
+    file_put_contents($logFileStep1, $logContentStep1);
+
+    // 🔹 STEP 2: GET di controllo post-invio
+    $expand = "CommesseCustomFields(\$expand=CustomField)";
+    $commessaAfterSend = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
+
+    // Log curl-like per GET di controllo
+    $logContentStep2 = "curl --location --request GET '{$apiBaseUrl}CommessaWeb({$commessaId})?\$expand=CommesseCustomFields(\$expand=CustomField)' \\\n" .
+        "--header 'Authorization: Bearer ••••••'\n\n" .
+        "RESPONSE:\n" . json_encode($commessaAfterSend, JSON_PRETTY_PRINT);
+    $logFileStep2 = $logDir . "commessa_{$commessaId}_get_step2_" . time() . ".txt";
+    file_put_contents($logFileStep2, $logContentStep2);
+
+    // 🔹 Output a schermo
+    echo json_encode([
+        "success" => true,
+        "message" => "Commessa {$commessaId} inviata e verificata",
+        "sendResult" => $sendResult,
+        "commessaAfterSend" => $commessaAfterSend,
+        "logFiles" => [
+            "step1_send" => $logFileStep1,
+            "step2_get" => $logFileStep2
+        ]
+    ]);
+} catch (Exception $e) {
+    error_log("Send/Check Error: " . $e->getMessage() . "\nTrace: " . $e->getTraceAsString());
+
+    echo json_encode([
+        "success" => false,
+        "message" => "Operation failed: " . $e->getMessage(),
+        "logFiles" => [
+            "step1_send" => $logFileStep1 ?? null,
+            "step2_get" => $logFileStep2 ?? null
+        ]
+    ]);
+}

public/userarea/templates_dashboard.php

@@ -90,11 +90,11 @@
                                     <tr>
                                         <th>ID</th>
                                         <th><?= htmlspecialchars($nametemplate, ENT_QUOTES, 'UTF-8'); ?></th>
-                                        <th><?= htmlspecialchars($lastmodtemplate, ENT_QUOTES, 'UTF-8'); ?></th>
                                         <th><?= htmlspecialchars($rowheader, ENT_QUOTES, 'UTF-8'); ?></th>
                                         <th><?= htmlspecialchars($columnheader, ENT_QUOTES, 'UTF-8'); ?></th>
                                         <th><?= htmlspecialchars($desctemplate, ENT_QUOTES, 'UTF-8'); ?></th>
                                         <th>Client Name</th>
+                                        <th>Button Label</th>
                                         <th>Status</th> <!-- Aggiunta colonna Status -->
                                         <th><?= htmlspecialchars($action, ENT_QUOTES, 'UTF-8'); ?></th>
                                     </tr>
@@ -147,13 +147,7 @@
                         data: 'name', // Nome del template
                         title: "Template Name"
                     },
-                    {
+
-                        data: 'updated_at', // Ultima modifica, formattata come data leggibile
-                        title: "Last Modified",
-                        render: function(data) {
-                            return new Date(data).toLocaleDateString();
-                        }
-                    },
                     {
                         data: 'header_row', // Riga degli header
                         title: "Header Row"
@@ -176,6 +170,11 @@
                             return `${clientName} (ID: ${clientId})`;
                         }
                     },
+                    {
+                        data: 'button_label', // Nuova colonna per Button Label
+                        title: "Button Label",
+                        defaultContent: 'Click Me'
+                    },
                     {
                         data: 'status', // Stato con Toggle Switch
                         title: "Status",

public/userarea/upload_photos_mobile.php

@@ -1,6 +1,6 @@
 <?php
 // upload_photos_mobile.php
-include('include/headscript.php');
+include('include/headscriptnologin.php');
 
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();