Entraid integration with documentation

.env.example

@@ -1,16 +1,16 @@
 APP_ENV=production
-APP_DEBUG=true
+APP_DEBUG=false
-APP_KEY=base64:C+sutHm6xP5sE4QXhoZFhYjArlVN11s2mDU1F8beUkM=
+APP_KEY=
 APP_URL=http://vanguard.test
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST="localhost"
+DB_HOST=localhost
-DB_DATABASE="trfcertest"
+DB_DATABASE=vanguard
-DB_USERNAME="solocla"
+DB_USERNAME=homestead
-DB_PASSWORD="xxxxxxx"
+DB_PASSWORD=secret
-DB_PREFIX="auth_"
+DB_PREFIX=vg_
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -39,21 +39,3 @@ 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"

.gitignore

@@ -51,16 +51,4 @@ public/userarea/class/curl_request_debug.log
 # Ignora cartella photostrf in public/userarea
 /public/userarea/photostrf/
 public/userarea/customfield_values_response.json
-/public/userarea/logaspi/
 
-public/userarea/logsapi/campione_762_1.json
-public/userarea/logsapi/campione_763_1.json
-public/userarea/logsapi/campione_762_2.json
-public/userarea/logsapi/campione_763_2.json
-public/userarea/logsapi/commessaweb_create_762.json
-public/userarea/logsapi/commessaweb_create_763.json
-public/userarea/logsapi/commessaweb_customfields_762.json
-public/userarea/logsapi/commessaweb_customfields_763.json
-public/userarea/logsapi/commessaweb_invia_762.json
-public/userarea/logsapi/commessaweb_invia_763.json
-public/userarea/logsapi/last_auth_url.txt

app/Providers/EventServiceProvider.php

@@ -34,8 +34,13 @@ class EventServiceProvider extends ServiceProvider
         Verified::class => [
             ActivateUser::class,
         ],
+<<<<<<< HEAD
         \SocialiteProviders\Manager\SocialiteWasMapped::class => [
             \SocialiteProviders\Microsoft\MicrosoftExtendSocialite::class,
+=======
+        \SocialiteProviders\Manager\SocialiteWasCalled::class => [
+            'SocialiteProviders\\Azure\\AzureExtendSocialite@handle',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         ],
     ];
 
@@ -46,7 +51,7 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        parent::boot(); // Aggiungi questa linea per sicurezza
     }
 
     /**

composer.json

@@ -44,7 +44,11 @@
         "phpmailer/phpmailer": "^6.9",
         "phpoffice/phpspreadsheet": "^4.1",
         "proengsoft/laravel-jsvalidation": "^4.0.0",
+<<<<<<< HEAD
         "socialiteproviders/microsoft": "^4.7",
+=======
+        "socialiteproviders/microsoft-azure": "^5.2",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         "spatie/laravel-query-builder": "^5.0",
         "vanguardapp/activity-log": "^6.0",
         "vanguardapp/announcements": "^6.0",

composer.lock

@@ -4,7 +4,11 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
+<<<<<<< HEAD
     "content-hash": "9c4f1e3bc3ee2180211c055e70635aef",
+=======
+    "content-hash": "583c865e5b67680202a816953a662b03",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     "packages": [
         {
             "name": "akaunting/laravel-setting",
@@ -5055,6 +5059,7 @@
             "time": "2025-02-24T19:33:30+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "source": {
@@ -5066,18 +5071,38 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/824ef97a4f6e3f363c21702b76676d54e8265573",
                 "reference": "824ef97a4f6e3f363c21702b76676d54e8265573",
+=======
+            "name": "socialiteproviders/microsoft-azure",
+            "version": "5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
+<<<<<<< HEAD
                 "firebase/php-jwt": "^6.8",
+=======
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
+<<<<<<< HEAD
                     "SocialiteProviders\\Microsoft\\": ""
+=======
+                    "SocialiteProviders\\Azure\\": ""
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5086,12 +5111,22 @@
             ],
             "authors": [
                 {
+<<<<<<< HEAD
                     "name": "Brian Faust",
                     "email": "hello@brianfaust.de"
                 }
             ],
             "description": "Microsoft OAuth2 Provider for Laravel Socialite",
             "keywords": [
+=======
+                    "name": "Chris Hemmings",
+                    "email": "chris@hemmin.gs"
+                }
+            ],
+            "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "azure",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "laravel",
                 "microsoft",
                 "oauth",
@@ -5099,11 +5134,19 @@
                 "socialite"
             ],
             "support": {
+<<<<<<< HEAD
                 "docs": "https://socialiteproviders.com/microsoft",
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
             "time": "2025-07-06T00:25:25+00:00"
+=======
+                "docs": "https://socialiteproviders.com/microsoft-azure",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2024-03-15T03:02:10+00:00"
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         },
         {
             "name": "spatie/laravel-package-tools",

config/auth.php

@@ -12,7 +12,11 @@ return [
     */
 
     'social' => [
-        'providers' => ['microsoft'],
+<<<<<<< HEAD
+        'providers' => ['facebook', 'twitter', 'google', 'microsoft'],
+=======
+        'providers' => ['azure'],
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     ],
 
     /*

config/services.php

@@ -64,12 +64,15 @@ return [
         'redirect' => env('GOOGLE_CALLBACK_URI'),
     ],
 
+<<<<<<< HEAD
     'microsoft' => [
         'client_id' => env('MICROSOFT_CLIENT_ID'),
         'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
         'redirect' => env('MICROSOFT_REDIRECT_URI'),
     ],
 
+=======
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     //   'authy' => [
     //       'key' => env('AUTHY_KEY'),
     //   ],
@@ -84,4 +87,11 @@ return [
             'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
         ],
     ],
+
+    'azure' => [
+        'client_id' => env('AZURE_CLIENT_ID'),
+        'client_secret' => env('AZURE_CLIENT_SECRET'),
+        'redirect' => env('AZURE_REDIRECT_URI'),
+        'tenant' => env('AZURE_TENANT_ID'),
+    ],
 ];

public/languages/en/general.php

@@ -32,4 +32,3 @@ $langdatatables = [
     "paginate_next" => "Next",
     "paginate_previous" => "Previous"
 ];
-$quotationstitle = "Quotations";

public/userarea/apply_routine.php

@@ -1,50 +0,0 @@
-<?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

@@ -1,131 +0,0 @@
-<?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

@@ -120,76 +120,4 @@ 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/delete_part_quotation.php

@@ -1,28 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$data = json_decode(file_get_contents('php://input'), true);
-
-$partId = $data['part_id'] ?? null;
-
-if (!$partId) {
-    echo json_encode(['success' => false, 'message' => 'ID parte mancante']);
-    exit;
-}
-
-try {
-    $stmt = $pdo->prepare("DELETE FROM identification_parts WHERE id = :part_id");
-    $stmt->execute([':part_id' => $partId]);
-    $rowCount = $stmt->rowCount();
-    if ($rowCount > 0) {
-        echo json_encode(['success' => true, 'message' => 'Parte eliminata con successo']);
-    } else {
-        echo json_encode(['success' => false, 'message' => 'Nessuna parte trovata con ID ' . $partId]);
-    }
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore nell\'eliminazione: ' . $e->getMessage()]);
-}

public/userarea/edit_template_xls.php

@@ -20,10 +20,17 @@ if (!$template) {
     exit;
 }
 
-// Recupera tutte le routine dal database
+// Debug del JSON
-$stmt = $pdo->prepare("SELECT * FROM routine");
+$clientSpecificFieldsJson = $template['client_specific_fields'] ?? '{}';
-$stmt->execute();
+error_log("Raw client_specific_fields JSON: " . $clientSpecificFieldsJson);
-$routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+$clientSpecificFields = json_decode($clientSpecificFieldsJson, true);
+if (json_last_error() !== JSON_ERROR_NONE) {
+    error_log("JSON decode error: " . json_last_error_msg());
+    $clientSpecificFields = [];
+} else {
+    error_log("Decoded client_specific_fields: " . print_r($clientSpecificFields, true));
+}
 ?>
 <!doctype html>
 <html lang="en">
@@ -34,9 +41,28 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <?php include('cssinclude.php'); ?>
-    <!-- Include jQuery prima di Select2 -->
+    <style>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        .client-field-row .row {
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+            margin-bottom: 0 !important;
+            display: flex;
+            align-items: center;
+        }
+
+        .client-field-row .col-md-1,
+        .client-field-row .col-md-2,
+        .client-field-row .col-md-3 {
+            padding: 0 5px;
+            overflow: hidden;
+            max-width: 100%;
+            flex: 0 0 auto;
+        }
+
+        .client-field-row input,
+        .client-field-row select {
+            width: 100%;
+            box-sizing: border-box;
+        }
+    </style>
     <title>Edit Template <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
 
@@ -48,7 +74,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
             <div class="page-content">
                 <div class="card mb-4">
                     <div class="card-header">
-                        <h5 class="mb-0">Update XLS Template</h5>
+                        <h5 class="mb-0">UpdateXLS Template</h5>
                     </div>
                     <div class="card-body">
                         <p class="mb-2">Edit the following form in order to update the selected import XLS template</p>
@@ -56,7 +82,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         <ul class="mb-0">
                             <li>Template Name</li>
                             <li>Row Header and Column Header: where the title of the excel starts</li>
-                            <li>Schema</li>
+                            <li>Cheme</li>
                         </ul>
                     </div>
                 </div>
@@ -98,67 +124,96 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                     <label class="form-label"><?= htmlspecialchars($desttable, ENT_QUOTES, 'UTF-8'); ?>*</label>
                                     <input type="text" name="target_table" class="form-control" value="<?php echo htmlspecialchars($template['target_table']); ?>" readonly required>
                                 </div>
-
+                                <!-- Aggiungi il campo per selezionare il cliente -->
-                                <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>
                                         <option value="">Select a client...</option>
+                                        <!-- Le opzioni verranno popolate tramite JavaScript -->
                                     </select>
                                     <span id="clientLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Recupero clienti in corso...</span>
                                 </div>
-
+                                <!-- Aggiungi il campo per selezionare lo schema -->
                                 <div class="mb-3">
                                     <label class="form-label">Select Schema *</label>
                                     <select name="schema_id" id="schemaSelect" class="form-control" required>
                                         <option value="">Select a schema...</option>
+                                        <!-- Le opzioni verranno popolate tramite JavaScript -->
                                     </select>
                                     <span id="schemaLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Caricamento schemi in corso...</span>
                                 </div>
-
+                                <!-- Sezione per i campi specifici del cliente -->
                                 <div class="mb-3">
-                                    <label class="form-label">Select Routine</label>
+                                    <label class="form-label">Client-Specific Fields</label>
-                                    <select name="idroutine" id="routineSelect" class="form-control">
+
-                                        <option value="">Select a routine...</option>
+                                    <!-- Intestazioni colonne -->
-                                        <?php foreach ($routines as $routine): ?>
+                                    <div class="row fw-bold text-secondary mb-1">
-                                            <option value="<?php echo $routine['idroutine']; ?>" <?php echo ($template['idroutine'] ?? '') == $routine['idroutine'] ? 'selected' : ''; ?>>
+                                        <div class="col-md-3">Field Name</div>
-                                                <?php echo htmlspecialchars($routine['name']); ?>
+                                        <div class="col-md-2">Type</div>
-                                            </option>
+                                        <div class="col-md-2">Possible Values</div>
-                                        <?php endforeach; ?>
+                                        <div class="col-md-1">Required</div>
-                                    </select>
+                                        <div class="col-md-2">Export Column Name</div>
-                                    <div id="routineDetails" class="mt-2" style="display: none;">
+                                        <div class="col-md-1">Default Value</div>
-                                        <h6>Routine Details</h6>
+                                        <div class="col-md-1">Actions</div>
-                                        <p><strong>Name:</strong> <span id="routineName"></span></p>
-                                        <p><strong>Description:</strong> <span id="routineDescription"></span></p>
-                                        <p><strong>Action 1:</strong> <span id="routineAction1"></span></p>
-                                        <p><strong>Action 2:</strong> <span id="routineAction2"></span></p>
-                                        <p><strong>Action 3:</strong> <span id="routineAction3"></span></p>
                                     </div>
+
+                                    <div id="clientSpecificFields">
+                                        <?php
+                                        $index = 0;
+                                        if (!empty($clientSpecificFields) && is_array($clientSpecificFields)) {
+                                            foreach ($clientSpecificFields as $fieldName => $fieldData) {
+                                                if (is_array($fieldData)) {
+                                                    $type = $fieldData['type'] ?? 'text';
+                                                    $possibleValues = implode(', ', $fieldData['possible_values'] ?? []);
+                                                    $isRequired = isset($fieldData['is_required']) && $fieldData['is_required'] ? '1' : '0';
+                                                    $exportColumnName = $fieldData['export_column_name'] ?? '';
+                                                    $defaultValue = $fieldData['default_value'] ?? '';
+                                        ?>
+                                                    <div class="client-field-row mb-2">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-md-3">
+                                                                <input type="text" name="specific_fields[<?php echo $index; ?>][name]" class="form-control" value="<?php echo htmlspecialchars($fieldName); ?>" placeholder="Field Name (e.g., SKU)">
+                                                            </div>
+                                                            <div class="col-md-2">
+                                                                <select name="specific_fields[<?php echo $index; ?>][type]" class="form-control" onchange="toggleDropdownValues(this)">
+                                                                    <option value="text" <?php echo $type === 'text' ? 'selected' : ''; ?>>Text</option>
+                                                                    <option value="dropdown" <?php echo $type === 'dropdown' ? 'selected' : ''; ?>>Dropdown</option>
+                                                                    <option value="date" <?php echo $type === 'date' ? 'selected' : ''; ?>>Date</option>
+                                                                    <option value="boolean" <?php echo $type === 'boolean' ? 'selected' : ''; ?>>Yes/No</option>
+                                                                </select>
+                                                            </div>
+                                                            <div class="col-md-2 dropdown-values" style="<?php echo $type === 'dropdown' ? 'visibility: visible;' : 'visibility: hidden;'; ?>">
+                                                                <input type="text" name="specific_fields[<?php echo $index; ?>][possible_values]" class="form-control" value="<?php echo htmlspecialchars($possibleValues); ?>" placeholder="Values (e.g., Red, Blue, Green)">
+                                                            </div>
+                                                            <div class="col-md-1">
+                                                                <select name="specific_fields[<?php echo $index; ?>][required]" class="form-control">
+                                                                    <option value="1" <?php echo $isRequired === '1' ? 'selected' : ''; ?>>Yes</option>
+                                                                    <option value="0" <?php echo $isRequired === '0' ? 'selected' : ''; ?>>No</option>
+                                                                </select>
+                                                            </div>
+                                                            <div class="col-md-2">
+                                                                <input type="text" name="specific_fields[<?php echo $index; ?>][export_column_name]" class="form-control" value="<?php echo htmlspecialchars($exportColumnName); ?>" placeholder="Export Column Name (e.g., MONCLER_SKU)">
+                                                            </div>
+                                                            <div class="col-md-1">
+                                                                <input type="text" name="specific_fields[<?php echo $index; ?>][default_value]" class="form-control" value="<?php echo htmlspecialchars($defaultValue); ?>" placeholder="Default Value (optional)">
+                                                            </div>
+                                                            <div class="col-md-1">
+                                                                <button type="button" class="btn btn-danger remove-field">-</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                        <?php
+                                                    $index++;
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </div>
+
+                                    <button type="button" class="btn btn-primary mt-2" id="addField">Add Field</button>
                                 </div>
 
+
                                 <br>
                                 <button type="submit" class="btn btn-primary"><?= htmlspecialchars($savechanges, ENT_QUOTES, 'UTF-8'); ?></button>
                                 <a href="templates_dashboard.php" class="btn btn-secondary">Cancel</a>
@@ -168,78 +223,132 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 </div>
             </div>
         </div>
+        <!--end page wrapper -->
+        <!--start overlay-->
         <div class="overlay toggle-icon"></div>
+        <!--end overlay-->
+        <!--Start Back To Top Button-->
         <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
+        <!--End Back To Top Button-->
         <?php include('include/footer.php'); ?>
     </div>
+    <!--end wrapper-->
+
+    <!-- search modal -->
+    <?php //include('include/searchmodal.php'); 
+    ?>
+    <!-- end search modal -->
+
+    <!--start switcher-->
+    <?php //include('include/themeswitcher.php'); 
+    ?>
+    <!--end switcher-->
+    <!-- Temporaneamente disabilitato jsinclude.php per test -->
+    <!-- <?php include('jsinclude.php'); ?> -->
+    <!-- Includi jQuery e Select2 -->
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
 
+    <script>
+        // Dati del cliente e dello schema associati al template
+        const templateClientId = <?php echo json_encode($template['idclient'] ?? 0); ?>;
+        const templateSchemaId = <?php echo json_encode($template['idschema'] ?? 0); ?>;
+        const templateSchemaName = "<?php echo htmlspecialchars($template['schemaname'] ?? ''); ?>";
+    </script>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
-            // Verifica che jQuery sia caricato
-            if (typeof jQuery === 'undefined') {
-                alert("Errore: jQuery non è caricato. Contatta l'amministratore.");
-                return;
-            }
-
             const form = document.getElementById("editTemplateForm");
+            const addFieldButton = document.getElementById("addField");
+            const container = document.getElementById("clientSpecificFields");
             const clientLoadingStatus = document.getElementById("clientLoadingStatus");
             const schemaLoadingStatus = document.getElementById("schemaLoadingStatus");
-            const routineSelect = document.getElementById("routineSelect");
-            const routineDetails = document.getElementById("routineDetails");
-            const routineName = document.getElementById("routineName");
-            const routineDescription = document.getElementById("routineDescription");
-            const routineAction1 = document.getElementById("routineAction1");
-            const routineAction2 = document.getElementById("routineAction2");
-            const routineAction3 = document.getElementById("routineAction3");
 
-            if (!form || !clientLoadingStatus || !schemaLoadingStatus || !routineSelect || !routineDetails) {
+            if (!form || !addFieldButton || !container || !clientLoadingStatus || !schemaLoadingStatus) {
-                alert("Errore: Uno o più elementi della pagina non sono stati trovati. Contatta l'amministratore.");
+                console.error("One or more DOM elements not found:", {
+                    form,
+                    addFieldButton,
+                    container,
+                    clientLoadingStatus,
+                    schemaLoadingStatus
+                });
                 return;
             }
 
-            // Inizializza Select2
+            console.log("All DOM elements found");
+
+            // Controllo che jQuery sia caricato
+            if (typeof jQuery === 'undefined') {
+                console.error("jQuery non è caricato!");
+                return;
+            }
+
+            // Inizializza Select2 sulla tendina dei clienti
             $('#clientSelect').select2({
                 placeholder: "Search for a client...",
                 allowClear: true
+            }).on('select2:open', function() {
+                console.log("Select2 initialized successfully for clientSelect");
+            }).on('select2:select', function(e) {
+                console.log("Client selected:", e.params.data.id, e.params.data.text);
             });
 
+            // Inizializza Select2 sulla tendina degli schemi
             $('#schemaSelect').select2({
                 placeholder: "Search for a schema...",
                 allowClear: true
+            }).on('select2:open', function() {
+                console.log("Select2 initialized successfully for schemaSelect");
+            }).on('select2:select', function(e) {
+                console.log("Schema selected:", e.params.data.id, e.params.data.text);
             });
 
-            $('#routineSelect').select2({
+            // Carica i clienti al caricamento della pagina
-                placeholder: "Select a routine...",
-                allowClear: true
-            });
-
-            // Carica i clienti
             async function loadClients() {
                 try {
                     clientLoadingStatus.style.display = 'inline';
                     clientLoadingStatus.textContent = 'Recupero clienti in corso...';
+
                     const response = await fetch("get_clienti.php", {
                         method: "GET",
                         headers: {
                             "Content-Type": "application/json"
                         }
                     });
-                    const data = await response.json();
+
-                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    const text = await response.text();
-                    const select = document.getElementById("clientSelect");
+                    console.log("Risposta raw (clienti):", text);
-                    select.innerHTML = '<option value="">Select a client...</option>';
+                    const data = JSON.parse(text);
-                    data.value.forEach(client => {
+
-                        const nome = client.Nominativo || "Nome non disponibile";
+                    if (!response.ok) {
-                        const id = client.IdCliente || "ID non disponibile";
+                        throw new Error(data.error || `Errore HTTP: ${response.status}`);
-                        const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                    }
-                        if (parseInt(id) === parseInt(<?php echo json_encode($template['idclient'] ?? 0); ?>)) {
+
-                            option.selected = true;
+                    if (data.value && Array.isArray(data.value)) {
-                        }
+                        const select = document.getElementById("clientSelect");
-                        select.add(option);
+                        select.innerHTML = '<option value="">Select a client...</option>';
-                    });
+                        data.value.forEach(client => {
-                    $(select).trigger('change');
+                            const nome = client.Nominativo || "Nome non disponibile";
-                    clientLoadingStatus.textContent = "Clienti caricati.";
+                            const id = client.IdCliente || "ID non disponibile";
+                            const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                            if (parseInt(id) === parseInt(templateClientId)) {
+                                option.selected = true;
+                            }
+                            select.add(option);
+                        });
+                        $(select).trigger('change');
+                        console.log("Clienti caricati con successo.");
+                        clientLoadingStatus.textContent = "Clienti caricati.";
+                    } else {
+                        console.error("Nessun cliente trovato o formato dati non valido.", data);
+                        clientLoadingStatus.textContent = "Nessun cliente trovato.";
+                        Swal.fire({
+                            title: "Errore!",
+                            text: "Nessun cliente trovato o formato dati non valido.",
+                            icon: "error",
+                            confirmButtonText: "OK"
+                        });
+                    }
                 } catch (error) {
+                    console.error("Errore nel caricamento dei clienti:", error);
                     clientLoadingStatus.textContent = "Errore nel caricamento.";
                     Swal.fire({
                         title: "Errore!",
@@ -248,37 +357,50 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         confirmButtonText: "OK"
                     });
                 } finally {
-                    setTimeout(() => clientLoadingStatus.style.display = 'none', 2000);
+                    setTimeout(() => {
+                        clientLoadingStatus.style.display = 'none';
+                    }, 2000);
                 }
             }
 
-            // Carica gli schemi
+            // Carica gli schemi al caricamento della pagina
             async function loadSchemas() {
                 try {
                     schemaLoadingStatus.style.display = 'inline';
                     schemaLoadingStatus.textContent = 'Caricamento schemi in corso...';
+
                     const response = await fetch("get_schemi.php", {
                         method: "GET",
                         headers: {
                             "Content-Type": "application/json"
                         }
                     });
-                    const data = await response.json();
+
-                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    const text = await response.text();
+                    console.log("Risposta raw (schemi):", text);
+                    const data = JSON.parse(text);
+
+                    if (!response.ok) {
+                        throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    }
+
                     const select = document.getElementById("schemaSelect");
                     select.innerHTML = '<option value="">Select a schema...</option>';
                     data.value.forEach(schema => {
                         const nome = schema.Nome || "Nome non disponibile";
                         const id = schema.IdSchemaCustomFields || "ID non disponibile";
-                        const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                        const optionText = `${nome.trim()} (ID: ${id})`;
-                        if (parseInt(id) === parseInt(<?php echo json_encode($template['idschema'] ?? 0); ?>)) {
+                        const option = new Option(optionText, id);
+                        if (parseInt(id) === parseInt(templateSchemaId)) {
                             option.selected = true;
                         }
                         select.add(option);
                     });
                     $(select).trigger('change');
+                    console.log("Schemi caricati con successo.");
                     schemaLoadingStatus.textContent = "Schemi caricati.";
                 } catch (error) {
+                    console.error("Errore nel caricamento degli schemi:", error);
                     schemaLoadingStatus.textContent = "Errore nel caricamento.";
                     Swal.fire({
                         title: "Errore!",
@@ -287,68 +409,169 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         confirmButtonText: "OK"
                     });
                 } finally {
-                    setTimeout(() => schemaLoadingStatus.style.display = 'none', 2000);
+                    setTimeout(() => {
+                        schemaLoadingStatus.style.display = 'none';
+                    }, 2000);
                 }
             }
 
-            // Carica i dati
+            // Carica i dati in sequenza
             async function loadData() {
                 try {
                     await loadClients();
                     await loadSchemas();
                 } catch (error) {
-                    Swal.fire({
+                    console.error("Errore nel caricamento dei dati:", error);
-                        title: "Errore!",
+                }
-                        text: "Errore nel caricamento dei dati: " + error.message,
+            }
-                        icon: "error",
+
-                        confirmButtonText: "OK"
+            loadData();
+
+            // Debug iniziale del DOM
+            const debugDom = () => {
+                const initialRows = container.getElementsByClassName("client-field-row");
+                console.log("Initial number of rows:", initialRows.length);
+                for (let i = 0; i < initialRows.length; i++) {
+                    const inputs = initialRows[i].querySelectorAll("input, select");
+                    const buttons = initialRows[i].querySelectorAll("button");
+                    console.log(`Row ${i + 1} - Total inputs: ${inputs.length}, Total buttons: ${buttons.length}`);
+                    inputs.forEach(input => console.log(`Input name: ${input.name}, value: ${input.value}, placeholder: ${input.placeholder}`));
+                    buttons.forEach(button => console.log(`Button type: ${button.type}`));
+                }
+            };
+
+            debugDom();
+
+            // Pulizia del DOM da input extra
+            const cleanDom = () => {
+                const rows = container.getElementsByClassName("client-field-row");
+                for (let i = 0; i < rows.length; i++) {
+                    const inputs = rows[i].querySelectorAll("input, select");
+                    if (inputs.length > 6) { // 6 input/select attesi
+                        console.warn(`Row ${i + 1}: Extra inputs detected, removing excess...`);
+                        inputs.forEach((input, index) => {
+                            if (index >= 6) {
+                                console.log(`Removing extra input: ${input.name}`);
+                                input.remove();
+                            }
+                        });
+                    }
+                }
+            };
+
+            cleanDom();
+
+            // Osservatore del DOM per rilevare modifiche
+            const observer = new MutationObserver((mutations) => {
+                mutations.forEach(mutation => {
+                    if (mutation.addedNodes.length) {
+                        console.log("DOM modified: New nodes added", mutation.addedNodes);
+                        cleanDom(); // Pulisce il DOM ogni volta che viene modificato
+                    }
+                });
+            });
+
+            observer.observe(container, {
+                childList: true,
+                subtree: true
+            });
+
+            // Gestione dinamica dei campi specifici
+            addFieldButton.addEventListener("click", function() {
+                console.log("Add Field button clicked");
+                const fieldCount = container.getElementsByClassName("client-field-row").length;
+                const newField = document.createElement("div");
+                newField.className = "client-field-row mb-2";
+                newField.innerHTML = `
+                <div class="row align-items-center">
+                    <div class="col-md-3">
+                        <input type="text" name="specific_fields[${fieldCount}][name]" class="form-control" placeholder="Field Name (e.g., SKU)">
+                    </div>
+                    <div class="col-md-2">
+                        <select name="specific_fields[${fieldCount}][type]" class="form-control" onchange="toggleDropdownValues(this)">
+                            <option value="text">Text</option>
+                            <option value="dropdown">Dropdown</option>
+                            <option value="date">Date</option>
+                            <option value="boolean">Yes/No</option>
+                        </select>
+                    </div>
+                    <div class="col-md-2 dropdown-values" style="visibility: hidden;">
+                        <input type="text" name="specific_fields[${fieldCount}][possible_values]" class="form-control" placeholder="Values (e.g., Red, Blue, Green)">
+                    </div>
+                    <div class="col-md-1">
+                        <select name="specific_fields[${fieldCount}][required]" class="form-control">
+                            <option value="1">Yes</option>
+                            <option value="0">No</option>
+                        </select>
+                    </div>
+                    <div class="col-md-2">
+                        <input type="text" name="specific_fields[${fieldCount}][export_column_name]" class="form-control" placeholder="Export Column Name (e.g., MONCLER_SKU)">
+                    </div>
+                    <div class="col-md-1">
+                        <input type="text" name="specific_fields[${fieldCount}][default_value]" class="form-control" placeholder="Default Value (optional)">
+                    </div>
+                    <div class="col-md-1">
+                        <button type="button" class="btn btn-danger remove-field">-</button>
+                    </div>
+                </div>
+            `;
+                container.appendChild(newField);
+
+                newField.querySelector(".remove-field").addEventListener("click", function() {
+                    console.log("Remove Field button clicked");
+                    container.removeChild(newField);
+                    updateFieldIndices();
+                });
+            });
+
+            // Funzione per mostrare/nascondere il campo dei valori possibili per i dropdown
+            window.toggleDropdownValues = function(selectElement) {
+                console.log("Toggling dropdown values for:", selectElement.value);
+                const row = selectElement.closest(".row");
+                const dropdownValues = row.querySelector(".dropdown-values");
+                if (selectElement.value === "dropdown") {
+                    dropdownValues.style.visibility = "visible";
+                } else {
+                    dropdownValues.style.visibility = "hidden";
+                }
+            };
+
+            // Event listener per i pulsanti di rimozione esistenti
+            document.querySelectorAll(".remove-field").forEach(button => {
+                button.addEventListener("click", function() {
+                    console.log("Existing remove button clicked");
+                    const container = document.getElementById("clientSpecificFields");
+                    container.removeChild(button.closest(".client-field-row"));
+                    updateFieldIndices();
+                });
+            });
+
+            // Funzione per aggiornare gli indici dei campi
+            function updateFieldIndices() {
+                console.log("Updating field indices");
+                const rows = container.getElementsByClassName("client-field-row");
+                for (let i = 0; i < rows.length; i++) {
+                    const inputs = rows[i].querySelectorAll("input, select");
+                    inputs.forEach(input => {
+                        const name = input.name.replace(/\[\d+\]/, `[${i}]`);
+                        input.name = name;
                     });
                 }
             }
-            loadData();
-
-            // Routine dettagli
-            const routines = <?php echo json_encode($routines); ?>;
-
-            function updateRoutineDetails() {
-                const selectedId = routineSelect.value;
-                routineDetails.style.display = selectedId ? 'block' : 'none';
-                if (selectedId) {
-                    const routine = routines.find(r => r.idroutine == selectedId);
-                    if (routine) {
-                        routineName.textContent = routine.name || 'N/A';
-                        routineDescription.textContent = routine.description || 'N/A';
-                        routineAction1.textContent = routine.action1 || 'N/A';
-                        routineAction2.textContent = routine.action2 || 'N/A';
-                        routineAction3.textContent = routine.action3 || 'N/A';
-                    } else {
-                        routineName.textContent = 'N/A';
-                        routineDescription.textContent = 'N/A';
-                        routineAction1.textContent = 'N/A';
-                        routineAction2.textContent = 'N/A';
-                        routineAction3.textContent = 'N/A';
-                    }
-                } else {
-                    routineName.textContent = '';
-                    routineDescription.textContent = '';
-                    routineAction1.textContent = '';
-                    routineAction2.textContent = '';
-                    routineAction3.textContent = '';
-                }
-            }
-            routineSelect.addEventListener('change', updateRoutineDetails);
-            updateRoutineDetails(); // Inizializza dettagli se una routine è preselezionata
 
             // Submit del form
             form.addEventListener("submit", function(e) {
                 e.preventDefault();
+                console.log("Form submitted");
 
                 let formData = new FormData(this);
 
+                // Aggiungi il nome del cliente selezionato a FormData
                 const clientSelect = document.getElementById("clientSelect");
                 const clientId = clientSelect.value;
                 const selectedClientOption = clientSelect.options[clientSelect.selectedIndex];
 
+                // Validazione: assicurati che un cliente sia selezionato
                 if (!clientId) {
                     Swal.fire({
                         title: "Errore!",
@@ -359,18 +582,22 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     return;
                 }
 
+                // Estrai il nome del cliente in modo più robusto
                 let clientName = "";
                 if (selectedClientOption) {
                     const optionText = selectedClientOption.text.trim();
                     const nameMatch = optionText.match(/^(.+?)(?:\s*\(ID:\s*\d+\))?$/);
                     clientName = nameMatch ? nameMatch[1].trim() : optionText;
                 }
+
                 formData.append("client_name", clientName);
 
+                // Aggiungi l'ID e il nome dello schema selezionato a FormData
                 const schemaSelect = document.getElementById("schemaSelect");
                 const schemaId = schemaSelect.value;
                 const selectedSchemaOption = schemaSelect.options[schemaSelect.selectedIndex];
 
+                // Validazione: assicurati che uno schema sia selezionato
                 if (!schemaId) {
                     Swal.fire({
                         title: "Errore!",
@@ -381,18 +608,63 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     return;
                 }
 
+                // Estrai il nome dello schema in modo più robusto
                 let schemaName = "";
                 if (selectedSchemaOption) {
                     const optionText = selectedSchemaOption.text.trim();
                     const nameMatch = optionText.match(/^(.+?)(?:\s*\(ID:\s*\d+\))?$/);
                     schemaName = nameMatch ? nameMatch[1].trim() : optionText;
                 }
-                formData.append("idschema", schemaId);
-                formData.append("schemaname", schemaName);
 
-                // Aggiungi idroutine
+                formData.append("idschema", schemaId);
-                const routineId = routineSelect.value;
+                formData.append("schemamaname", schemaName);
-                formData.append("idroutine", routineId);
+
+                // Log per debug
+                console.log("Client ID:", clientId);
+                console.log("Client Name:", clientName);
+                console.log("Schema ID:", schemaId);
+                console.log("Schema Name:", schemaName);
+
+                // Genera il JSON per client_specific_fields
+                let finalSpecificFields = {};
+
+                // Raccolta dei dati direttamente dal DOM
+                const fieldRows = container.getElementsByClassName("client-field-row");
+                for (let i = 0; i < fieldRows.length; i++) {
+                    const row = fieldRows[i];
+                    const inputs = row.querySelectorAll("input, select");
+                    let fieldData = {};
+
+                    inputs.forEach(input => {
+                        const nameMatch = input.name.match(/specific_fields\[\d+\]\[(.*?)\]/);
+                        if (nameMatch) {
+                            const fieldName = nameMatch[1];
+                            fieldData[fieldName] = input.value.trim();
+                        }
+                    });
+
+                    if (fieldData.name) {
+                        finalSpecificFields[fieldData.name] = {
+                            type: fieldData.type || "text",
+                            possible_values: (fieldData.possible_values && fieldData.type === "dropdown") ? fieldData.possible_values.split(",").map(v => v.trim()) : [],
+                            is_required: fieldData.required === "1",
+                            export_column_name: fieldData.export_column_name || "",
+                            default_value: fieldData.default_value || ""
+                        };
+                        console.log(`Field ${fieldData.name}:`, finalSpecificFields[fieldData.name]);
+                    }
+                }
+
+                console.log("Generated JSON for client_specific_fields:", JSON.stringify(finalSpecificFields));
+
+                // Aggiungi il JSON al FormData
+                formData.append("client_specific_fields", JSON.stringify(finalSpecificFields));
+
+                // Debug del FormData
+                console.log("FormData contents:");
+                for (let pair of formData.entries()) {
+                    console.log(pair[0] + ': ' + pair[1]);
+                }
 
                 fetch("process_edit_template_xls.php", {
                         method: "POST",
@@ -400,6 +672,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     })
                     .then(response => response.json())
                     .then(data => {
+                        console.log("Fetch response:", data);
                         if (data.success) {
                             Swal.fire({
                                 title: "Successo!",
@@ -419,6 +692,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         }
                     })
                     .catch(error => {
+                        console.error("Errore Fetch:", error);
                         Swal.fire({
                             title: "Errore!",
                             text: "Si è verificato un errore imprevisto.",

public/userarea/export_to_lims.js

@@ -1,239 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-    console.log("export_to_lims.js loaded");
-
-    // Debug: verifica che i pulsanti siano trovati
-    const exportButtons = document.querySelectorAll(".export-lims-btn");
-    console.log(`Found ${exportButtons.length} export-lims-btn buttons`);
-
-    if (exportButtons.length === 0) {
-        console.warn("No .export-lims-btn buttons found in the DOM");
-        return;
-    }
-
-    exportButtons.forEach((btn) => {
-        btn.addEventListener("click", (e) => {
-            e.preventDefault();
-            const rowIndex = btn.dataset.row;
-            const iddatadb = btn.dataset.iddatadb;
-            console.log(
-                `Export to LIMS clicked for row ${rowIndex}, iddatadb: ${iddatadb}`,
-            );
-
-            // Mostra il modale di conferma
-            const confirmModalElement =
-                document.getElementById("exportConfirmModal");
-            if (!confirmModalElement) {
-                console.error("exportConfirmModal not found in the DOM");
-                alert("Errore: Modale di conferma non trovato");
-                return;
-            }
-
-            const confirmModal = new bootstrap.Modal(confirmModalElement, {
-                keyboard: false,
-            });
-            document.getElementById("exportIddatadb").textContent = iddatadb;
-            confirmModal.show();
-
-            // Gestisci il click su "Conferma"
-            const confirmBtn = document.getElementById("exportConfirmBtn");
-            if (!confirmBtn) {
-                console.error("exportConfirmBtn not found in the DOM");
-                confirmModal.hide();
-                alert("Errore: Pulsante di conferma non trovato");
-                return;
-            }
-
-            const confirmHandler = async () => {
-                console.log(`Confirmed export for iddatadb: ${iddatadb}`);
-                confirmModal.hide();
-
-                const formData = new FormData();
-                formData.append("iddatadb", iddatadb);
-
-                try {
-                    const response = await fetch("export_to_lims.php", {
-                        method: "POST",
-                        body: formData,
-                    });
-                    if (!response.ok)
-                        throw new Error(
-                            `HTTP error! status: ${response.status}`,
-                        );
-                    const data = await response.json();
-
-                    console.log("Export response:", data);
-
-                    // Mostra il modale di risposta
-                    const responseModalElement = document.getElementById(
-                        "exportResponseModal",
-                    );
-                    if (!responseModalElement) {
-                        console.error(
-                            "exportResponseModal not found in the DOM",
-                        );
-                        alert("Errore: Modale di risposta non trovato");
-                        return;
-                    }
-
-                    const responseModal = new bootstrap.Modal(
-                        responseModalElement,
-                        {
-                            keyboard: false,
-                        },
-                    );
-                    const responseMessage = document.getElementById(
-                        "exportResponseMessage",
-                    );
-                    if (data.success) {
-                        responseMessage.innerHTML = `${data.message.replace(/\n/g, "<br>")}<br>ID CommessaWeb: ${data.idcommessaweb}`;
-                        document.getElementById(
-                            "exportResponseModalLabel",
-                        ).textContent = "Esportazione Completata";
-                        responseModal.show();
-
-                        // Aggiorna la UI per riflettere lo stato 'To LIMS'
-                        const statusCell = btn
-                            .closest(".grid-row")
-                            .querySelector(
-                                '.grid-cell[data-col="status"] .status-badge',
-                            );
-                        if (statusCell) {
-                            statusCell.classList.remove("status-i", "status-P");
-                            statusCell.classList.add("status-l");
-                            statusCell.textContent = "To LIMS";
-                        }
-
-                        // Gestisci la chiusura del modale di risposta
-                        responseModalElement.addEventListener(
-                            "hidden.bs.modal",
-                            () => {
-                                console.log(
-                                    "exportResponseModal closed, cleaning up",
-                                );
-                                // Rimuovi tutti i backdrop residui
-                                document
-                                    .querySelectorAll(".modal-backdrop")
-                                    .forEach((backdrop) => {
-                                        console.log(
-                                            "Removing backdrop:",
-                                            backdrop,
-                                        );
-                                        backdrop.remove();
-                                    });
-                                // Ripristina il body
-                                document.body.classList.remove("modal-open");
-                                document.body.style.paddingRight = "";
-                                // Nascondi l'overlay
-                                const overlay = document.querySelector(
-                                    ".overlay.toggle-icon",
-                                );
-                                if (overlay) {
-                                    overlay.style.display = "none";
-                                }
-                            },
-                            { once: true },
-                        );
-                    } else {
-                        responseMessage.textContent = `Errore durante la generazione dei payload: ${data.message}`;
-                        document.getElementById(
-                            "exportResponseModalLabel",
-                        ).textContent = "Errore Esportazione";
-                        responseModal.show();
-
-                        // Gestisci la chiusura del modale di risposta anche in caso di errore
-                        responseModalElement.addEventListener(
-                            "hidden.bs.modal",
-                            () => {
-                                console.log(
-                                    "exportResponseModal closed, cleaning up",
-                                );
-                                // Rimuovi tutti i backdrop residui
-                                document
-                                    .querySelectorAll(".modal-backdrop")
-                                    .forEach((backdrop) => {
-                                        console.log(
-                                            "Removing backdrop:",
-                                            backdrop,
-                                        );
-                                        backdrop.remove();
-                                    });
-                                // Ripristina il body
-                                document.body.classList.remove("modal-open");
-                                document.body.style.paddingRight = "";
-                                // Nascondi l'overlay
-                                const overlay = document.querySelector(
-                                    ".overlay.toggle-icon",
-                                );
-                                if (overlay) {
-                                    overlay.style.display = "none";
-                                }
-                            },
-                            { once: true },
-                        );
-                    }
-                } catch (error) {
-                    console.error("Export error:", error);
-                    const responseModalElement = document.getElementById(
-                        "exportResponseModal",
-                    );
-                    if (!responseModalElement) {
-                        console.error(
-                            "exportResponseModal not found in the DOM",
-                        );
-                        alert("Errore: Modale di risposta non trovato");
-                        return;
-                    }
-                    const responseModal = new bootstrap.Modal(
-                        responseModalElement,
-                        {
-                            keyboard: false,
-                        },
-                    );
-                    document.getElementById(
-                        "exportResponseMessage",
-                    ).textContent =
-                        `Errore durante la generazione dei payload: ${error.message}`;
-                    document.getElementById(
-                        "exportResponseModalLabel",
-                    ).textContent = "Errore Esportazione";
-                    responseModal.show();
-
-                    // Gestisci la chiusura del modale di risposta in caso di errore
-                    responseModalElement.addEventListener(
-                        "hidden.bs.modal",
-                        () => {
-                            console.log(
-                                "exportResponseModal closed, cleaning up",
-                            );
-                            // Rimuovi tutti i backdrop residui
-                            document
-                                .querySelectorAll(".modal-backdrop")
-                                .forEach((backdrop) => {
-                                    console.log("Removing backdrop:", backdrop);
-                                    backdrop.remove();
-                                });
-                            // Ripristina il body
-                            document.body.classList.remove("modal-open");
-                            document.body.style.paddingRight = "";
-                            // Nascondi l'overlay
-                            const overlay = document.querySelector(
-                                ".overlay.toggle-icon",
-                            );
-                            if (overlay) {
-                                overlay.style.display = "none";
-                            }
-                        },
-                        { once: true },
-                    );
-                }
-
-                // Rimuovi il listener dopo l'esecuzione
-                confirmBtn.removeEventListener("click", confirmHandler);
-            };
-
-            // Rimuovi eventuali listener precedenti
-            confirmBtn.removeEventListener("click", confirmHandler);
-            confirmBtn.addEventListener("click", confirmHandler);
-        });
-    });
-});

public/userarea/export_to_lims.php

@@ -1,291 +0,0 @@
-<?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/';
-
-// 🔹 Funzione per validare e convertire date
-function validateDate($value)
-{
-    // Prova a validare come data (accetta formati comuni)
-    $date = DateTime::createFromFormat('Y-m-d', $value) ?: DateTime::createFromFormat('Y-m-d H:i:s', $value);
-    if ($date) {
-        return $date->format('Y-m-d\TH:i:sP'); // Formato ISO 8601
-    }
-    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 + Schema ID
-    $stmt = $pdo->prepare("
-        SELECT et.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);
-
-    if (!$result) {
-        throw new Exception("No Cliente/Schema found for iddatadb {$iddatadb}");
-    }
-
-    $clienteId = (int) $result['clienteId'];
-    $schemaId  = (int) $result['schemaId'];
-
-    // 🔹 STEP 3: Fetch Parts (including idmatrice)
-    $stmt = $pdo->prepare("
-        SELECT part_number, part_description, material, color, mix, idmatrice
-        FROM identification_parts
-        WHERE iddatadb = :iddatadb
-    ");
-    $stmt->execute(['iddatadb' => $iddatadb]);
-    $parts = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-    // 🔹 STEP 4: Fetch Field Values with Labels
-    $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 = [];
-    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'];
-    }
-
-    // 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 5: Create CommessaWeb (NOT WebOrder)
-    $commessaWebPayload = [
-        "Cliente" => $clienteId,
-        "SchemaCustomField" => $schemaId,
-        "Richiedente" => "Test Web Import",
-        "Descrizione" => "TEST CommessaWeb",
-    ];
-
-    // Costruisci log curl-like per STEP 5
-    $jsonPayload = json_encode($commessaWebPayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-    $logContentStep5 = "curl --location --request POST '{$apiBaseUrl}CommessaWeb' \\\n" .
-        "--header 'Content-Type: application/json' \\\n" .
-        "--header 'Authorization: Bearer ••••••' \\\n" .
-        "--data '{$jsonPayload}'";
-
-    $commessaWeb = $api->post("CommessaWeb", $commessaWebPayload);
-
-    $logContentStep5 .= "\n\nRESPONSE:\n" . json_encode($commessaWeb, JSON_PRETTY_PRINT);
-
-    // Salva log
-    $logFileStep5 = $logDir . "commessa_create_step5_" . $iddatadb . "_" . time() . ".txt";
-    file_put_contents($logFileStep5, $logContentStep5);
-
-    $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"));
-        }
-
-        $campionePayload = [
-            "Commessa" => $commessaId,
-            "Matrice" => $matriceId,
-            "SottoMatrice" => null,
-            "SchemaCustomField" => $schemaId,
-            "NoteWeb" => $part["part_description"] ?? ""
-        ];
-
-        // Costruisci curl-like per questo campione
-        $jsonPayload = json_encode($campionePayload, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        $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";
-
-        $campione = $api->post("Campione", $campionePayload);
-
-        $logContentStep6 .= "RESPONSE:\n" . json_encode($campione, JSON_PRETTY_PRINT) . "\n\n---\n";
-
-        $campione["PartNumber"] = $part["part_number"] ?? "";
-        $campione["Material"] = $part["material"] ?? "";
-        $campione["Color"] = $part["color"] ?? "";
-        $campione["Mix"] = $part["mix"] ?? "";
-
-        $campioni[] = $campione;
-    }
-
-    // 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
-    ]);
-
-    // 🔹 STEP 9: Send CommessaWeb to laboratory (commentato come richiesto)
-    /*
-    $sendResult = $api->post("CommessaWeb({$commessaId})/InviaCommessa", []);
-
-    // Logga il POST
-    $logContentStep9 = "curl --location --request POST '{$apiBaseUrl}CommessaWeb({$commessaId})/InviaCommessa' \\\n" .
-                       "--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);
-    */
-
-    // 🔹 STEP 10: GET di controllo post-PATCH
-    $expand = "CommesseCustomFields(\$expand=CustomField)";
-    $commessaAfterPatch = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=" . $expand);
-
-    // Logga il GET di controllo
-    $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 11: Prepare final response
-    $finalCommessa = [
-        "Cliente" => $clienteId,
-        "SchemaCustomField" => $schemaId,
-        "Richiedente" => $commessaWeb["Richiedente"] ?? "Web Import",
-        "Descrizione" => $commessaWeb["Descrizione"] ?? "",
-        "CommesseCustomFields" => $commessaAfterPatch["CommesseCustomFields"] ?? [],
-        "Campioni" => $campioni,
-        "Inviata" => 0 // Non inviato, come richiesto
-    ];
-
-    echo json_encode([
-        "success" => true,
-        "commessaWeb" => $finalCommessa,
-        "commessaWebApiResponse" => $commessaWeb, // Incluso per debug
-        "totalCampioni" => count($campioni),
-        "totalCustomFields" => count($commessaAfterPatch["CommesseCustomFields"] ?? []),
-        "message" => "Export successful",
-        "logFiles" => [
-            "step5_create" => $logFileStep5,
-            "step6_campioni" => $logFileStep6,
-            "step7_patch" => $logFileStep7,
-            "step10_get" => $logFileStep10
-        ]
-    ]);
-} catch (Exception $e) {
-    error_log("LIMS Export Error: " . $e->getMessage() . "\nTrace: " . $e->getTraceAsString());
-
-    echo json_encode([
-        "success" => false,
-        "message" => "Export failed: " . $e->getMessage(),
-        "logFiles" => [
-            "step5_create" => $logFileStep5 ?? null,
-            "step6_campioni" => $logFileStep6 ?? null,
-            "step7_patch" => $logFileStep7 ?? null,
-            "step10_get" => $logFileStep10 ?? null
-        ]
-    ]);
-}

public/userarea/get_rapporto_prova.php

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

public/userarea/historical_trf.php

@@ -662,11 +662,6 @@ 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) {
@@ -717,7 +712,11 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     $manualIndex++;
                                                 }
                                             }
-                                            // Colonne Import Reference Code, filename_import
+                                            // Colonne status, 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
@@ -735,12 +734,6 @@ 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) {
@@ -755,7 +748,12 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     $headerIndex++;
                                                 }
                                             }
-                                            // Header per Import Reference Code, filename_import
+                                            // Header per status, 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>";
@@ -772,11 +770,13 @@ 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,25 +806,6 @@ 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) {
@@ -882,6 +863,20 @@ 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_edit2.php

@@ -1,4 +1,17 @@
 <?php
+// Abilita errori per debug
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
+ini_set('log_errors', 1);
+ini_set('error_log', __DIR__ . '/import_debug.log');
+if (!file_exists(__DIR__ . '/import_debug.log')) {
+    file_put_contents(__DIR__ . '/import_debug.log', "Inizio importazione alle " . date('Y-m-d H:i:s') . "\n", FILE_APPEND);
+}
+
+// Log iniziale
+error_log("Inizio importazione alle " . date('Y-m-d H:i:s'));
+
 include('include/headscript.php');
 
 if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['template_id']) || !isset($_POST['selected_rows']) || !isset($_POST['filename'])) {
@@ -12,6 +25,11 @@ $columns = json_decode($_POST['columns'], true) ?? $_SESSION['columns'];
 $rows = json_decode($_POST['rows'], true) ?? $_SESSION['rows'];
 $newFilename = htmlspecialchars($_POST['filename']) ?? $_SESSION['filename'];
 
+// Log dei dati ricevuti
+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));
+
 // Recupera l'ID dell'utente loggato
 $user_id = $iduserlogin ?? 1;
 
@@ -21,8 +39,8 @@ $pdo = $db->getConnection();
 // Genera un UUID univoco per importreferencecode
 $importReferenceCode = date('YmdHis') . '-' . uniqid();
 
-// Recupera tutti i mapping dal template, includendo is_visible_import
+// Recupera tutti i mapping dal template
-$stmt = $pdo->prepare("SELECT id, excel_column, data_type, is_required, manual_default, is_manual, field_label, field_id, main_field, is_visible_import FROM template_mapping WHERE template_id = ?");
+$stmt = $pdo->prepare("SELECT id, excel_column, data_type, is_required, manual_default, is_manual, field_label, field_id, main_field FROM template_mapping WHERE template_id = ?");
 $stmt->execute([$template_id]);
 $allMappings = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
@@ -34,7 +52,7 @@ if (empty($allMappings)) {
 // Trova il campo main_field
 $mainFieldMapping = null;
 foreach ($allMappings as $mapping) {
-    if ($mapping['main_field'] == 1 && $mapping['is_visible_import'] == 1) {
+    if ($mapping['main_field'] == 1) {
         $mainFieldMapping = $mapping;
         break;
     }
@@ -79,7 +97,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
     <?php include('cssinclude.php'); ?>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2Lw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.css">
     <style>
         .cell-changed {
             background-color: #fff3b0 !important;
@@ -388,27 +405,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
         .save-all-btn:hover {
             background-color: #218838;
         }
-
-        #exportConfirmModal,
-        #exportResponseModal {
-            z-index: 1300 !important;
-        }
-
-        #exportConfirmModal .modal-backdrop,
-        #exportResponseModal .modal-backdrop {
-            z-index: 1299 !important;
-        }
-
-        .add-part-btn {
-            padding: 2px 5px;
-            font-size: 10px;
-            line-height: 1;
-            border-radius: 3px;
-        }
-
-        .flatpickr-input {
-            cursor: pointer;
-        }
     </style>
     <title>Edit Imported Data - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
@@ -447,7 +443,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                         <div class="grid-cell" style="flex: 0 0 150px;">
                                             <?php
                                             $fieldValue = $mainFieldMapping['manual_default'] ?? '';
-                                            if ($mainFieldMapping['data_type'] === 'Data' && $mainFieldMapping['manual_default'] === 'today') {
+                                            if ($mainFieldMapping['data_type'] === 'DATE' && $mainFieldMapping['manual_default'] === 'today') {
                                                 $fieldValue = date('Y-m-d');
                                             }
                                             $inputClass = $mainFieldMapping['is_manual'] ? 'manual-input' : 'auto-input';
@@ -457,8 +453,8 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                 echo "<option value=''>Seleziona...</option>";
                                                 echo "</select>";
                                                 echo "<button type='button' class='propagate-btn' data-column='main_field'><i class='fas fa-arrow-down'></i></button>";
-                                            } elseif ($mainFieldMapping['data_type'] === 'Data') {
+                                            } elseif ($mainFieldMapping['data_type'] === 'DATE') {
-                                                echo "<input type='text' class='custom-field date-picker $inputClass' data-column='main_field' value='" . htmlspecialchars($fieldValue) . "' " . ($mainFieldMapping['is_required'] ? 'required' : '') . ">";
+                                                echo "<input type='date' class='custom-field $inputClass' data-column='main_field' value='" . htmlspecialchars($fieldValue) . "' " . ($mainFieldMapping['is_required'] ? 'required' : '') . ">";
                                                 echo "<button type='button' class='propagate-btn' data-column='main_field'><i class='fas fa-arrow-down'></i></button>";
                                             } elseif ($mainFieldMapping['data_type'] === 'INT') {
                                                 echo "<input type='number' class='custom-field $inputClass' data-column='main_field' value='" . htmlspecialchars($fieldValue) . "' " . ($mainFieldMapping['is_required'] ? 'required' : '') . ">";
@@ -474,7 +470,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                     <?php
                                     $autoIndex = 0;
                                     foreach ($allMappings as $mapping) {
-                                        if (!$mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                        if (!$mapping['is_manual'] && $mapping['main_field'] != 1) {
                                             $inputClass = 'auto-input';
                                             if ($mapping['is_required']) $inputClass .= ' required-input';
                                             if ($mapping['data_type'] === 'SceltaMultipla') {
@@ -492,20 +488,20 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                     }
                                     $manualIndex = 0;
                                     foreach ($allMappings as $mapping) {
-                                        if ($mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                        if ($mapping['is_manual'] && $mapping['main_field'] != 1) {
                                             $fieldValue = $mapping['manual_default'] ?? '';
-                                            if ($mapping['data_type'] === 'Data' && $mapping['manual_default'] === 'today') {
+                                            if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today') {
                                                 $fieldValue = date('Y-m-d');
                                             }
                                             $inputClass = 'manual-input';
                                             if ($mapping['is_required']) $inputClass .= ' required-input';
                                             echo "<div class='grid-cell' style='flex: 0 0 150px;'>";
                                             if ($mapping['data_type'] === 'SceltaMultipla') {
-                                                echo "<select class='custom-field dropdown-select $inputClass' data-column='manual_$manualIndex' data-field-id='{$mapping['field_id']}' data-selected-value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
+                                                echo "<select class='custom-field dropdown-select $inputClass' data-column='manual_$manualIndex' data-field-id='{$mapping['field_id']}' data-selected-value='" . htmlspecialchars($fieldValue) . "' " . ($mainFieldMapping['is_required'] ? 'required' : '') . ">";
                                                 echo "<option value=''>Seleziona...</option>";
                                                 echo "</select>";
-                                            } elseif ($mapping['data_type'] === 'Data') {
+                                            } elseif ($mapping['data_type'] === 'DATE') {
-                                                echo "<input type='text' class='custom-field date-picker $inputClass' data-column='manual_$manualIndex' value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
+                                                echo "<input type='date' class='custom-field $inputClass' data-column='manual_$manualIndex' value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                             } elseif ($mapping['data_type'] === 'INT') {
                                                 echo "<input type='number' class='custom-field $inputClass' data-column='manual_$manualIndex' value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                             } else {
@@ -516,8 +512,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                             $manualIndex++;
                                         }
                                     }
-                                    // Aggiunta per Tested Component (senza propagate)
-                                    echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>";
                                     echo "<div class='grid-cell' style='flex: 0 0 200px;'></div>";
                                     echo "<div class='grid-cell' style='flex: 0 0 250px;'></div>";
                                     echo "<div class='grid-cell' style='flex: 0 0 150px;'></div>";
@@ -539,20 +533,17 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                     <?php
                                     $headerIndex = $mainFieldMapping ? 3 : 2;
                                     foreach ($allMappings as $mapping) {
-                                        if (!$mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                        if (!$mapping['is_manual'] && $mapping['main_field'] != 1) {
                                             echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>" . htmlspecialchars($mapping['field_label']) . "<div class='resizer'></div></div>";
                                             $headerIndex++;
                                         }
                                     }
                                     foreach ($allMappings as $mapping) {
-                                        if ($mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                        if ($mapping['is_manual'] && $mapping['main_field'] != 1) {
                                             echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>" . htmlspecialchars($mapping['field_label']) . "<div class='resizer'></div></div>";
                                             $headerIndex++;
                                         }
                                     }
-                                    // Aggiunta header per Tested Component
-                                    echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 150px; position: relative;'>Tested Component<div class='resizer'></div></div>";
-                                    $headerIndex++;
                                     echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 200px; position: relative;'>AWB Number<div class='resizer'></div></div>";
                                     $headerIndex++;
                                     echo "<div class='grid-header' data-index='$headerIndex' style='flex: 0 0 250px; position: relative;'>Tracking Info<div class='resizer'></div></div>";
@@ -568,11 +559,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                 <?php foreach ($importedData as $index => $row): ?>
                                     <div class="grid-row" data-id="<?= $row['iddatadb'] ?>">
                                         <div class="grid-cell button-cell" style="flex: 0 0 210px; position: relative;">
-                                            <!-- commented only for admin roles -->
+                                            <button type="button" class="export-lims-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Export to LIMS" style="background: #eb0b0bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-upload"></i></button>
-                                            <?php if ((Auth::user()->hasRole('Admin'))) : ?>
-                                                <button type="button" class="export-lims-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Export to LIMS" style="background: #eb0b0bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-upload"></i></button>
-                                            <?php endif; ?>
-
                                             <button type="button" class="save-btn action-btn" data-row="<?= $index ?>" title="Save" style="background: #28a745; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-save"></i></button>
                                             <button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Photos" style="background: #007bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-camera"></i></button>
                                             <button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Parts" style="background: #ffc107; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-puzzle-piece"></i></button>
@@ -582,7 +569,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                             $detail = array_filter($manualDetails, fn($d) => $d['mapping_id'] == $mainFieldMapping['id'] && $d['datadb_id'] == $row['iddatadb']);
                                             $detail = reset($detail) ?: ['field_value' => $mainFieldMapping['manual_default']];
                                             $fieldValue = $detail['field_value'] ?? $mainFieldMapping['manual_default'] ?? '';
-                                            if ($mainFieldMapping['data_type'] === 'Data' && $mainFieldMapping['manual_default'] === 'today' && empty($fieldValue)) {
+                                            if ($mainFieldMapping['data_type'] === 'DATE' && $mainFieldMapping['manual_default'] === 'today' && empty($fieldValue)) {
                                                 $fieldValue = date('Y-m-d');
                                             }
                                             $requiredClass = ($mainFieldMapping['is_required'] && (is_null($fieldValue) || $fieldValue === '')) ? 'missing-required' : '';
@@ -594,8 +581,8 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     <select name="rows[<?= $index ?>][details][<?= $mainFieldMapping['id'] ?>][field_value]" class="cell-input dropdown-select <?= $inputClass ?>" data-mapping-id="<?= $mainFieldMapping['id'] ?>" data-field-id="<?= $mainFieldMapping['field_id'] ?>" data-selected-value="<?= htmlspecialchars($fieldValue) ?>" <?= $mainFieldMapping['is_required'] ? 'required' : '' ?>>
                                                         <option value="">Seleziona...</option>
                                                     </select>
-                                                <?php elseif ($mainFieldMapping['data_type'] === 'Data'): ?>
+                                                <?php elseif ($mainFieldMapping['data_type'] === 'DATE'): ?>
-                                                    <input type="text" name="rows[<?= $index ?>][details][<?= $mainFieldMapping['id'] ?>][field_value]" value="<?= htmlspecialchars($fieldValue) ?>" class="cell-input date-picker <?= $inputClass ?>" <?= $mainFieldMapping['is_required'] ? 'required' : '' ?>>
+                                                    <input type="date" name="rows[<?= $index ?>][details][<?= $mainFieldMapping['id'] ?>][field_value]" value="<?= htmlspecialchars($fieldValue) ?>" class="cell-input <?= $inputClass ?>" <?= $mainFieldMapping['is_required'] ? 'required' : '' ?>>
                                                 <?php elseif ($mainFieldMapping['data_type'] === 'INT'): ?>
                                                     <input type="number" name="rows[<?= $index ?>][details][<?= $mainFieldMapping['id'] ?>][field_value]" value="<?= htmlspecialchars($fieldValue) ?>" class="cell-input <?= $inputClass ?>" <?= $mainFieldMapping['is_required'] ? 'required' : '' ?>>
                                                 <?php else: ?>
@@ -614,7 +601,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                         $rowDetails = array_filter($manualDetails, fn($d) => $d['datadb_id'] == $row['iddatadb']);
                                         $autoIndex = 0;
                                         foreach ($allMappings as $mapping) {
-                                            if (!$mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                            if (!$mapping['is_manual'] && $mapping['main_field'] != 1) {
                                                 $detail = array_filter($rowDetails, fn($d) => $d['mapping_id'] == $mapping['id']);
                                                 $detail = reset($detail) ?: ['field_value' => $mapping['manual_default']];
                                                 $fieldValue = $detail['field_value'] ?? $mapping['manual_default'] ?? '';
@@ -626,8 +613,8 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     echo "<select name='rows[$index][details][{$mapping['id']}][field_value]' class='cell-input dropdown-select $inputClass' data-mapping-id='{$mapping['id']}' data-field-id='{$mapping['field_id']}' data-selected-value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                     echo "<option value=''>Seleziona...</option>";
                                                     echo "</select>";
-                                                } elseif ($mapping['data_type'] === 'Data') {
+                                                } elseif ($mapping['data_type'] === 'DATE') {
-                                                    echo "<input type='text' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input date-picker $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
+                                                    echo "<input type='date' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                 } elseif ($mapping['data_type'] === 'INT') {
                                                     echo "<input type='number' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                 } else {
@@ -640,11 +627,11 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                         }
                                         $manualIndex = 0;
                                         foreach ($allMappings as $mapping) {
-                                            if ($mapping['is_manual'] && $mapping['main_field'] != 1 && $mapping['is_visible_import'] == 1) {
+                                            if ($mapping['is_manual'] && $mapping['main_field'] != 1) {
                                                 $detail = array_filter($rowDetails, fn($d) => $d['mapping_id'] == $mapping['id']);
                                                 $detail = reset($detail) ?: ['field_value' => $mapping['manual_default']];
                                                 $fieldValue = $detail['field_value'] ?? $mapping['manual_default'] ?? '';
-                                                if ($mapping['data_type'] === 'Data' && $mapping['manual_default'] === 'today' && empty($fieldValue)) {
+                                                if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today' && empty($fieldValue)) {
                                                     $fieldValue = date('Y-m-d');
                                                 }
                                                 $requiredClass = ($mapping['is_required'] && (is_null($fieldValue) || $fieldValue === '')) ? 'missing-required' : '';
@@ -655,8 +642,8 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                     echo "<select name='rows[$index][details][{$mapping['id']}][field_value]' class='cell-input dropdown-select $inputClass' data-mapping-id='{$mapping['id']}' data-field-id='{$mapping['field_id']}' data-selected-value='" . htmlspecialchars($fieldValue) . "' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                     echo "<option value=''>Seleziona...</option>";
                                                     echo "</select>";
-                                                } elseif ($mapping['data_type'] === 'Data') {
+                                                } elseif ($mapping['data_type'] === 'DATE') {
-                                                    echo "<input type='text' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input date-picker $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
+                                                    echo "<input type='date' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                 } elseif ($mapping['data_type'] === 'INT') {
                                                     echo "<input type='number' name='rows[$index][details][{$mapping['id']}][field_value]' value='" . htmlspecialchars($fieldValue) . "' class='cell-input $inputClass' " . ($mapping['is_required'] ? 'required' : '') . ">";
                                                 } else {
@@ -667,12 +654,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                                 $manualIndex++;
                                             }
                                         }
-                                        // Aggiunta cella per Tested Component
-                                        echo "<div class='grid-cell editable-cell' data-col='tested_component' data-row='$index' data-index='$cellIndex' style='flex: 0 0 150px; display: flex; align-items: center;'>";
-                                        echo "<input type='text' name='rows[$index][tested_component]' value='' class='cell-input manual-input' style='flex: 1; margin-right: 5px;'>";
-                                        echo "<button type='button' class='add-part-btn btn btn-sm btn-primary' data-row='$index'><i class='fas fa-plus'></i></button>";
-                                        echo "</div>";
-                                        $cellIndex++;
                                         ?>
                                         <div class="grid-cell" style="flex: 0 0 200px;">
                                             <select name="rows[<?= $index ?>][carrier]" class="carrier-select">
@@ -724,64 +705,21 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
     <?php include('jsinclude.php'); ?>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js"></script>
     <script src="photos.js"></script>
     <script src="parts.js"></script>
     <script src="tracking.js"></script>
-    <script src="export_to_lims.js"></script>
     <script>
-        // Initialize Flatpickr for all date inputs
         document.addEventListener("DOMContentLoaded", function() {
-            flatpickr(".date-picker", {
+            console.log("Page loaded, initializing event listeners");
-                dateFormat: "Y-m-d",
-                allowInput: true,
-                onOpen: function(selectedDates, dateStr, instance) {
-                    instance.input.closest('.grid-cell').classList.add('expanded');
-                },
-                onClose: function(selectedDates, dateStr, instance) {
-                    instance.input.closest('.grid-cell').classList.remove('expanded');
-                    // Trigger change event to handle unsaved changes
-                    const event = new Event('change');
-                    instance.input.dispatchEvent(event);
-                }
-            });
-        });
 
-        $(document).on("click", ".export-lims-btn", function() {
+            const inputs = document.querySelectorAll(".cell-input, .dropdown-select, .carrier-select, .awb-input");
-            let rowId = $(this).data("row");
-            let idDataDb = $(this).data("iddatadb");
-
-            $.ajax({
-                url: "export_to_lims.php",
-                method: "POST",
-                data: {
-                    iddatadb: idDataDb
-                },
-                dataType: "json",
-                beforeSend: function() {
-                    alert("Export started in background for row " + rowId);
-                },
-                success: function(response) {
-                    if (response.success) {
-                        alert(response.message);
-                    } else {
-                        alert("❌ Error: " + response.message);
-                    }
-                },
-                error: function(xhr, status, error) {
-                    alert("❌ AJAX error: " + error);
-                }
-            });
-        });
-
-        document.addEventListener("DOMContentLoaded", function() {
-            const inputs = document.querySelectorAll(".cell-input, .dropdown-select, .carrier-select, .awb-input, .date-picker");
             const unsavedDiv = document.getElementById("unsavedChanges");
             const changedList = document.getElementById("changedFields");
             let hasChanges = false;
             let changedFields = {};
 
             function renderChangedList() {
+                console.log("Rendering changed fields list:", changedFields);
                 changedList.innerHTML = "";
                 Object.keys(changedFields).forEach(rowIndex => {
                     const fields = changedFields[rowIndex];
@@ -796,6 +734,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
 
             inputs.forEach(el => {
                 el.addEventListener("change", () => {
+                    console.log("Input changed:", el.name);
                     hasChanges = true;
                     const gridCell = el.closest(".grid-cell");
                     const colIndex = gridCell?.dataset.index;
@@ -826,6 +765,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             document.querySelectorAll(".save-btn").forEach(btn => {
                 btn.addEventListener("click", () => {
                     const rowIndex = btn.dataset.row;
+                    console.log(`Saving row ${rowIndex}`);
                     const row = btn.closest('.grid-row');
                     const iddatadb = row.getAttribute('data-id');
                     const formData = new FormData();
@@ -852,6 +792,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                             return response.json();
                         })
                         .then(data => {
+                            console.log("Save response:", data);
                             if (data.success) {
                                 const cells = row.querySelectorAll('.grid-cell');
                                 cells.forEach(cell => {
@@ -875,12 +816,14 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                             }
                         })
                         .catch(error => {
+                            console.error("Save error:", error);
                             alert('Errore durante il salvataggio: ' + error.message);
                         });
                 });
             });
 
             document.querySelector('.save-all-btn').addEventListener('click', async () => {
+                console.log("Saving all rows");
                 const rows = document.querySelectorAll('.grid-row');
                 let successCount = 0;
                 let errorMessages = [];
@@ -888,13 +831,16 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                 for (const row of rows) {
                     const saveBtn = row.querySelector('.save-btn');
                     if (!saveBtn) {
+                        console.warn(`No save button found in row with data-id: ${row.getAttribute('data-id')}`);
                         continue;
                     }
                     const rowIndex = saveBtn.dataset.row;
                     const iddatadb = row.getAttribute('data-id');
                     if (!rowIndex || !iddatadb) {
+                        console.warn(`Missing rowIndex or iddatadb in row:`, row);
                         continue;
                     }
+                    console.log(`Processing row ${rowIndex} with iddatadb ${iddatadb}`);
                     const formData = new FormData();
 
                     const inputs = row.querySelectorAll(`input[name^="rows[${rowIndex}][details]"], select[name^="rows[${rowIndex}][details]"]`);
@@ -918,6 +864,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                         if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
                         const data = await response.json();
 
+                        console.log(`Row ${rowIndex} save response:`, data);
                         if (data.success) {
                             successCount++;
                             const cells = row.querySelectorAll('.grid-cell');
@@ -937,12 +884,14 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                             errorMessages.push(`Riga ${parseInt(rowIndex) + 1}: ${data.message}`);
                         }
                     } catch (error) {
+                        console.error(`Row ${rowIndex} save error:`, error);
                         errorMessages.push(`Riga ${parseInt(rowIndex) + 1}: ${error.message}`);
                     }
                 }
 
                 renderChangedList();
                 hasChanges = Object.keys(changedFields).length > 0;
+                console.log(`Save all completed: ${successCount} successes, ${errorMessages.length} errors`);
 
                 if (errorMessages.length === 0) {
                     alert(`Tutte le ${successCount} righe salvate con successo!`);
@@ -958,27 +907,10 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                 }
             });
         });
-
-        // Gestisci la chiusura dei modali per rimuovere i backdrop
-        document.querySelectorAll('#exportConfirmModal, #exportResponseModal').forEach(modal => {
-            modal.addEventListener('hidden.bs.modal', () => {
-                // Rimuovi tutti i backdrop residui
-                document.querySelectorAll('.modal-backdrop').forEach(backdrop => {
-                    backdrop.remove();
-                });
-                // Ripristina il body
-                document.body.classList.remove('modal-open');
-                document.body.style.paddingRight = '';
-                // Assicurati che l'overlay sia nascosto
-                const overlay = document.querySelector('.overlay.toggle-icon');
-                if (overlay) {
-                    overlay.style.display = 'none';
-                }
-            });
-        });
     </script>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
+            console.log("Initializing cell expansion and propagation");
             const inputs = document.querySelectorAll('.cell-input');
             inputs.forEach(input => {
                 input.addEventListener('focus', function() {
@@ -992,6 +924,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             const propagateButtons = document.querySelectorAll('.propagate-btn');
             propagateButtons.forEach(button => {
                 button.addEventListener('click', function() {
+                    console.log("Propagating value for column:", this.getAttribute('data-column'));
                     const column = this.getAttribute('data-column');
                     const input = this.previousElementSibling;
                     const value = input.value;
@@ -1013,17 +946,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                                         targetInput.setAttribute('data-selected-value', value);
                                         const event = new Event('change');
                                         targetInput.dispatchEvent(event);
-                                    } else if (targetInput.classList.contains('date-picker')) {
-                                        // Update Flatpickr instance
-                                        const flatpickrInstance = targetInput._flatpickr;
-                                        if (flatpickrInstance && value) {
-                                            flatpickrInstance.setDate(value, true);
-                                        }
-                                        const event = new Event('change');
-                                        targetInput.dispatchEvent(event);
-                                    } else {
-                                        const event = new Event('change');
-                                        targetInput.dispatchEvent(event);
                                     }
                                 }
                             }
@@ -1039,6 +961,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             let columnIndex = 0;
             resizers.forEach(resizer => {
                 resizer.addEventListener('mousedown', function(e) {
+                    console.log("Starting column resize");
                     currentResizer = resizer;
                     const header = resizer.parentElement;
                     columnIndex = header.getAttribute('data-index');
@@ -1061,6 +984,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
 
                 function stopResize() {
                     if (currentResizer) {
+                        console.log("Stopping column resize");
                         document.removeEventListener('mousemove', resize);
                         document.removeEventListener('mouseup', stopResize);
                         currentResizer = null;
@@ -1071,11 +995,13 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
     </script>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
+            console.log("Initializing dropdown population");
             const dropdownData = {};
 
             async function populateDropdowns() {
                 const dropdowns = document.querySelectorAll('.dropdown-select');
                 if (dropdowns.length === 0) {
+                    console.log("No dropdowns found");
                     return;
                 }
 
@@ -1086,6 +1012,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                 const missingFieldIds = uniqueFieldIds.filter(fieldId => !dropdownData[fieldId]);
 
                 if (missingFieldIds.length > 0) {
+                    console.log("Fetching dropdown data for field IDs:", missingFieldIds);
                     try {
                         const response = await fetch(
                             `get_customfield_values.php?field_ids=${missingFieldIds.join(",")}`
@@ -1093,12 +1020,16 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                         if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
                         const data = await response.json();
 
-                        if (data.error) {} else {
+                        if (data.error) {
+                            console.error("Fetch error:", data.error);
+                        } else {
                             for (const fieldId of Object.keys(data)) {
                                 dropdownData[fieldId] = data[fieldId] || [];
                             }
                         }
-                    } catch (error) {}
+                    } catch (error) {
+                        console.error("Fetch error:", error);
+                    }
                 }
 
                 dropdowns.forEach(dropdown => {
@@ -1108,6 +1039,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
 
                     if (!fieldId || !dropdownData[fieldId]) {
                         dropdown.innerHTML = '<option value="">Errore nel caricamento</option>';
+                        console.warn(`No data for fieldId ${fieldId}`);
                         return;
                     }
 
@@ -1126,6 +1058,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
 
                     if ((currentValue || selectedValue) && dropdown.value !== (currentValue || selectedValue)) {
                         dropdown.value = '';
+                        console.warn(`Value ${currentValue || selectedValue} not found for fieldId ${fieldId}`);
                     }
                 });
             }
@@ -1133,89 +1066,6 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             populateDropdowns();
         });
     </script>
-    <script>
-        $(document).on('click', '.add-part-btn', function() {
-            const rowIndex = $(this).data('row');
-            const row = $(this).closest('.grid-row');
-            const iddatadb = row.data('id');
-            const input = row.find(`input[name="rows[${rowIndex}][tested_component]"]`);
-            const description = input.val().trim();
-
-            if (!description) {
-                alert('Inserisci un valore per Tested Component');
-                return;
-            }
-
-            const data = {
-                iddatadb: iddatadb,
-                parts: [{
-                    part_number: '1', // Imposta part_number a '1'
-                    part_description: description,
-                    mix: 'N'
-                }]
-            };
-
-            $.ajax({
-                url: 'save_parts.php',
-                method: 'POST',
-                contentType: 'application/json',
-                data: JSON.stringify(data),
-                success: function(response) {
-                    if (response.success) {
-                        alert('Parte aggiunta con successo!');
-                        input.val(''); // Pulisci l'input dopo l'aggiunta
-                        // Opzionale: aggiorna la tabella delle parti se il modal è aperto
-                        const partsModal = $('#partsModal');
-                        if (partsModal.hasClass('show')) {
-                            loadParts(iddatadb);
-                        }
-                    } else {
-                        alert('Errore: ' + response.message);
-                    }
-                },
-                error: function() {
-                    alert('Errore durante la richiesta AJAX');
-                }
-            });
-        });
-    </script>
-    <!-- Modale di conferma per l'esportazione -->
-    <div class="modal fade" id="exportConfirmModal" tabindex="-1" aria-labelledby="exportConfirmModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exportConfirmModalLabel">Conferma Esportazione</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <p id="exportConfirmMessage">Confermi l'esportazione al LIMS per iddatadb <span id="exportIddatadb"></span>?</p>
-                </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" id="exportConfirmBtn">Conferma</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Modale di risposta per l'esportazione -->
-    <div class="modal fade" id="exportResponseModal" tabindex="-1" aria-labelledby="exportResponseModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exportResponseModalLabel">Risultato Esportazione</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <p id="exportResponseMessage"></p>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal">Chiudi</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
 </body>
 
 </html>

public/userarea/import_insert.php

@@ -17,27 +17,23 @@ 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 = array_map('intval', $_POST['selected_rows']);
+$selected_rows = $_POST['selected_rows'];
-$columns = json_decode($_POST['columns'], true);
+$columns = json_decode($_POST['columns'], true); // Header dell'XLS
-$rows = json_decode($_POST['rows'], true);
+$rows = json_decode($_POST['rows'], true);       // Dati dell'XLS
-$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;
+$user_id = $iduserlogin ?? 1; // Default a 1 se non definito
 
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
@@ -64,38 +60,30 @@ foreach ($allMappings as $mapping) {
     }
 }
 
-// Inserisci le righe selezionate in datadb
+// Inserisci le righe selezionate in datadb (solo campi generici con templateid)
 $insertedIds = [];
 foreach ($selected_rows as $rowIndex) {
-    $row = $rows[$rowIndex] ?? null;
+    $row = $rows[$rowIndex];
-    $excelrow = $excelrows[$rowIndex] ?? null;
-
-    if ($row === null || $excelrow === null) {
-        error_log("Errore: riga o excelrow mancante per rowIndex $rowIndex");
-        continue;
-    }
-
     $values = [
-        $template_id,
+        $template_id,         // templateid
-        $importReferenceCode,
+        $importReferenceCode, // importreferencecode
-        $newFilename,
+        $newFilename,         // filename_import
-        'i',
+        'i',                  // status
-        $user_id,
+        $user_id,             // user_id
-        null,
+        null,                 // limscode
-        date('Y-m-d'),
+        date('Y-m-d')         // importdate
-        $excelrow // Aggiunto excelrow per la colonna excelrow
     ];
-    $sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate, excelrow) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+    $sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate) VALUES (?, ?, ?, ?, ?, ?, ?)";
     $stmt = $pdo->prepare($sql);
     $stmt->execute($values);
 
     $iddatadb = $pdo->lastInsertId();
     $insertedIds[] = $iddatadb;
 
-    // Inserisci tutti i campi in import_data_details
+    // Inserisci tutti i campi (automatici e manuali) in import_data_details
     foreach ($allMappings as $mapping) {
         $fieldValue = null;
-        if (!$mapping['is_manual']) {
+        if (!$mapping['is_manual']) { // Campi automatici dall'XLS
             $excelColumn = trim($mapping['excel_column']);
             $excelColumnIndex = array_search($excelColumn, array_map('trim', $columns));
             if ($excelColumnIndex !== false && isset($row[$excelColumnIndex]) && $row[$excelColumnIndex] !== '') {
@@ -121,7 +109,7 @@ foreach ($selected_rows as $rowIndex) {
                     $fieldValue = !empty($fieldValue) ? htmlspecialchars((string)$fieldValue) : ($mapping['manual_default'] ?? '');
                     break;
             }
-        } else {
+        } else { // Campi manuali
             $fieldValue = $mapping['manual_default'] ?? '';
             if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today') {
                 $fieldValue = date('Y-m-d');
@@ -141,26 +129,29 @@ $_SESSION['inserted_ids'] = $insertedIds;
 
 $params = [
     'template_id' => $template_id,
-    'filename' => $newFilename,
+    'filename'    => $newFilename,
 ];
 
 ?>
-<form id="redirectForm" action="import_edit2.php" method="post">
+    <form id="redirectForm" action="import_edit2.php" method="post">
-    <input type="hidden" name="template_id" value="<?= htmlspecialchars($template_id) ?>">
+        <input type="hidden" name="template_id" value="<?= htmlspecialchars($template_id) ?>">
-    <input type="hidden" name="filename" value="<?= htmlspecialchars($newFilename) ?>">
+        <input type="hidden" name="filename" value="<?= htmlspecialchars($newFilename) ?>">
-    <?php foreach ($selected_rows as $row): ?>
+
-        <input type="hidden" name="selected_rows[]" value="<?= htmlspecialchars($row) ?>">
+        <?php foreach ($selected_rows as $row): ?>
-    <?php endforeach; ?>
+            <input type="hidden" name="selected_rows[]" value="<?= htmlspecialchars($row) ?>">
-    <?php foreach ($insertedIds as $id): ?>
+        <?php endforeach; ?>
-        <input type="hidden" name="inserted_ids[]" value="<?= htmlspecialchars($id) ?>">
+
-    <?php endforeach; ?>
+        <?php foreach ($insertedIds as $id): ?>
-    <input type="hidden" name="columns" value='<?= json_encode($columns) ?>'>
+            <input type="hidden" name="inserted_ids[]" value="<?= htmlspecialchars($id) ?>">
-    <input type="hidden" name="rows" value='<?= json_encode($rows) ?>'>
+        <?php endforeach; ?>
-    <input type="hidden" name="excelrows" value='<?= json_encode($excelrows) ?>'>
+
-</form>
+        <input type="hidden" name="columns" value='<?= json_encode($columns) ?>'>
-<script>
+        <input type="hidden" name="rows" value='<?= json_encode($rows) ?>'>
-    document.getElementById('redirectForm').submit();
+    </form>
-</script>
+    <script>
+        document.getElementById('redirectForm').submit();
+    </script>
 <?php
+
 exit;
-?>
+

public/userarea/import_xls2.php

@@ -21,11 +21,6 @@ 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));
 ?>
@@ -38,7 +33,6 @@ 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;
@@ -146,55 +140,43 @@ error_log("Loaded template: " . print_r($template, true));
                             </div>
                         </div>
                     </div>
+
                     <div class="card-body">
-                        <?php if (!$hasMappings): ?>
+                        <!-- Form per caricare il file -->
-                            <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" <?= !$hasMappings ? 'disabled' : '' ?>>Upload</button>
+                            <button type="submit" class="btn btn-primary">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-->
 
-    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
+    <!-- search modal -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.min.js"></script>
+    <?php //include('include/searchmodal.php');
+    ?>
+    <!-- end search modal -->
+
+    <!--start switcher-->
+    <?php //include('include/themeswitcher.php');
+    ?>
+    <!--end switcher-->
     <?php include('jsinclude.php'); ?>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
@@ -202,12 +184,6 @@ 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();
@@ -226,188 +202,133 @@ error_log("Loaded template: " . print_r($template, true));
                         method: 'POST',
                         body: formData
                     })
-                    .then(response => {
+                    .then(response => response.json())
-                        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');
+                            let html = `
-                            showTable(data);
+                    <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="filename" value="${data.filename}">
+                        <div class="search-container">
+                            <input type="text" id="searchInput" class="form-control" placeholder="Cerca nelle righe...">
+                        </div>
+                        <div class="table-container">
+                            <table class="table table-striped table-bordered">
+                                <thead>
+                                    <tr>
+                                        <th><input type="checkbox" id="selectAll"> Seleziona</th>
+                                        ${data.columns.map(col => `<th>${col || 'Colonna senza nome'}<div class="resize-handle"></div></th>`).join('')}
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    ${data.rows.map((row, index) => `
+                                        <tr>
+                                            <td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}"></td>
+                                            ${row.map(cell => `<td>${cell}</td>`).join('')}
+                                        </tr>
+                                    `).join('')}
+                                </tbody>
+                            </table>
+                        </div>
+                        <button type="submit" class="btn btn-primary mt-3" id="proceedButton" disabled>Prosegui</button>
+                    </form>
+                `;
+                            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;
+                                });
+                                updateProceedButton();
+                            });
+
+                            // Event listener per i checkbox delle righe
+                            checkboxes.forEach(checkbox => {
+                                checkbox.addEventListener('change', function() {
+                                    console.log('Checkbox changed, checked: ', this.checked); // Debug
+                                    // 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;
+                                const resizeHandle = th.querySelector('.resize-handle');
+                                if (resizeHandle) {
+                                    resizeHandle.addEventListener('mousedown', (e) => {
+                                        e.preventDefault();
+                                        const startX = e.clientX;
+                                        const startWidth = th.offsetWidth;
+
+                                        const onMouseMove = (e) => {
+                                            const newWidth = Math.max(50, startWidth + (e.clientX - startX));
+                                            th.style.width = `${newWidth}px`;
+                                            th.style.minWidth = `${newWidth}px`;
+                                            th.style.maxWidth = `${newWidth}px`;
+
+                                            const cells = document.querySelectorAll(`.table td:nth-child(${index + 1})`);
+                                            cells.forEach(cell => {
+                                                cell.style.width = `${newWidth}px`;
+                                                cell.style.minWidth = `${newWidth}px`;
+                                                cell.style.maxWidth = `${newWidth}px`;
+                                            });
+                                        };
+
+                                        const onMouseUp = () => {
+                                            document.removeEventListener('mousemove', onMouseMove);
+                                            document.removeEventListener('mouseup', onMouseUp);
+                                        };
+
+                                        document.addEventListener('mousemove', onMouseMove);
+                                        document.addEventListener('mouseup', onMouseUp);
+                                    });
+                                }
+                            });
+
+                            // Aggiungi event listener per la ricerca
+                            const searchInput = document.getElementById('searchInput');
+                            const rows = document.querySelectorAll('.table tbody tr');
+
+                            searchInput.addEventListener('input', function() {
+                                const searchTerm = this.value.toLowerCase();
+                                rows.forEach(row => {
+                                    const text = Array.from(row.cells).slice(1).map(cell => cell.textContent.toLowerCase()).join(' ');
+                                    row.style.display = text.includes(searchTerm) ? '' : 'none';
+                                });
+                            });
+
+                            // Abilita il pulsante se ci sono checkbox selezionate all'inizio
+                            updateProceedButton();
                         }
                     })
                     .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...">
-                    </div>
-                    <div class="table-container">
-                        <table class="table table-striped table-bordered">
-                            <thead>
-                                <tr>
-                                    <th><input type="checkbox" id="selectAll"> Seleziona</th>
-                                    ${data.columns.map(col => `<th>${col || 'Colonna senza nome'}<div class="resize-handle"></div></th>`).join('')}
-                                </tr>
-                            </thead>
-                            <tbody>
-                                ${data.excel_data.map((row, index) => `
-                                    <tr>
-                                        <td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}" data-excelrow="${row.excelrow}"></td>
-                                        ${row.data.map(cell => `<td>${cell}</td>`).join('')}
-                                    </tr>
-                                `).join('')}
-                            </tbody>
-                        </table>
-                    </div>
-                    <button type="submit" class="btn btn-primary mt-3" id="proceedButton" disabled>Prosegui</button>
-                </form>
-                `;
-                tableContainer.innerHTML = html;
-
-                const proceedButton = document.getElementById('proceedButton');
-                const selectAllCheckbox = document.getElementById('selectAll');
-                const checkboxes = document.querySelectorAll('.row-checkbox');
-
-                function updateProceedButton() {
-                    proceedButton.disabled = !Array.from(checkboxes).some(cb => cb.checked);
-                }
-
-                selectAllCheckbox.addEventListener('change', function() {
-                    checkboxes.forEach(checkbox => {
-                        checkbox.checked = this.checked;
-                    });
-                    updateProceedButton();
-                });
-
-                checkboxes.forEach(checkbox => {
-                    checkbox.addEventListener('change', function() {
-                        console.log('Checkbox changed, checked:', this.checked, 'excelrow:', this.dataset.excelrow);
-                        selectAllCheckbox.checked = Array.from(checkboxes).every(cb => cb.checked);
-                        updateProceedButton();
-                    });
-                });
-
-                const thElements = document.querySelectorAll('.table th');
-                thElements.forEach((th, index) => {
-                    if (index === 0) return;
-                    const resizeHandle = th.querySelector('.resize-handle');
-                    if (resizeHandle) {
-                        resizeHandle.addEventListener('mousedown', (e) => {
-                            e.preventDefault();
-                            const startX = e.clientX;
-                            const startWidth = th.offsetWidth;
-
-                            const onMouseMove = (e) => {
-                                const newWidth = Math.max(50, startWidth + (e.clientX - startX));
-                                th.style.width = `${newWidth}px`;
-                                th.style.minWidth = `${newWidth}px`;
-                                th.style.maxWidth = `${newWidth}px`;
-
-                                const cells = document.querySelectorAll(`.table td:nth-child(${index + 1})`);
-                                cells.forEach(cell => {
-                                    cell.style.width = `${newWidth}px`;
-                                    cell.style.minWidth = `${newWidth}px`;
-                                    cell.style.maxWidth = `${newWidth}px`;
-                                });
-                            };
-
-                            const onMouseUp = () => {
-                                document.removeEventListener('mousemove', onMouseMove);
-                                document.removeEventListener('mouseup', onMouseUp);
-                            };
-
-                            document.addEventListener('mousemove', onMouseMove);
-                            document.addEventListener('mouseup', onMouseUp);
-                        });
-                    }
-                });
-
-                const searchInput = document.getElementById('searchInput');
-                const rows = document.querySelectorAll('.table tbody tr');
-
-                searchInput.addEventListener('input', function() {
-                    const searchTerm = this.value.toLowerCase();
-                    rows.forEach(row => {
-                        const text = Array.from(row.cells).slice(1).map(cell => cell.textContent.toLowerCase()).join(' ');
-                        row.style.display = text.includes(searchTerm) ? '' : 'none';
-                    });
-                });
-
-                updateProceedButton();
-            }
         });
     </script>
 </body>
 
-</html>
+</html>

public/userarea/include/navbar.php

@@ -41,21 +41,7 @@
                     </li>
 
                 </ul>
-            </li>
+            </li>-->
-            <li>
-                <a href="javascript:;" class="has-arrow">
-                    <div class="parent-icon"><i class="bx bx-category"></i>
-                    </div>
-                    <div class="menu-title">Other Functions</div>
-                </a>
-                <ul>
-                    <li> <a href="quotations.php"><i class='bx bx-radio-circle'></i><?php echo $quotationstitle; ?></a>
-                    </li>
-
-
-                </ul>
-            </li>
-
 
 
 

public/userarea/insert_template_xls.php

@@ -1,30 +1,28 @@
-<?php include('include/headscript.php');
+<?php include('include/headscript.php'); ?>
-
-// Recupera tutte le routine dal database
-$db = DBHandlerSelect::getInstance();
-$pdo = $db->getConnection();
-$stmt = $pdo->prepare("SELECT * FROM routine");
-$stmt->execute();
-$routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
-?>
 <!doctype html>
 <html lang="en">
 
 <head>
+    <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!--favicon-->
     <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <?php include('cssinclude.php'); ?>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     <title>Insert XLS Template <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
 
 <body>
+    <!--wrapper-->
     <div class="wrapper">
+        <!--sidebar wrapper -->
         <?php include('include/navbar.php'); ?>
+        <!--end sidebar wrapper -->
+        <!--start header -->
         <?php include('include/topbar.php'); ?>
+        <!--end header -->
+        <!--start page wrapper -->
         <div class="page-wrapper">
             <div class="page-content">
                 <div class="card mb-4">
@@ -37,7 +35,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         <ul class="mb-0">
                             <li>Template Name</li>
                             <li>Row Header and Column Header: where the title of the excel starts</li>
-                            <li>Schema and client</li>
+                            <li>Scheme and client</li>
                         </ul>
                     </div>
                 </div>
@@ -75,6 +73,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
                                 <input type="hidden" name="target_table" value="datadb">
 
+
                                 <div class="mb-3">
                                     <label class="form-label">Button Size</label>
                                     <select name="button_size" class="form-control">
@@ -98,7 +97,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                     <label class="form-label">Button Label</label>
                                     <input type="text" name="button_label" class="form-control" value="Click Me">
                                 </div>
-
+                                <!-- Aggiungi il campo per selezionare il cliente -->
                                 <div class="mb-3">
                                     <label class="form-label">Select Client *</label>
                                     <select name="client_id" id="clientSelect" class="form-control" required>
@@ -106,33 +105,68 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                     </select>
                                     <span id="clientLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Recupero clienti in corso...</span>
                                 </div>
-
+                                <!-- Aggiungi il campo per selezionare lo schema -->
                                 <div class="mb-3">
                                     <label class="form-label">Select Schema *</label>
                                     <select name="schema_id" id="schemaSelect" class="form-control" required>
                                         <option value="">Select a schema...</option>
                                     </select>
-                                    <span id="schemaLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Caricamento schemi in corso...</span>
+                                    <span id="schemaLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Loading schemas...</span>
                                 </div>
 
+                                <!-- new section for specific client field -->
                                 <div class="mb-3">
-                                    <label class="form-label">Select Routine</label>
+                                    <label class="form-label">Client-Specific Fields</label>
-                                    <select name="idroutine" id="routineSelect" class="form-control">
+
-                                        <option value="">Select a routine...</option>
+                                    <!-- Intestazioni -->
-                                        <?php foreach ($routines as $routine): ?>
+                                    <div class="row fw-bold text-secondary mb-1">
-                                            <option value="<?php echo $routine['idroutine']; ?>">
+                                        <div class="col-md-3">Field Name</div>
-                                                <?php echo htmlspecialchars($routine['name']); ?>
+                                        <div class="col-md-2">Type</div>
-                                            </option>
+                                        <div class="col-md-2 dropdown-values">Possible Values</div>
-                                        <?php endforeach; ?>
+                                        <div class="col-md-1">Required</div>
-                                    </select>
+                                        <div class="col-md-2">Export Column Name</div>
-                                    <div id="routineDetails" class="mt-2" style="display: none;">
+                                        <div class="col-md-1">Default Value</div>
-                                        <h6>Routine Details</h6>
+                                        <div class="col-md-1">Actions</div>
-                                        <p><strong>Name:</strong> <span id="routineName"></span></p>
-                                        <p><strong>Description:</strong> <span id="routineDescription"></span></p>
-                                        <p><strong>Action 1:</strong> <span id="routineAction1"></span></p>
-                                        <p><strong>Action 2:</strong> <span id="routineAction2"></span></p>
-                                        <p><strong>Action 3:</strong> <span id="routineAction3"></span></p>
                                     </div>
+
+                                    <div id="clientSpecificFields">
+                                        <!-- Contenitore per i campi dinamici -->
+                                        <div class="client-field-row mb-2">
+                                            <div class="row">
+                                                <div class="col-md-3">
+                                                    <input type="text" name="specific_fields[0][name]" class="form-control" placeholder="Field Name (e.g., SKU)">
+                                                </div>
+                                                <div class="col-md-2">
+                                                    <select name="specific_fields[0][type]" class="form-control" onchange="toggleDropdownValues(this)">
+                                                        <option value="text">Text</option>
+                                                        <option value="dropdown">Dropdown</option>
+                                                        <option value="date">Date</option>
+                                                        <option value="boolean">Yes/No</option>
+                                                    </select>
+                                                </div>
+                                                <div class="col-md-2 dropdown-values" style="visibility: hidden;">
+                                                    <input type="text" name="specific_fields[0][possible_values]" class="form-control" placeholder="Values (e.g., Red, Blue, Green)">
+                                                </div>
+                                                <div class="col-md-1">
+                                                    <select name="specific_fields[0][required]" class="form-control">
+                                                        <option value="1">Yes</option>
+                                                        <option value="0">No</option>
+                                                    </select>
+                                                </div>
+                                                <div class="col-md-2">
+                                                    <input type="text" name="specific_fields[0][export_column_name]" class="form-control" placeholder="Export Column Name (e.g., MONCLER_SKU)">
+                                                </div>
+                                                <div class="col-md-1">
+                                                    <input type="text" name="specific_fields[0][default_value]" class="form-control" placeholder="Default Value (optional)">
+                                                </div>
+                                                <div class="col-md-1">
+                                                    <button type="button" class="btn btn-danger remove-field">-</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <button type="button" class="btn btn-primary mt-2" id="addField">Add Field</button>
                                 </div>
 
                                 <br>
@@ -144,72 +178,125 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 </div>
             </div>
         </div>
+        <!--end page wrapper -->
+        <!--start overlay-->
         <div class="overlay toggle-icon"></div>
+        <!--end overlay-->
+        <!--Start Back To Top Button-->
         <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
+        <!--End Back To Top Button-->
         <?php include('include/footer.php'); ?>
     </div>
+    <!--end wrapper-->
 
+    <!-- search modal -->
+    <?php //include('include/searchmodal.php'); 
+    ?>
+    <!-- end search modal -->
+
+    <!--start switcher-->
+    <?php //include('include/themeswitcher.php'); 
+    ?>
+    <!--end switcher-->
+
+    <!-- Includi Select2 JS -->
+
+    <?php include('jsinclude.php'); ?>
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     <script>
+        // Debug iniziale
+        console.log("JavaScript is loaded and running!");
+
         document.addEventListener("DOMContentLoaded", function() {
-            if (typeof jQuery === 'undefined') {
+            console.log("DOM is loaded");
-                alert("Errore: jQuery non è caricato. Contatta l'amministratore.");
-                return;
-            }
 
             const form = document.getElementById("insertTemplateForm");
+            const addFieldButton = document.getElementById("addField");
+            const container = document.getElementById("clientSpecificFields");
             const clientLoadingStatus = document.getElementById("clientLoadingStatus");
             const schemaLoadingStatus = document.getElementById("schemaLoadingStatus");
-            const routineSelect = document.getElementById("routineSelect");
-            const routineDetails = document.getElementById("routineDetails");
-            const routineName = document.getElementById("routineName");
-            const routineDescription = document.getElementById("routineDescription");
-            const routineAction1 = document.getElementById("routineAction1");
-            const routineAction2 = document.getElementById("routineAction2");
-            const routineAction3 = document.getElementById("routineAction3");
 
-            if (!form || !clientLoadingStatus || !schemaLoadingStatus || !routineSelect || !routineDetails) {
+            if (!form || !addFieldButton || !container || !clientLoadingStatus || !schemaLoadingStatus) {
-                alert("Errore: Uno o più elementi della pagina non sono stati trovati. Contatta l'amministratore.");
+                console.error("One or more DOM elements not found:", {
+                    form,
+                    addFieldButton,
+                    container,
+                    clientLoadingStatus,
+                    schemaLoadingStatus
+                });
                 return;
             }
 
+            console.log("All DOM elements found");
+
+            // Controllo che jQuery sia caricato
+            if (typeof jQuery === 'undefined') {
+                console.error("jQuery non è caricato!");
+                return;
+            }
+
+            // Inizializza Select2 sulla tendina dei clienti
             $('#clientSelect').select2({
                 placeholder: "Search for a client...",
                 allowClear: true
+            }).on('select2:open', function() {
+                console.log("Select2 initialized successfully for clientSelect");
+            }).on('select2:select', function(e) {
+                console.log("Client selected:", e.params.data.id, e.params.data.text);
             });
 
+            // Inizializza Select2 sulla tendina degli schemi
             $('#schemaSelect').select2({
                 placeholder: "Search for a schema...",
                 allowClear: true
+            }).on('select2:open', function() {
+                console.log("Select2 initialized successfully for schemaSelect");
             });
 
-            $('#routineSelect').select2({
+            // Funzione per caricare i clienti
-                placeholder: "Select a routine...",
-                allowClear: true
-            });
-
             async function loadClients() {
                 try {
                     clientLoadingStatus.style.display = 'inline';
                     clientLoadingStatus.textContent = 'Recupero clienti in corso...';
+
                     const response = await fetch("get_clienti.php", {
                         method: "GET",
                         headers: {
                             "Content-Type": "application/json"
                         }
                     });
-                    const data = await response.json();
+
-                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    const text = await response.text();
-                    const select = document.getElementById("clientSelect");
+                    console.log("Risposta raw (clienti):", text);
-                    select.innerHTML = '<option value="">Select a client...</option>';
+                    const data = JSON.parse(text);
-                    data.value.forEach(client => {
+
-                        const nome = client.Nominativo || "Nome non disponibile";
+                    if (!response.ok) {
-                        const id = client.IdCliente || "ID non disponibile";
+                        throw new Error(data.error || `Errore HTTP: ${response.status}, Dettagli: ${JSON.stringify(data)}`);
-                        const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                    }
-                        select.add(option);
+
-                    });
+                    if (data.value && Array.isArray(data.value)) {
-                    $(select).trigger('change');
+                        const select = document.getElementById("clientSelect");
-                    clientLoadingStatus.textContent = "Clienti caricati.";
+                        select.innerHTML = '<option value="">Select a client...</option>';
+                        data.value.forEach(client => {
+                            const nome = client.Nominativo || "Nome non disponibile";
+                            const id = client.IdCliente || "ID non disponibile";
+                            const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                            select.add(option);
+                        });
+                        console.log("Clienti caricati con successo.");
+                        clientLoadingStatus.textContent = "Clienti caricati.";
+                    } else {
+                        console.error("Nessun cliente trovato o formato dati non valido.", data);
+                        clientLoadingStatus.textContent = "Nessun cliente trovato.";
+                        Swal.fire({
+                            title: "Errore!",
+                            text: "Nessun cliente trovato o formato dati non valido.",
+                            icon: "error",
+                            confirmButtonText: "OK"
+                        });
+                    }
                 } catch (error) {
+                    console.error("Errore nel caricamento dei clienti:", error);
                     clientLoadingStatus.textContent = "Errore nel caricamento.";
                     Swal.fire({
                         title: "Errore!",
@@ -218,110 +305,175 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         confirmButtonText: "OK"
                     });
                 } finally {
-                    setTimeout(() => clientLoadingStatus.style.display = 'none', 2000);
+                    setTimeout(() => {
+                        clientLoadingStatus.style.display = 'none';
+                    }, 2000);
                 }
             }
 
+            // Funzione per caricare gli schemi con ritentativi
             async function loadSchemas() {
-                try {
+                const maxRetries = 3;
-                    schemaLoadingStatus.style.display = 'inline';
+                let attempt = 0;
-                    schemaLoadingStatus.textContent = 'Caricamento schemi in corso...';
+
-                    const response = await fetch("get_schemi.php", {
+                while (attempt < maxRetries) {
-                        method: "GET",
+                    try {
-                        headers: {
+                        schemaLoadingStatus.style.display = 'inline';
-                            "Content-Type": "application/json"
+                        schemaLoadingStatus.textContent = 'Caricamento schemi in corso...';
+
+                        const response = await fetch("get_schemi.php", {
+                            method: "GET",
+                            headers: {
+                                "Content-Type": "application/json"
+                            }
+                        });
+
+                        const text = await response.text();
+                        console.log("Risposta raw (schemi):", text);
+                        const data = JSON.parse(text);
+
+                        if (!response.ok) {
+                            throw new Error(data.error || `Errore HTTP: ${response.status}, Dettagli: ${JSON.stringify(data)}`);
                         }
-                    });
+
-                    const data = await response.json();
+                        const select = document.getElementById("schemaSelect");
-                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                        select.innerHTML = '<option value="">Select a schema...</option>';
-                    const select = document.getElementById("schemaSelect");
+                        data.value.forEach(schema => { // Nota: usa data.value per coerenza con il JSON restituito
-                    select.innerHTML = '<option value="">Select a schema...</option>';
+                            const option = new Option(`${schema.Nome} (ID: ${schema.IdSchemaCustomFields})`, schema.IdSchemaCustomFields);
-                    data.value.forEach(schema => {
+                            select.add(option);
-                        const nome = schema.Nome || "Nome non disponibile";
+                        });
-                        const id = schema.IdSchemaCustomFields || "ID non disponibile";
+
-                        const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                        schemaLoadingStatus.textContent = "Schemi caricati.";
-                        select.add(option);
+                        break; // Esci dal ciclo se la chiamata ha successo
-                    });
+                    } catch (error) {
-                    $(select).trigger('change');
+                        attempt++;
-                    schemaLoadingStatus.textContent = "Schemi caricati.";
+                        console.error(`Tentativo ${attempt} fallito per schemi:`, error);
-                } catch (error) {
+                        if (attempt === maxRetries) {
-                    schemaLoadingStatus.textContent = "Errore nel caricamento.";
+                            console.error("Errore finale nel caricamento degli schemi:", error);
-                    Swal.fire({
+                            schemaLoadingStatus.textContent = "Errore nel caricamento.";
-                        title: "Errore!",
+                            Swal.fire({
-                        text: "Impossibile caricare gli schemi: " + error.message,
+                                title: "Errore!",
-                        icon: "error",
+                                text: "Impossibile caricare gli schemi: " + error.message,
-                        confirmButtonText: "OK"
+                                icon: "error",
-                    });
+                                confirmButtonText: "OK"
-                } finally {
+                            });
-                    setTimeout(() => schemaLoadingStatus.style.display = 'none', 2000);
+                        } else {
+                            // Ritardo prima di riprovare
+                            await new Promise(resolve => setTimeout(resolve, 1000 * attempt));
+                        }
+                    } finally {
+                        if (attempt === maxRetries || schemaLoadingStatus.textContent === "Schemi caricati.") {
+                            setTimeout(() => {
+                                schemaLoadingStatus.style.display = 'none';
+                            }, 2000);
+                        }
+                    }
                 }
             }
 
+            // Funzione combinata per caricare i dati in sequenza
             async function loadData() {
                 try {
-                    await loadClients();
+                    await loadClients(); // Carica prima i clienti
-                    await loadSchemas();
+                    await loadSchemas(); // Poi carica gli schemi
                 } catch (error) {
-                    Swal.fire({
+                    console.error("Errore nel caricamento dei dati:", error);
-                        title: "Errore!",
+                }
-                        text: "Errore nel caricamento dei dati: " + error.message,
+            }
-                        icon: "error",
+
-                        confirmButtonText: "OK"
+            // Avvia il caricamento dei dati
+            loadData();
+
+            // Gestione dinamica dei campi specifici
+            addFieldButton.addEventListener("click", function() {
+                console.log("Add Field button clicked");
+                const fieldCount = container.getElementsByClassName("client-field-row").length;
+                const newField = document.createElement("div");
+                newField.className = "client-field-row mb-2";
+                newField.innerHTML = `
+                <div class="row">
+                    <div class="col-md-3">
+                        <input type="text" name="specific_fields[${fieldCount}][name]" class="form-control" placeholder="Field Name (e.g., SKU)">
+                    </div>
+                    <div class="col-md-2">
+                        <select name="specific_fields[${fieldCount}][type]" class="form-control" onchange="toggleDropdownValues(this)">
+                            <option value="text">Text</option>
+                            <option value="dropdown">Dropdown</option>
+                            <option value="date">Date</option>
+                            <option value="boolean">Yes/No</option>
+                        </select>
+                    </div>
+                    <div class="col-md-2 dropdown-values" style="visibility: hidden;">
+                        <input type="text" name="specific_fields[${fieldCount}][possible_values]" class="form-control" placeholder="Values (e.g., Red, Blue, Green)">
+                    </div>
+                    <div class="col-md-1">
+                        <select name="specific_fields[${fieldCount}][required]" class="form-control">
+                            <option value="1">Yes</option>
+                            <option value="0">No</option>
+                        </select>
+                    </div>
+                    <div class="col-md-2">
+                        <input type="text" name="specific_fields[${fieldCount}][export_column_name]" class="form-control" placeholder="Export Column Name (e.g., MONCLER_SKU)">
+                    </div>
+                    <div class="col-md-1">
+                        <input type="text" name="specific_fields[${fieldCount}][default_value]" class="form-control" placeholder="Default Value (optional)">
+                    </div>
+                    <div class="col-md-1">
+                        <button type="button" class="btn btn-danger remove-field">-</button>
+                    </div>
+                </div>
+            `;
+                container.appendChild(newField);
+
+                newField.querySelector(".remove-field").addEventListener("click", function() {
+                    console.log("Remove Field button clicked");
+                    container.removeChild(newField);
+                    updateFieldIndices();
+                });
+            });
+
+            window.toggleDropdownValues = function(selectElement) {
+                console.log("Toggling dropdown values for:", selectElement.value);
+                const row = selectElement.closest(".row");
+                const dropdownValues = row.querySelector(".dropdown-values");
+                if (selectElement.value === "dropdown") {
+                    dropdownValues.style.visibility = "visible";
+                } else {
+                    dropdownValues.style.visibility = "hidden";
+                }
+            };
+
+            document.querySelectorAll(".remove-field").forEach(button => {
+                button.addEventListener("click", function() {
+                    console.log("Existing remove button clicked");
+                    const container = document.getElementById("clientSpecificFields");
+                    container.removeChild(button.closest(".client-field-row"));
+                    updateFieldIndices();
+                });
+            });
+
+            function updateFieldIndices() {
+                console.log("Updating field indices");
+                const rows = container.getElementsByClassName("client-field-row");
+                for (let i = 0; i < rows.length; i++) {
+                    const inputs = rows[i].querySelectorAll("input, select");
+                    inputs.forEach(input => {
+                        const name = input.name.replace(/\[\d+\]/, `[${i}]`);
+                        input.name = name;
                     });
                 }
             }
-            loadData();
-
-            const routines = <?php echo json_encode($routines); ?>;
-
-            function updateRoutineDetails() {
-                const selectedId = routineSelect.value;
-                routineDetails.style.display = selectedId ? 'block' : 'none';
-                if (selectedId) {
-                    const routine = routines.find(r => r.idroutine == selectedId);
-                    if (routine) {
-                        routineName.textContent = routine.name || 'N/A';
-                        routineDescription.textContent = routine.description || 'N/A';
-                        routineAction1.textContent = routine.action1 || 'N/A';
-                        routineAction2.textContent = routine.action2 || 'N/A';
-                        routineAction3.textContent = routine.action3 || 'N/A';
-                    } else {
-                        routineName.textContent = 'N/A';
-                        routineDescription.textContent = 'N/A';
-                        routineAction1.textContent = 'N/A';
-                        routineAction2.textContent = 'N/A';
-                        routineAction3.textContent = 'N/A';
-                    }
-                } else {
-                    routineName.textContent = '';
-                    routineDescription.textContent = '';
-                    routineAction1.textContent = '';
-                    routineAction2.textContent = '';
-                    routineAction3.textContent = '';
-                }
-            }
-            routineSelect.addEventListener('change', updateRoutineDetails);
-            updateRoutineDetails();
 
             form.addEventListener("submit", function(e) {
                 e.preventDefault();
+                console.log("Form submitted");
 
                 let formData = new FormData(this);
 
+                // Aggiungi il nome del cliente selezionato a FormData
                 const clientSelect = document.getElementById("clientSelect");
                 const clientId = clientSelect.value;
                 const selectedClientOption = clientSelect.options[clientSelect.selectedIndex];
-
-                if (!clientId) {
-                    Swal.fire({
-                        title: "Errore!",
-                        text: "Per favore seleziona un cliente.",
-                        icon: "error",
-                        confirmButtonText: "OK"
-                    });
-                    return;
-                }
-
                 let clientName = "";
                 if (selectedClientOption) {
                     const optionText = selectedClientOption.text.trim();
@@ -330,11 +482,18 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 }
                 formData.append("client_name", clientName);
 
+                // Aggiungi l'ID e il nome dello schema selezionato a FormData
                 const schemaSelect = document.getElementById("schemaSelect");
                 const schemaId = schemaSelect.value;
                 const selectedSchemaOption = schemaSelect.options[schemaSelect.selectedIndex];
-
+                let schemaName = "";
-                if (!schemaId) {
+                if (selectedSchemaOption && schemaId) {
+                    const optionText = selectedSchemaOption.text.trim();
+                    const nameMatch = optionText.match(/^(.+?)(?:\s*\(ID:\s*\d+\))?$/);
+                    schemaName = nameMatch ? nameMatch[1].trim() : optionText;
+                    formData.append("idschema", schemaId);
+                    formData.append("schemamaname", schemaName);
+                } else {
                     Swal.fire({
                         title: "Errore!",
                         text: "Per favore seleziona uno schema.",
@@ -344,17 +503,48 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     return;
                 }
 
-                let schemaName = "";
+                // Log per debug
-                if (selectedSchemaOption) {
+                console.log("Client ID:", clientId);
-                    const optionText = selectedSchemaOption.text.trim();
+                console.log("Client Name:", clientName);
-                    const nameMatch = optionText.match(/^(.+?)(?:\s*\(ID:\s*\d+\))?$/);
+                console.log("Schema ID:", schemaId);
-                    schemaName = nameMatch ? nameMatch[1].trim() : optionText;
+                console.log("Schema Name:", schemaName);
-                }
-                formData.append("idschema", schemaId);
-                formData.append("schemaname", schemaName);
 
-                const routineId = routineSelect.value;
+                // Genera il JSON per client_specific_fields
-                formData.append("idroutine", routineId);
+                let finalSpecificFields = {};
+                const fieldRows = container.getElementsByClassName("client-field-row");
+                for (let i = 0; i < fieldRows.length; i++) {
+                    const row = fieldRows[i];
+                    const inputs = row.querySelectorAll("input, select");
+                    let fieldData = {};
+
+                    inputs.forEach(input => {
+                        const nameMatch = input.name.match(/specific_fields\[\d+\]\[(.*?)\]/);
+                        if (nameMatch) {
+                            const fieldName = nameMatch[1];
+                            fieldData[fieldName] = input.value.trim();
+                        }
+                    });
+
+                    if (fieldData.name) {
+                        finalSpecificFields[fieldData.name] = {
+                            type: fieldData.type || "text",
+                            possible_values: (fieldData.possible_values && fieldData.type === "dropdown") ? fieldData.possible_values.split(",").map(v => v.trim()) : [],
+                            is_required: fieldData.required === "1",
+                            export_column_name: fieldData.export_column_name || "",
+                            default_value: fieldData.default_value || ""
+                        };
+                        console.log(`Field ${fieldData.name}:`, finalSpecificFields[fieldData.name]);
+                    }
+                }
+
+                console.log("Generated JSON for client_specific_fields:", JSON.stringify(finalSpecificFields));
+                formData.append("client_specific_fields", JSON.stringify(finalSpecificFields));
+
+                // Debug del FormData
+                console.log("FormData contents:");
+                for (let pair of formData.entries()) {
+                    console.log(pair[0] + ': ' + pair[1]);
+                }
 
                 fetch("process_insert_template_xls.php", {
                         method: "POST",
@@ -362,6 +552,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     })
                     .then(response => response.json())
                     .then(data => {
+                        console.log("Fetch response:", data);
                         if (data.success) {
                             Swal.fire({
                                 title: "Successo!",
@@ -381,6 +572,7 @@ $routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         }
                     })
                     .catch(error => {
+                        console.error("Errore Fetch:", error);
                         Swal.fire({
                             title: "Errore!",
                             text: "Si è verificato un errore imprevisto.",

public/userarea/load_parts_quotation.php

@@ -1,23 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$idquotations = $_GET['idquotations'] ?? null;
-
-if (!$idquotations) {
-    echo json_encode(['success' => false, 'message' => 'ID quotations mancante']);
-    exit;
-}
-
-try {
-    $stmt = $pdo->prepare("SELECT id, idquotations, part_number, part_description FROM identification_parts WHERE idquotations = :idquotations ORDER BY part_number ASC");
-    $stmt->execute([':idquotations' => $idquotations]);
-    $parts = $stmt->fetchAll();
-
-    echo json_encode(['success' => true, 'parts' => $parts]);
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore nel caricamento: ' . $e->getMessage()]);
-}

public/userarea/load_photo_quotation.php

@@ -1,33 +0,0 @@
-<?php
-// load_photo_quotation.php
-header('Content-Type: application/json');
-
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$idquotations = isset($_GET['idquotations']) ? intval($_GET['idquotations']) : null;
-
-if (!$idquotations) {
-    echo json_encode(['success' => false, 'message' => 'ID quotation mancante']);
-    exit;
-}
-
-try {
-    // Seleziona le foto per il dato idquotations dalla tabella datadb_photos
-    $stmt = $pdo->prepare("SELECT id, file_path FROM datadb_photos WHERE idquotations = ?");
-    $stmt->execute([$idquotations]);
-    $photos = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-    if ($photos && count($photos) > 0) {
-        $photoPaths = array_map(function ($photo) {
-            return '../photostrf/' . $photo['file_path'];
-        }, $photos);
-        echo json_encode(['success' => true, 'photos' => $photoPaths]);
-    } else {
-        echo json_encode(['success' => false, 'message' => 'Nessuna foto trovata']);
-    }
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore nel caricamento: ' . $e->getMessage()]);
-}

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 -->
 <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">
@@ -44,14 +44,13 @@
                     </div>
                     <div class="col-md-6">
                         <h6>Foto del Campione</h6>
-                        <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                        <div id="photoSelectorContainer" style="display: none;">
-                            <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>
+                            <!-- Dropdown or buttons for photo selection will appear here -->
-                            <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: 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 -->
+                            <div id="descriptionList" class="draggable-description" style="display: none;"></div>
                             <div id="markerContainer"></div>
                         </div>
                     </div>
@@ -98,14 +97,6 @@
         font-size: 0.6rem !important;
     }
 
-    #partsModal {
-        z-index: 1060 !important;
-    }
-
-    #partsModal .modal-backdrop {
-        z-index: 1055 !important;
-    }
-
     #partsModal .modal-content {
         width: 100% !important;
         max-width: 100% !important;
@@ -136,33 +127,12 @@
         position: absolute;
         background: rgba(255, 255, 255, 0.8);
         padding: 5px;
+        font-size: 10px;
         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 {
@@ -192,17 +162,21 @@
         font-size: 0.8rem;
     }
 
+    /* Normale Save button */
     #savePhotoBtn {
         transition: all 0.3s ease-in-out;
     }
 
+    /* Unsaved changes */
     #savePhotoBtn.unsaved {
         background-color: #dc3545 !important;
+        /* Rosso */
         border-color: #dc3545 !important;
         color: white !important;
         animation: pulse 1.2s infinite;
     }
 
+    /* Animazione pulsante */
     @keyframes pulse {
         0% {
             box-shadow: 0 0 0 0 rgba(220, 53, 69, 0.7);
@@ -217,6 +191,7 @@
         }
     }
 
+    /* Stile per il selettore personalizzato dei colori */
     .color-picker-container {
         position: relative;
         display: inline-block;

public/userarea/photos.js

@@ -1,21 +1,19 @@
 document.addEventListener("DOMContentLoaded", function () {
     // Funzione per caricare il contenuto del popup
-    async function loadPopupContent(iddatadb, idquotations) {
+    async function loadPopupContent(iddatadb) {
         const popupContent = document.getElementById("popupContent");
         if (!popupContent) {
             console.error("Elemento popupContent non trovato");
             return;
         }
         try {
-            const endpoint = idquotations
+            const response = await fetch(
-                ? `photos_popup.php?idquotations=${idquotations}`
+                `photos_popup.php?iddatadb=${iddatadb}`,
-                : `photos_popup.php?iddatadb=${iddatadb}`;
+            );
-            console.log("Caricamento popup da:", endpoint);
-            const response = await fetch(endpoint);
             if (!response.ok)
                 throw new Error("Errore nella risposta del server");
             popupContent.innerHTML = await response.text();
-            attachPhotoEventListeners(iddatadb, idquotations);
+            attachPhotoEventListeners(iddatadb);
         } catch (error) {
             popupContent.innerHTML = `<p>Errore durante il caricamento: ${error.message}</p>`;
             console.error("Errore in loadPopupContent:", error);
@@ -23,7 +21,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     // Funzione per gestire la webcam
-    function setupWebcam(iddatadb, idquotations) {
+    function setupWebcam(iddatadb) {
         const openWebcamBtn = document.getElementById("openWebcamBtn");
         const webcamArea = document.getElementById("webcamArea");
         const webcamVideo = document.getElementById("webcamVideo");
@@ -160,7 +158,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 if (loader) {
                     loader.style.display = "flex";
                 }
-                await handleFiles([file], iddatadb, idquotations);
+                await handleFiles([file], iddatadb);
                 if (stream) {
                     stream.getTracks().forEach((track) => track.stop());
                     stream = null;
@@ -173,7 +171,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    async function handleFiles(files, iddatadb, idquotations) {
+    async function handleFiles(files, iddatadb) {
         const loader = document.getElementById("loader");
         if (!loader) {
             console.error("Elemento loader non trovato");
@@ -185,70 +183,37 @@ document.addEventListener("DOMContentLoaded", function () {
             return;
         }
 
-        loader.style.display = "flex";
+        for (const file of files) {
-        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(`File ${file.name} non è un'immagine, saltato!`);
+                alert("Per favore, carica solo immagini!");
                 continue;
             }
 
-            console.log(`Preparazione upload file ${i + 1}: ${file.name}`);
+            loader.style.display = "flex";
 
             const formData = new FormData();
             formData.append("photo", file);
-            if (idquotations) {
+            formData.append("iddatadb", iddatadb);
-                formData.append("idquotations", idquotations);
+            try {
-            } else {
+                const response = await fetch("upload_photo.php", {
-                formData.append("iddatadb", iddatadb);
+                    method: "POST",
-            }
+                    body: formData,
-
-            const uploadPromise = fetch("upload_photo.php", {
-                method: "POST",
-                body: formData,
-            })
-                .then((response) => response.json())
-                .then((result) => {
-                    if (result.success) {
-                        successCount++;
-                        console.log(`Successo per ${file.name}`);
-                    } else {
-                        errorMessages.push(
-                            `Errore per ${file.name}: ${result.message}`,
-                        );
-                    }
-                })
-                .catch((error) => {
-                    errorMessages.push(
-                        `Errore per ${file.name}: ${error.message}`,
-                    );
                 });
-
+                const result = await response.json();
-            uploadPromises.push(uploadPromise);
+                if (result.success) {
+                    loadPopupContent(iddatadb);
+                } else {
+                    alert("Errore durante il caricamento: " + result.message);
+                }
+            } catch (error) {
+                alert("Errore durante il caricamento: " + error.message);
+            } finally {
+                loader.style.display = "none";
+            }
         }
-
-        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) {
+    function attachPhotoEventListeners(iddatadb) {
         const dropArea = document.getElementById("dropArea");
         const photoInput = document.getElementById("photoInput");
         const photosModal = document.getElementById("photosModal");
@@ -292,7 +257,7 @@ document.addEventListener("DOMContentLoaded", function () {
             (e) => {
                 const files = e.dataTransfer.files;
                 if (files.length > 0) {
-                    handleFiles(files, iddatadb, idquotations);
+                    handleFiles(files, iddatadb);
                 }
             },
             false,
@@ -311,7 +276,7 @@ document.addEventListener("DOMContentLoaded", function () {
             (e) => {
                 const files = e.target.files;
                 if (files.length > 0) {
-                    handleFiles(files, iddatadb, idquotations);
+                    handleFiles(files, iddatadb);
                 }
                 e.target.value = "";
             },
@@ -333,7 +298,7 @@ document.addEventListener("DOMContentLoaded", function () {
                         });
                         const result = await response.json();
                         if (result.success) {
-                            loadPopupContent(iddatadb, idquotations);
+                            loadPopupContent(iddatadb);
                         } else {
                             alert(
                                 "Errore durante l'eliminazione: " +
@@ -371,7 +336,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 }
             });
 
-        setupWebcam(iddatadb, idquotations);
+        setupWebcam(iddatadb);
 
         const createCollageBtn = document.getElementById("createCollageBtn");
         if (createCollageBtn) {
@@ -904,9 +869,9 @@ document.addEventListener("DOMContentLoaded", function () {
                     type: "image/jpeg",
                 });
 
-                await handleFiles([file], iddatadb, idquotations);
+                await handleFiles([file], iddatadb);
                 document.getElementById("collageModal").style.display = "none";
-                loadPopupContent(iddatadb, idquotations);
+                loadPopupContent(iddatadb);
             });
         }
 
@@ -1027,14 +992,8 @@ document.addEventListener("DOMContentLoaded", function () {
     if (photosButtons.length && photosModal && closeBtn) {
         photosButtons.forEach((button) => {
             button.addEventListener("click", function () {
-                const iddatadb = this.getAttribute("data-iddatadb") || null;
+                const iddatadb = this.getAttribute("data-iddatadb");
-                const idquotations =
+                loadPopupContent(iddatadb);
-                    this.getAttribute("data-idquotations") || null;
-                console.log("Apertura modale foto con:", {
-                    iddatadb,
-                    idquotations,
-                });
-                loadPopupContent(iddatadb, idquotations);
                 photosModal.style.display = "block";
                 document.querySelector(".overlay").style.display = "none";
             });

public/userarea/photos_popup.php

@@ -17,131 +17,69 @@ use Endroid\QrCode\QrCode;
 use Endroid\QrCode\RoundBlockSizeMode;
 use Endroid\QrCode\Writer\PngWriter;
 
-// Abilita logging per debug
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);
-ini_set('log_errors', 1);
-ini_set('error_log', __DIR__ . '/photos_popup_debug.log');
-
-// Log iniziale
-error_log("Richiesta a photos_popup.php: " . print_r($_GET, true));
-
 // Carica le variabili d'ambiente
 try {
     $dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/../../');
     $dotenv->load();
 } catch (Exception $e) {
     error_log("Errore nel caricamento del file .env: " . $e->getMessage());
-?>
+    echo json_encode(['error' => 'Errore nel caricamento del file di configurazione']);
-    <div class="popup-content">
-        <p>Errore: Impossibile caricare il file di configurazione.</p>
-    </div>
-<?php
     exit;
 }
 
 // Verifica che BASE_URL sia definito
 if (!isset($_ENV['BASE_URL'])) {
     error_log("Errore: la variabile BASE_URL non è definita nel file .env");
-?>
+    echo json_encode(['error' => 'Variabile BASE_URL non definita']);
-    <div class="popup-content">
-        <p>Errore: Variabile BASE_URL non definita.</p>
-    </div>
-<?php
     exit;
 }
 
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
 
-// Verifica che almeno uno degli ID sia passato
+// Verifica che l'iddatadb sia stato passato
-$iddatadb = isset($_GET['iddatadb']) && !empty($_GET['iddatadb']) ? intval($_GET['iddatadb']) : null;
+if (!isset($_GET['iddatadb']) || empty($_GET['iddatadb'])) {
-$idquotations = isset($_GET['idquotations']) && !empty($_GET['idquotations']) ? intval($_GET['idquotations']) : null;
+    echo json_encode(['error' => 'ID riga non fornito']);
-
-if (!$iddatadb && !$idquotations) {
-    error_log("Errore: ID riga o ID quotations non fornito");
-?>
-    <div class="popup-content">
-        <p>Errore: ID riga o ID quotations non fornito.</p>
-    </div>
-<?php
     exit;
 }
 
-if ($iddatadb && $idquotations) {
+$iddatadb = intval($_GET['iddatadb']);
-    error_log("Errore: Non è possibile specificare sia iddatadb che idquotations");
+
-?>
+// Recupera i dettagli della riga (idriga e sample_code)
-    <div class="popup-content">
+$stmt = $pdo->prepare("SELECT iddatadb, sample_code FROM datadb WHERE iddatadb = ?");
-        <p>Errore: Non è possibile specificare sia iddatadb che idquotations.</p>
+$stmt->execute([$iddatadb]);
-    </div>
+$row = $stmt->fetch(PDO::FETCH_ASSOC);
-    <?php
+
+if (!$row) {
+    echo json_encode(['error' => 'Riga non trovata']);
     exit;
 }
 
-// Determina quale ID e tabella usare
+$idriga = $row['iddatadb'];
-$paramName = $iddatadb ? 'iddatadb' : 'id'; // Usa 'id' per quotations
+$sampleCode = $row['sample_code'] ?? 'Non disponibile';
-$paramValue = $iddatadb ?: $idquotations;
-$table = $iddatadb ? 'datadb' : 'quotations';
-$field = $iddatadb ? 'sample_code' : 'description'; // Usa 'description' per quotations
-$photoTable = 'datadb_photos'; // Usa sempre datadb_photos
-$photoParamName = $iddatadb ? 'iddatadb' : 'idquotations'; // Usa 'idquotations' per datadb_photos
-
-// Recupera i dettagli della riga
-try {
-    $stmt = $pdo->prepare("SELECT {$paramName}, {$field} FROM {$table} WHERE {$paramName} = ?");
-    $stmt->execute([$paramValue]);
-    $row = $stmt->fetch(PDO::FETCH_ASSOC);
-
-    if (!$row) {
-        error_log("Errore: Riga non trovata per {$paramName} = {$paramValue}");
-    ?>
-        <div class="popup-content">
-            <p>Errore: Riga non trovata.</p>
-        </div>
-    <?php
-        exit;
-    }
-} catch (Exception $e) {
-    error_log("Errore query dettagli riga: " . $e->getMessage());
-    ?>
-    <div class="popup-content">
-        <p>Errore: Impossibile recuperare i dettagli della riga.</p>
-    </div>
-<?php
-    exit;
-}
-
-$id = $row[$paramName];
-$code = $row[$field] ?? 'Non disponibile';
 
 // Recupera le foto associate alla riga
-try {
+$stmt = $pdo->prepare("SELECT id, file_path, file_name, description, uploaded_at FROM datadb_photos WHERE iddatadb = ? ORDER BY uploaded_at DESC");
-    $stmt = $pdo->prepare("SELECT id, file_path, file_name, description, uploaded_at FROM {$photoTable} WHERE {$photoParamName} = ? ORDER BY uploaded_at DESC");
+$stmt->execute([$iddatadb]);
-    $stmt->execute([$paramValue]);
+$photos = $stmt->fetchAll(PDO::FETCH_ASSOC);
-    $photos = $stmt->fetchAll(PDO::FETCH_ASSOC);
-} catch (Exception $e) {
-    error_log("Errore query foto: " . $e->getMessage());
-    $photos = []; // Imposta array vuoto in caso di errore
-}
 
 // Definisci il percorso base per le foto
 $photoBasePath = '../photostrf/';
 
 // Usa la variabile d'ambiente BASE_URL
-$baseUrl = rtrim($_ENV['BASE_URL'], '/');
+$baseUrl = rtrim($_ENV['BASE_URL'], '/'); // Rimuove eventuali slash finali
-$uploadUrl = $iddatadb
+$uploadUrl = $baseUrl . "/upload_photos_mobile.php?iddatadb=" . $iddatadb;
-    ? $baseUrl . "/upload_photos_mobile.php?iddatadb=" . $iddatadb
-    : $baseUrl . "/upload_photos_mobile.php?idquotations=" . $idquotations;
 
 // Genera il QR code con endroid/qr-code 6.0.6
 $qrCodeDir = '../photostrf/qrcodes/';
 if (!is_dir($qrCodeDir)) {
     mkdir($qrCodeDir, 0755, true);
 }
-$qrCodeFile = $qrCodeDir . "qrcode_{$id}.png";
+$qrCodeFile = $qrCodeDir . "qrcode_{$iddatadb}.png";
 
 $writer = new PngWriter();
+
+// Crea il QR code usando il costruttore
 $qrCode = new QrCode(
     data: $uploadUrl,
     encoding: new Encoding('UTF-8'),
@@ -165,13 +103,13 @@ $result->saveToFile($qrCodeFile);
         </div>
     </div>
     <h3>Manage Photos</h3>
-    <p><strong>ID:</strong> <?= htmlspecialchars($id) ?></p>
+    <p><strong>ID Row:</strong> <?= htmlspecialchars($idriga) ?></p>
-    <p><strong>Code:</strong> <?= htmlspecialchars($code) ?></p>
+    <p><strong>Sample Code:</strong> <?= htmlspecialchars($sampleCode) ?></p>
 
     <!-- QR Code per il caricamento da mobile -->
     <div style="text-align: center; margin-bottom: 20px;">
         <p>Scan the QR Code with the mobile to take photo with camera:</p>
-        <img src="../photostrf/qrcodes/qrcode_<?= htmlspecialchars($id) ?>.png" alt="QR Code" style="max-width: 150px;">
+        <img src="../photostrf/qrcodes/qrcode_<?= $iddatadb ?>.png" alt="QR Code" style="max-width: 150px;">
         <p style="margin-top: 10px;">
             <a href="<?= htmlspecialchars($uploadUrl) ?>" target="_blank"><?= htmlspecialchars($uploadUrl) ?></a>
         </p>
@@ -198,7 +136,7 @@ $result->saveToFile($qrCodeFile);
     <!-- Elenco delle foto -->
     <div id="photosList">
         <?php if (empty($photos)): ?>
-            <p>Nessuna foto presente.</p>
+            <p>No Photos present.</p>
         <?php else: ?>
             <?php foreach ($photos as $photo): ?>
                 <?php

public/userarea/process_edit_template_xls.php

@@ -18,13 +18,9 @@ try {
     $target_table = trim($_POST['target_table']);
     $idclient = intval($_POST['client_id'] ?? 0); // Usa client_id dal form
     $clientname = trim($_POST['client_name'] ?? ''); // Usa client_name dal form
+    $client_specific_fields = trim($_POST['client_specific_fields'] ?? '{}'); // Recupera il JSON dei campi specifici
     $idschema = intval($_POST['idschema'] ?? 0); // Nuovo campo
-    $schemaname = trim($_POST['schemaname'] ?? ''); // Corretto da schemamaname
+    $schemamaname = trim($_POST['schemamaname'] ?? ''); // Nuovo campo
-    $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,16 +32,20 @@ try {
         throw new Exception("Please select a valid client.");
     }
 
+    // Validazione opzionale del JSON (per sicurezza)
+    $decoded_fields = json_decode($client_specific_fields, true);
+    if (json_last_error() !== JSON_ERROR_NONE && $client_specific_fields !== '{}') {
+        throw new Exception("Invalid JSON format for client-specific fields.");
+    }
+
     // Connessione al database
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
-    // Aggiorna il database, includendo i nuovi campi
+    // Aggiorna il database, includendo idschema e schemaname
     $stmt = $pdo->prepare("UPDATE excel_templates 
                            SET name = ?, header_row = ?, start_column = ?, description = ?, target_table = ?, 
-                               idclient = ?, clientname = ?, schemaname = ?, idschema = ?, idroutine = ?, 
+                               idclient = ?, clientname = ?, client_specific_fields = ?, schemaname = ?, idschema = ?, updated_at = NOW() 
-                               button_size = ?, button_bg_color = ?, button_text_color = ?, button_label = ?, 
-                               updated_at = NOW() 
                            WHERE id = ?");
     $stmt->execute([
         $name,
@@ -55,13 +55,9 @@ try {
         $target_table,
         $idclient,
         $clientname,
-        $schemaname,
+        $client_specific_fields,
+        $schemamaname,
         $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);
+ini_set('display_errors', 0); // Disattiva l'output degli errori a schermo
 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';
+require_once __DIR__ . '/class/db-functions.php'; // Assumo che DBHandlerSelect sia qui
 
-$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '', 'apply_routine' => false];
+$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => ''];
 
 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;
+                $iduserlogin = 1; // Valore di default
                 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);
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn); // Corretto
 
                 $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, includendo excelrow
+                    // Estrai i dati a partire dalla riga successiva
                     for ($row = $startRow + 1; $row <= $highestRow; $row++) {
                         $rowData = [];
                         for ($col = $startColumn; $col <= $highestColumnIndex; $col++) {
@@ -103,46 +103,18 @@ try {
                             $rowData[] = htmlspecialchars($cellValue ?: '');
                         }
                         if (!empty(array_filter($rowData))) {
-                            $excelData[] = ['data' => $rowData, 'excelrow' => $row];
+                            $excelData[] = $rowData;
                         }
                     }
 
-                    // Recupera routine dal template
-                    $stmt = $pdo->prepare("SELECT idroutine 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}");
-                    }
-
                     // Salva i dati in sessione
                     $_SESSION['excel_data'] = $excelData;
                     $_SESSION['template_id'] = $template_id;
                     $_SESSION['headers'] = $headerRowData;
-                    $_SESSION['mappings'] = $mappings;
+                    $_SESSION['mappings'] = $mappings; // Salva i mapping per l'importazione
 
-                    // Includi excel_data nella risposta JSON in ogni caso
+                    $response['rows'] = $excelData;
-                    $response['excel_data'] = $excelData;
+                    $response['columns'] = $headerRowData; // Usa gli header reali
-                    $response['rows'] = array_column($excelData, 'data');
-                    $response['columns'] = $headerRowData;
                     $response['template_id'] = $template_id;
                     $response['filename'] = $newFilename;
                 }

public/userarea/process_insert_template_xls.php

@@ -15,53 +15,71 @@ try {
     $start_column = trim($_POST['start_column']);
     $description = trim($_POST['description'] ?? '');
     $target_table = trim($_POST['target_table']);
-    $idclient = intval($_POST['client_id'] ?? 0);
-    $clientname = trim($_POST['client_name'] ?? '');
-    $idschema = intval($_POST['idschema'] ?? 0);
-    $schemaname = trim($_POST['schemaname'] ?? '');
-    $idroutine = isset($_POST['idroutine']) && $_POST['idroutine'] !== '' ? intval($_POST['idroutine']) : null;
     $button_size = trim($_POST['button_size'] ?? 'medium');
     $button_bg_color = trim($_POST['button_bg_color'] ?? '#007bff');
     $button_text_color = trim($_POST['button_text_color'] ?? '#ffffff');
     $button_label = trim($_POST['button_label'] ?? 'Click Me');
+    $idclient = intval($_POST['client_id'] ?? 0); // Usa client_id dal form
+    $clientname = trim($_POST['client_name'] ?? ''); // Usa client_name dal form
+    $status = 'active'; // Default
+
+    // Recupera i client_specific_fields (JSON inviato dal form)
+    $client_specific_fields = trim($_POST['client_specific_fields'] ?? '{}');
+    // Decodifica il JSON per verificare che sia valido (opzionale, per sicurezza)
+    $decoded_fields = json_decode($client_specific_fields, true);
+    if (json_last_error() !== JSON_ERROR_NONE && !empty($client_specific_fields)) {
+        throw new Exception("Invalid JSON format for client-specific fields.");
+    }
+
+    // Recupera idschema e schemaname
+    $idschema = intval($_POST['idschema'] ?? 0); // Nuovo campo
+    $schemamaname = trim($_POST['schemamaname'] ?? ''); // Nuovo campo
 
     // Controllo sui campi obbligatori
-    if (empty($name) || empty($header_row) || empty($start_column) || empty($target_table) || $idclient <= 0 || $idschema <= 0) {
+    if (empty($name) || empty($header_row) || empty($start_column) || empty($target_table) || $idschema <= 0) {
-        throw new Exception("All fields marked with * are required, including client and schema.");
+        throw new Exception("All fields marked with * are required, including schema.");
+    }
+
+    // Validazione del idclient
+    if ($idclient <= 0) {
+        throw new Exception("Please select a valid client.");
     }
 
     // Connessione al database
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
-    // Inserisci il nuovo template
+    // Inserisci nel database, aggiungendo idschema e schemaname
-    $stmt = $pdo->prepare("
+    $stmt = $pdo->prepare("INSERT INTO excel_templates 
-        INSERT INTO excel_templates 
+    (name, header_row, start_column, description, target_table, button_size, button_bg_color, button_text_color, button_label, idclient, clientname, status, client_specific_fields, schemaname, idschema, created_at, updated_at) 
-        (name, header_row, start_column, description, target_table, idclient, clientname, idschema, schemaname, idroutine, 
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())");
-         button_size, button_bg_color, button_text_color, button_label, created_at, updated_at)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())
-    ");
     $stmt->execute([
         $name,
         $header_row,
         $start_column,
         $description,
         $target_table,
-        $idclient,
-        $clientname,
-        $idschema,
-        $schemaname,
-        $idroutine,
         $button_size,
         $button_bg_color,
         $button_text_color,
-        $button_label
+        $button_label,
+        $idclient,
+        $clientname,
+        $status,
+        $client_specific_fields,
+        $schemamaname,
+        $idschema
     ]);
 
-    $response["success"] = true;
+    if ($stmt->rowCount() > 0) {
-    $response["message"] = "Template created successfully!";
+        $response["success"] = true;
+        $response["message"] = "Template created successfully!";
+    } else {
+        throw new Exception("Failed to insert template.");
+    }
 } catch (Exception $e) {
     $response["message"] = $e->getMessage();
 }
 
+// Restituisce un JSON per il fetch
 echo json_encode($response);

public/userarea/quotations.php

@@ -25,21 +25,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
     $description = '';
     $customer = '';
 
-    try {
+    $stmt = $pdo->prepare("INSERT INTO quotations (description, customer, iduser) VALUES (?, ?, ?)");
-        $stmt = $pdo->prepare("INSERT INTO quotations (description, customer, iduser) VALUES (?, ?, ?)");
+    $stmt->execute([$description, $customer, $user_id]);
-        $success = $stmt->execute([$description, $customer, $user_id]);
+    $newId = $pdo->lastInsertId();
-        if ($success) {
+
-            $newId = $pdo->lastInsertId();
+    // Log creazione
-            error_log("Creata nuova quotation ID: $newId");
+    error_log("Creata nuova quotation ID: $newId");
-            header("Location: quotations.php?edit_id=" . $newId . "&status=success&message=" . urlencode("Quotation creata con successo"));
+
-        } else {
+    // Reindirizza alla modifica della nuova quotation
-            error_log("Errore: Impossibile creare la quotation, nessun ID generato.");
+    header("Location: quotations.php?edit_id=" . $newId . "&status=success&message=" . urlencode("Quotation creata con successo"));
-            header("Location: quotations.php?status=error&message=" . urlencode("Errore durante la creazione della quotation"));
-        }
-    } catch (PDOException $e) {
-        error_log("Errore PDO durante la creazione della quotation: " . $e->getMessage());
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
-    }
     exit;
 }
 
@@ -49,15 +43,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
     $description = $_POST['description'] ?? '';
     $customer = $_POST['customer'] ?? '';
 
-    try {
+    $stmt = $pdo->prepare("UPDATE quotations SET description = ?, customer = ? WHERE id = ? AND iduser = ?");
-        $stmt = $pdo->prepare("UPDATE quotations SET description = ?, customer = ? WHERE id = ? AND iduser = ?");
+    $stmt->execute([$description, $customer, $id, $user_id]);
-        $stmt->execute([$description, $customer, $id, $user_id]);
+
-        error_log("Modificata quotation ID: $id");
+    // Log modifica
-        header("Location: quotations.php?status=success&message=" . urlencode("Quotation modificata con successo"));
+    error_log("Modificata quotation ID: $id");
-    } catch (PDOException $e) {
+
-        error_log("Errore PDO durante la modifica della quotation: " . $e->getMessage());
+    // Reindirizza alla lista delle quotations
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+    header("Location: quotations.php?status=success&message=" . urlencode("Quotation modificata con successo"));
-    }
     exit;
 }
 
@@ -65,43 +58,28 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
 if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'delete' && isset($_POST['id'])) {
     $id = intval($_POST['id']);
 
-    try {
+    $stmt = $pdo->prepare("DELETE FROM quotations WHERE id = ? AND iduser = ?");
-        $stmt = $pdo->prepare("DELETE FROM quotations WHERE id = ? AND iduser = ?");
+    $stmt->execute([$id, $user_id]);
-        $stmt->execute([$id, $user_id]);
+
-        error_log("Cancellata quotation ID: $id");
+    // Log cancellazione
-        header("Location: quotations.php?status=success&message=" . urlencode("Quotation cancellata con successo"));
+    error_log("Cancellata quotation ID: $id");
-    } catch (PDOException $e) {
+
-        error_log("Errore PDO durante la cancellazione della quotation: " . $e->getMessage());
+    header("Location: quotations.php?status=success&message=" . urlencode("Quotation cancellata con successo"));
-        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
-    }
     exit;
 }
 
 // Recupera tutte le quotations per l'utente
-try {
+$stmt = $pdo->prepare("SELECT * FROM quotations WHERE iduser = ? ORDER BY creation_date DESC");
-    $stmt = $pdo->prepare("SELECT * FROM quotations WHERE iduser = ? ORDER BY creation_date DESC");
+$stmt->execute([$user_id]);
-    $stmt->execute([$user_id]);
+$quotations = $stmt->fetchAll(PDO::FETCH_ASSOC);
-    $quotations = $stmt->fetchAll(PDO::FETCH_ASSOC);
-} catch (PDOException $e) {
-    error_log("Errore PDO durante il recupero delle quotations: " . $e->getMessage());
-    $quotations = [];
-}
 
 // Verifica se è richiesta la modifica di una quotation
 $editQuotation = null;
 if (isset($_GET['edit_id'])) {
     $editId = intval($_GET['edit_id']);
-    try {
+    $stmt = $pdo->prepare("SELECT * FROM quotations WHERE id = ? AND iduser = ?");
-        $stmt = $pdo->prepare("SELECT * FROM quotations WHERE id = ? AND iduser = ?");
+    $stmt->execute([$editId, $user_id]);
-        $stmt->execute([$editId, $user_id]);
+    $editQuotation = $stmt->fetch(PDO::FETCH_ASSOC);
-        $editQuotation = $stmt->fetch(PDO::FETCH_ASSOC);
-        if (!$editQuotation) {
-            error_log("Nessuna quotation trovata per id: $editId");
-        }
-    } catch (PDOException $e) {
-        error_log("Errore PDO durante il recupero della quotation per modifica: " . $e->getMessage());
-        $editQuotation = null;
-    }
 }
 ?>
 
@@ -115,8 +93,8 @@ if (isset($_GET['edit_id'])) {
     <?php include('cssinclude.php'); ?>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2Lw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
     <style>
+        /* Stili simili alla pagina fornita, adattati */
         .cell-changed {
             background-color: #fff3b0 !important;
             transition: background-color 0.3s ease;
@@ -196,73 +174,6 @@ if (isset($_GET['edit_id'])) {
         .quotation-actions {
             margin-top: 20px;
         }
-
-        .modal {
-            display: none;
-            position: fixed;
-            z-index: 1050;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            overflow: auto;
-            background-color: rgba(0, 0, 0, 0.5);
-        }
-
-        .modal-content {
-            background-color: #fefefe;
-            margin: 15% auto;
-            padding: 20px;
-            border: 1px solid #888;
-            width: 80%;
-            max-width: 600px;
-            border-radius: 8px;
-            position: relative;
-        }
-
-        .close-btn {
-            color: #aaa;
-            float: right;
-            font-size: 28px;
-            font-weight: bold;
-            cursor: pointer;
-        }
-
-        .close-btn:hover,
-        .close-btn:focus {
-            color: #000;
-            text-decoration: none;
-        }
-
-        .modal.fade {
-            z-index: 1060 !important;
-        }
-
-        .modal-backdrop {
-            z-index: 1055 !important;
-        }
-
-        .overlay.toggle-icon {
-            z-index: 1000 !important;
-        }
-
-        .alert {
-            margin-bottom: 15px;
-            padding: 10px;
-            border-radius: 4px;
-        }
-
-        .alert-success {
-            background-color: #d4edda;
-            color: #155724;
-            border: 1px solid #c3e6cb;
-        }
-
-        .alert-danger {
-            background-color: #f8d7da;
-            color: #721c24;
-            border: 1px solid #f5c6cb;
-        }
     </style>
     <title>Gestione Quotations - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
@@ -282,11 +193,6 @@ if (isset($_GET['edit_id'])) {
                         </div>
                     </div>
                     <div class="card-body">
-                        <?php if (isset($_GET['status']) && isset($_GET['message'])): ?>
-                            <div class="alert alert-<?= $_GET['status'] === 'success' ? 'success' : 'danger' ?>">
-                                <?= htmlspecialchars(urldecode($_GET['message'])) ?>
-                            </div>
-                        <?php endif; ?>
                         <?php if ($editQuotation): ?>
                             <!-- Modifica Quotation -->
                             <h6 class="mb-3">Modifica Quotation ID: <?= $editQuotation['id'] ?></h6>
@@ -306,8 +212,8 @@ if (isset($_GET['edit_id'])) {
                             </form>
                             <div class="quotation-actions">
                                 <h6 class="mb-3">Azioni</h6>
-                                <button type="button" class="photos-btn action-btn" data-row="0" data-idquotations="<?= $editQuotation['id'] ?>" 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="photos-btn action-btn" data-idquotations="<?= $editQuotation['id'] ?>" title="Photos"><i class="fas fa-camera"></i></button>
-                                <button type="button" class="parts-btn action-btn" data-iddatadb="" data-idquotations="<?= $editQuotation['id'] ?>" data-row="0">Parti</button>
+                                <button type="button" class="parts-btn action-btn" data-idquotations="<?= $editQuotation['id'] ?>" title="Parts"><i class="fas fa-puzzle-piece"></i></button>
                             </div>
                         <?php else: ?>
                             <!-- Lista Quotations -->
@@ -326,7 +232,7 @@ if (isset($_GET['edit_id'])) {
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php foreach ($quotations as $index => $row): ?>
+                                    <?php foreach ($quotations as $row): ?>
                                         <tr data-id="<?= $row['id'] ?>">
                                             <td><?= htmlspecialchars($row['id']) ?></td>
                                             <td><?= htmlspecialchars($row['creation_date']) ?></td>
@@ -339,8 +245,8 @@ if (isset($_GET['edit_id'])) {
                                             <td>
                                                 <button type="button" class="save-btn action-btn edit-btn" data-id="<?= $row['id'] ?>" title="Salva Modifiche"><i class="fas fa-save"></i></button>
                                                 <button type="button" class="delete-btn action-btn" data-id="<?= $row['id'] ?>" title="Cancella" data-bs-toggle="modal" data-bs-target="#deleteModal"><i class="fas fa-trash"></i></button>
-                                                <button type="button" class="photos-btn action-btn" data-entity-type="quotation" data-idquotations="<?= $row['id'] ?>" data-row="<?= $index ?>" title="Photos"><i class="fas fa-camera"></i></button>
+                                                <button type="button" class="photos-btn action-btn" data-idquotations="<?= $row['id'] ?>" title="Photos"><i class="fas fa-camera"></i></button>
-                                                <button type="button" class="parts-btn action-btn" data-entity-type="quotation" data-idquotations="<?= $row['id'] ?>" data-row="<?= $index ?>" title="Parts"><i class="fas fa-puzzle-piece"></i></button>
+                                                <button type="button" class="parts-btn action-btn" data-idquotations="<?= $row['id'] ?>" title="Parts"><i class="fas fa-puzzle-piece"></i></button>
                                                 <a href="quotations.php?edit_id=<?= $row['id'] ?>" class="btn btn-secondary action-btn" title="Modifica Dettagliata"><i class="fas fa-edit"></i></a>
                                             </td>
                                         </tr>
@@ -403,75 +309,26 @@ if (isset($_GET['edit_id'])) {
     <?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>
         document.addEventListener("DOMContentLoaded", function() {
-            // Mostra messaggi di stato se presenti
-            const urlParams = new URLSearchParams(window.location.search);
-            const status = urlParams.get('status');
-            const message = urlParams.get('message');
-            if (status && message) {
-                const alertDiv = document.createElement('div');
-                alertDiv.className = `alert alert-${status === 'success' ? 'success' : 'danger'} temp-alert`;
-                alertDiv.textContent = decodeURIComponent(message);
-                document.querySelector('.card-body').prepend(alertDiv);
-                setTimeout(() => {
-                    alertDiv.remove();
-                }, 5000);
-            }
-
             // Inizializza DataTables se non siamo in modalità modifica
             if (!document.querySelector('#editForm')) {
                 $('#quotationsTable').DataTable({
-                    paging: true,
+                    "paging": true,
-                    searching: true,
+                    "searching": true,
-                    ordering: true,
+                    "ordering": true,
-                    info: true,
+                    "info": true,
-                    autoWidth: false,
+                    "autoWidth": false,
-                    responsive: true
+                    "responsive": true
                 });
             }
 
-            // Quando il modale di creazione si apre, nascondi l'overlay
-            $('#createModal').on('show.bs.modal', function() {
-                $('.overlay.toggle-icon').css('display', 'none');
-            });
-
-            // Quando il modale si chiude, ripristina l'overlay
-            $('#createModal').on('hide.bs.modal', function() {
-                $('.overlay.toggle-icon').css('display', '');
-            });
-
             // Gestione conferma creazione nel modal
             document.getElementById('confirmCreate').addEventListener('click', function() {
-                const createModal = bootstrap.Modal.getInstance(document.getElementById('createModal'));
+                document.getElementById('createModalForm').submit();
-                createModal.hide();
-                const form = document.getElementById('createModalForm');
-                const formData = new FormData(form);
-
-                fetch('quotations.php', {
-                    method: 'POST',
-                    body: formData
-                }).then(response => {
-                    if (!response.ok) {
-                        throw new Error('Errore HTTP: ' + response.status);
-                    }
-                    return response.text();
-                }).then(() => {
-                    window.location.href = 'quotations.php?status=success&message=' + encodeURIComponent('Quotation creata con successo');
-                }).catch(error => {
-                    console.error('Errore durante la creazione della quotation:', error);
-                    const alertDiv = document.createElement('div');
-                    alertDiv.className = 'alert alert-danger temp-alert';
-                    alertDiv.textContent = 'Errore durante la creazione della quotation: ' + error.message;
-                    document.querySelector('.card-body').prepend(alertDiv);
-                    setTimeout(() => {
-                        alertDiv.remove();
-                    }, 5000);
-                });
             });
 
             // Gestione modifica inline e save nella lista
@@ -499,9 +356,6 @@ if (isset($_GET['edit_id'])) {
                         } else {
                             alert('Errore durante la modifica.');
                         }
-                    }).catch(error => {
-                        console.error('Errore durante la modifica della quotation:', error);
-                        alert('Errore durante la modifica: ' + error.message);
                     });
                 });
             });
@@ -522,15 +376,6 @@ if (isset($_GET['edit_id'])) {
             // I bottoni photos e parts usano gli script esistenti (photos.js, parts.js), passando data-idquotations
         });
     </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>
 
 </html>

public/userarea/renumber_parts_quotation.php

@@ -1,63 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$data = json_decode(file_get_contents('php://input'), true);
-
-$idquotations = $data['idquotations'] ?? null;
-$parts = $data['parts'] ?? [];
-
-if (!$idquotations || empty($parts)) {
-    echo json_encode(['success' => false, 'message' => 'Dati mancanti']);
-    exit;
-}
-
-try {
-    $pdo->beginTransaction();
-
-    // Elimina tutte le parti esistenti per idquotations
-    $stmt = $pdo->prepare("DELETE FROM identification_parts WHERE idquotations = :idquotations");
-    $stmt->execute([':idquotations' => $idquotations]);
-
-    // Prepara l'inserimento delle nuove parti
-    $stmt = $pdo->prepare("
-        INSERT INTO identification_parts
-        (idquotations, part_number, part_description, mix, created_at, updated_at)
-        VALUES (:idquotations, :part_number, :part_description, :mix, NOW(), NOW())
-    ");
-
-    $part_ids = [];
-    foreach ($parts as $part) {
-        $partNumber = $part['part_number'] ?? null;
-        $partDescription = $part['part_description'] ?? '';
-        $mix = $part['mix'] ?? 'N';
-
-        if (!$partNumber || !$partDescription) {
-            throw new PDOException("Numero parte o descrizione mancante per parte: " . json_encode($part));
-        }
-
-        $stmt->execute([
-            ':idquotations' => $idquotations,
-            ':part_number' => $partNumber,
-            ':part_description' => $partDescription,
-            ':mix' => $mix
-        ]);
-        $part_ids[] = $pdo->lastInsertId();
-    }
-
-    $pdo->commit();
-    echo json_encode([
-        'success' => true,
-        'part_ids' => $part_ids,
-        'message' => 'Parti rinumerate con successo'
-    ]);
-} catch (PDOException $e) {
-    $pdo->rollBack();
-    echo json_encode([
-        'success' => false,
-        'message' => 'Errore nel salvataggio: ' . $e->getMessage()
-    ]);
-}

public/userarea/routines/moncler.php

@@ -1,108 +0,0 @@
-<?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_annotated_photo.php

@@ -1,60 +1,36 @@
 <?php
 header('Content-Type: application/json');
-include('include/headscript.php');
+
+include('include/headscript.php'); // აქედან უნდა იყოს DB კავშირიც
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-$file = $_FILES['file'] ?? null;
+$dataURL  = $_POST['dataURL']   ?? null;
-$filename = $_POST['filename'] ?? null;
+$filename = $_POST['filename']  ?? null;
-$iddatadb = $_POST['iddatadb'] ?? null;
+$iddatadb = $_POST['iddatadb']  ?? null; // 🟢 ახალი ველი
 
-if (!$file || !$filename || !$iddatadb) {
+if (!$dataURL || !$filename || !$iddatadb) {
     echo json_encode(['success' => false, 'message' => 'Dati mancanti']);
     exit;
 }
 
-if (!preg_match('/^[a-zA-Z0-9_-]+\.(png|jpg|jpeg)$/', $filename)) {
-    echo json_encode(['success' => false, 'message' => 'Nome file non valido']);
-    exit;
-}
-
-if (!is_numeric($iddatadb)) {
-    echo json_encode(['success' => false, 'message' => 'ID non valido']);
-    exit;
-}
-
-$allowedTypes = ['image/png', 'image/jpeg'];
-if (!in_array($file['type'], $allowedTypes)) {
-    echo json_encode(['success' => false, 'message' => 'Formato file non supportato']);
-    exit;
-}
-
 try {
-    $dbHandler = DBHandlerSelect::getInstance();
+    // --- ფაილის შენახვა ---
-    $pdo = $dbHandler->getConnection();
+    $data = explode(',', $dataURL)[1];
-    $stmt = $pdo->prepare("SELECT iddatadb FROM datadb WHERE iddatadb = :iddatadb");
+    $decodedData = base64_decode($data);
-    $stmt->execute([':iddatadb' => $iddatadb]);
-    if (!$stmt->fetch()) {
-        echo json_encode(['success' => false, 'message' => 'iddatadb non valido']);
-        exit;
-    }
 
     $dirPath = '../photostrf/annotated';
     if (!file_exists($dirPath)) {
-        mkdir($dirPath, 0755, true);
+        mkdir($dirPath, 0777, true);
     }
 
     $filePath = $dirPath . '/' . $filename;
-    if (file_exists($filePath)) {
+    file_put_contents($filePath, $decodedData);
-        echo json_encode(['success' => false, 'message' => 'File già esistente']);
-        exit;
-    }
 
-    if (!move_uploaded_file($file['tmp_name'], $filePath)) {
+    $db = DBHandlerSelect::getInstance();
-        echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio del file']);
+    $pdo = $db->getConnection();
-        exit;
-    }
 
+    // --- ბაზაში ჩაწერა ---
     $stmt = $pdo->prepare("
         INSERT INTO datadb_photos (iddatadb, file_path, file_name, uploaded_at, uploaded_by)
         VALUES (:iddatadb, :file_path, :file_name, NOW(), :uploaded_by)
@@ -63,7 +39,7 @@ try {
         ':iddatadb'   => $iddatadb,
         ':file_path'  => $filePath,
         ':file_name'  => $filename,
-        ':uploaded_by' => $iduserlogin
+        ':uploaded_by'=> $iduserlogin
     ]);
 
     echo json_encode([
@@ -71,6 +47,7 @@ try {
         'file_path' => $filePath,
         'message'   => 'Foto salvata con successo e registrata nel DB'
     ]);
+
 } catch (Exception $e) {
     echo json_encode(['success' => false, 'message' => 'Errore: ' . $e->getMessage()]);
 }

public/userarea/save_annotated_photo_quotation.php

@@ -1,76 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
-$file = $_FILES['file'] ?? null;
-$filename = $_POST['filename'] ?? null;
-$idquotations = $_POST['idquotations'] ?? null;
-
-if (!$file || !$filename || !$idquotations || !isset($iduserlogin)) {
-    echo json_encode(['success' => false, 'message' => 'Dati mancanti o utente non autenticato']);
-    exit;
-}
-
-if (!preg_match('/^[a-zA-Z0-9_-]+\.(png|jpg|jpeg)$/', $filename)) {
-    echo json_encode(['success' => false, 'message' => 'Nome file non valido']);
-    exit;
-}
-
-if (!is_numeric($idquotations)) {
-    echo json_encode(['success' => false, 'message' => 'ID non valido']);
-    exit;
-}
-
-$allowedTypes = ['image/png', 'image/jpeg'];
-if (!in_array($file['type'], $allowedTypes)) {
-    echo json_encode(['success' => false, 'message' => 'Formato file non supportato']);
-    exit;
-}
-
-try {
-    $dbHandler = DBHandlerSelect::getInstance();
-    $pdo = $dbHandler->getConnection();
-    $stmt = $pdo->prepare("SELECT id FROM quotations WHERE id = :idquotations");
-    $stmt->execute([':idquotations' => $idquotations]);
-    if (!$stmt->fetch()) {
-        echo json_encode(['success' => false, 'message' => 'idquotations non valido']);
-        exit;
-    }
-
-    $dirPath = '../photostrf/annotated';
-    if (!file_exists($dirPath)) {
-        mkdir($dirPath, 0755, true);
-    }
-
-    $filePath = $dirPath . '/' . $filename;
-    if (file_exists($filePath)) {
-        echo json_encode(['success' => false, 'message' => 'File già esistente']);
-        exit;
-    }
-
-    if (!move_uploaded_file($file['tmp_name'], $filePath)) {
-        echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio del file']);
-        exit;
-    }
-
-    $stmt = $pdo->prepare("
-        INSERT INTO datadb_photos (idquotations, file_path, file_name, uploaded_at, uploaded_by)
-        VALUES (:idquotations, :file_path, :file_name, NOW(), :uploaded_by)
-    ");
-    $stmt->execute([
-        ':idquotations' => $idquotations,
-        ':file_path'    => $filePath,
-        ':file_name'    => $filename,
-        ':uploaded_by'  => $iduserlogin
-    ]);
-
-    echo json_encode([
-        'success'   => true,
-        'file_path' => $filePath,
-        'message'   => 'Foto salvata con successo e registrata nel DB'
-    ]);
-} catch (Exception $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore: ' . $e->getMessage()]);
-}

public/userarea/save_parts_quotation.php

@@ -1,60 +0,0 @@
-<?php
-header('Content-Type: application/json');
-include('include/headscript.php');
-
-$dbHandler = DBHandlerSelect::getInstance();
-$pdo = $dbHandler->getConnection();
-
-$data = json_decode(file_get_contents('php://input'), true);
-
-$idquotations = $data['idquotations'] ?? null;
-$parts = $data['parts'] ?? [];
-
-if (!$idquotations || empty($parts)) {
-    echo json_encode(['success' => false, 'message' => 'Dati mancanti']);
-    exit;
-}
-
-$part = $parts[0];
-$partId = $part['id'] ?? null;
-$partNumber = $part['part_number'] ?? null;
-$partDescription = $part['part_description'] ?? '';
-$mix = $part['mix'] ?? 'N';
-
-if ($partDescription) {
-    try {
-        if ($partId) {
-            // UPDATE se esiste già la parte
-            $stmt = $pdo->prepare("UPDATE identification_parts
-                SET part_number = :part_number,
-                    part_description = :part_description,
-                    mix = :mix,
-                    updated_at = NOW()
-                WHERE id = :id");
-            $stmt->execute([
-                ':id' => $partId,
-                ':part_number' => $partNumber,
-                ':part_description' => $partDescription,
-                ':mix' => $mix
-            ]);
-            echo json_encode(['success' => true, 'part_id' => $partId, 'part_number' => $partNumber, 'message' => 'Parte aggiornata con successo']);
-        } else {
-            // INSERT se è nuova
-            $stmt = $pdo->prepare("INSERT INTO identification_parts
-                (idquotations, part_number, part_description, mix, created_at, updated_at)
-                VALUES (:idquotations, :part_number, :part_description, :mix, NOW(), NOW())");
-            $stmt->execute([
-                ':idquotations' => $idquotations,
-                ':part_number' => $partNumber,
-                ':part_description' => $partDescription,
-                ':mix' => $mix
-            ]);
-            $newId = $pdo->lastInsertId();
-            echo json_encode(['success' => true, 'part_id' => $newId, 'part_number' => $partNumber, 'message' => 'Parte salvata con successo']);
-        }
-    } catch (PDOException $e) {
-        echo json_encode(['success' => false, 'message' => 'Errore nel salvataggio: ' . $e->getMessage()]);
-    }
-} else {
-    echo json_encode(['success' => false, 'message' => 'Descrizione mancante']);
-}

public/userarea/sendcheck.php

@@ -1,68 +0,0 @@
-<?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,7 +147,13 @@
                         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"
@@ -170,11 +176,6 @@
                             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/test_auth.php

@@ -1,58 +0,0 @@
-<?php
-// File: test_auth.php
-ini_set('display_errors', '0');
-error_reporting(E_ALL);
-ini_set('log_errors', 1);
-
-// Includi le dipendenze
-require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
-require_once __DIR__ . '/class/VisualLimsApiClient.class.php';
-
-header('Content-Type: application/json');
-
-try {
-    // Crea la cartella logsapi se non esiste
-    $logDir = __DIR__ . '/logsapi';
-    if (!is_dir($logDir)) {
-        mkdir($logDir, 0755, true);
-    }
-
-    // Istanzia il client API (autenticazione automatica tramite .env)
-    $api = VisualLimsApiClient::getInstance();
-
-    // Esegui una chiamata di test per verificare l'autenticazione
-    $endpoint = 'SchemaCustomField';
-    $options = []; // Nessun filtro per il test
-    $data = $api->get($endpoint, $options);
-
-    // 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($logDir . '/last_auth_url.txt', $full_url . PHP_EOL, FILE_APPEND);
-
-    // Nota: getToken() è privato, quindi non possiamo accedervi direttamente
-    // Supponiamo che l'autenticazione sia avvenuta correttamente se la GET ha successo
-    $token = null; // Non possiamo accedere al token direttamente
-    $auth_success = true; // La GET ha successo, quindi l'autenticazione funziona
-
-    // Salva un file di conferma dell'autenticazione
-    $outputFile = $logDir . '/auth_token.json';
-    file_put_contents($outputFile, json_encode(['auth_success' => true, 'token' => 'Not directly accessible (private method)'], JSON_PRETTY_PRINT));
-
-    // Risposta di successo
-    echo json_encode([
-        'success' => true,
-        'message' => "Autenticazione completata con successo, dettagli salvati in {$outputFile}",
-        'auth_success' => $auth_success,
-        'schema_data' => $data // Dati di esempio dalla GET
-    ]);
-} catch (Exception $e) {
-    // Log dell'errore
-    file_put_contents($logDir . '/auth_error.log', date('Y-m-d H:i:s') . ' - ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
-    http_response_code(500);
-    echo json_encode([
-        'success' => false,
-        'message' => 'Errore durante l\'autenticazione: ' . $e->getMessage()
-    ]);
-}

public/userarea/upload_photo.php

@@ -4,23 +4,13 @@ include('include/headscript.php');
 
 header('Content-Type: application/json');
 
-if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_FILES['photo']) || (!isset($_POST['iddatadb']) && !isset($_POST['idquotations']))) {
+if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_FILES['photo']) || !isset($_POST['iddatadb'])) {
     echo json_encode(['success' => false, 'message' => 'Richiesta non valida']);
     exit;
 }
 
-$iddatadb = isset($_POST['iddatadb']) ? intval($_POST['iddatadb']) : null;
+$iddatadb = intval($_POST['iddatadb']);
-$idquotations = isset($_POST['idquotations']) ? intval($_POST['idquotations']) : null;
+$photo = $_FILES['photo'];
-
-if ($iddatadb && $idquotations) {
-    echo json_encode(['success' => false, 'message' => 'Non è possibile specificare sia iddatadb che idquotations']);
-    exit;
-}
-
-if (!$iddatadb && !$idquotations) {
-    echo json_encode(['success' => false, 'message' => 'ID TRF o ID quotations mancante']);
-    exit;
-}
 
 // Verifica che l'utente loggato esista in auth_users
 $db = DBHandlerSelect::getInstance();
@@ -35,28 +25,6 @@ if (!$userExists) {
     exit;
 }
 
-// Verifica l'esistenza dell'ID nella tabella corrispondente
-try {
-    if ($iddatadb) {
-        $stmt = $pdo->prepare("SELECT iddatadb FROM datadb WHERE iddatadb = ?");
-        $stmt->execute([$iddatadb]);
-        if (!$stmt->fetch()) {
-            echo json_encode(['success' => false, 'message' => 'iddatadb non valido']);
-            exit;
-        }
-    } else {
-        $stmt = $pdo->prepare("SELECT id FROM quotations WHERE id = ?");
-        $stmt->execute([$idquotations]);
-        if (!$stmt->fetch()) {
-            echo json_encode(['success' => false, 'message' => 'idquotations non valido']);
-            exit;
-        }
-    }
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore nella validazione: ' . $e->getMessage()]);
-    exit;
-}
-
 // Usa un percorso assoluto per la cartella photostrf
 $uploadDir = realpath(__DIR__ . '/../photostrf') . '/';
 if (!is_dir($uploadDir)) {
@@ -73,7 +41,6 @@ if (!is_writable($uploadDir)) {
 }
 
 // Verifica che il file sia un'immagine (inclusi HEIC/HEIF)
-$photo = $_FILES['photo'];
 $allowedTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/heic', 'image/heif'];
 if (!in_array($photo['type'], $allowedTypes)) {
     echo json_encode(['success' => false, 'message' => 'Il file deve essere un\'immagine (JPEG, PNG, GIF, HEIC)']);
@@ -86,11 +53,10 @@ if (!file_exists($photo['tmp_name']) || !is_uploaded_file($photo['tmp_name'])) {
     exit;
 }
 
-// Rinomina il file: id-timestamp-nomeoriginale.estensione
+// Rinomina il file: idriga-timestamp-nomeoriginale.estensione
 $timestamp = date('YmdHis');
 $originalName = pathinfo($photo['name'], PATHINFO_FILENAME);
 $extension = strtolower(pathinfo($photo['name'], PATHINFO_EXTENSION));
-$id = $iddatadb ?: $idquotations;
 
 // Se il file è HEIC/HEIF, convertilo in JPEG
 if (in_array($photo['type'], ['image/heic', 'image/heif'])) {
@@ -108,11 +74,11 @@ if (in_array($photo['type'], ['image/heic', 'image/heif'])) {
     }
 
     // Crea un nuovo nome per il file JPEG
-    $newFileName = "{$id}-{$timestamp}-{$originalName}.jpg";
+    $newFileName = "{$iddatadb}-{$timestamp}-{$originalName}.jpg";
     $destination = $uploadDir . $newFileName;
 
     // Salva l'immagine come JPEG
-    if (!imagejpeg($image, $destination, 90)) {
+    if (!imagejpeg($image, $destination, 90)) { // 90 è la qualità JPEG
         imagedestroy($image);
         echo json_encode(['success' => false, 'message' => 'Errore durante la conversione del file HEIC in JPEG']);
         exit;
@@ -122,7 +88,7 @@ if (in_array($photo['type'], ['image/heic', 'image/heif'])) {
     imagedestroy($image);
 } else {
     // Per i formati non HEIC, usa il nome e l'estensione originali
-    $newFileName = "{$id}-{$timestamp}-{$originalName}.{$extension}";
+    $newFileName = "{$iddatadb}-{$timestamp}-{$originalName}.{$extension}";
     $destination = $uploadDir . $newFileName;
 
     // Salva il file
@@ -139,12 +105,7 @@ error_log("Destination: $destination");
 error_log("Temp file: " . $photo['tmp_name']);
 
 // Salva il riferimento nel database
-try {
+$stmt = $pdo->prepare("INSERT INTO datadb_photos (iddatadb, file_path, file_name, uploaded_by) VALUES (?, ?, ?, ?)");
-    $stmt = $pdo->prepare("INSERT INTO datadb_photos (iddatadb, idquotations, file_path, file_name, uploaded_by) VALUES (?, ?, ?, ?, ?)");
+$stmt->execute([$iddatadb, $newFileName, $newFileName, $iduserlogin]);
-    $stmt->execute([$iddatadb, $idquotations, $newFileName, $newFileName, $iduserlogin]);
-} catch (PDOException $e) {
-    echo json_encode(['success' => false, 'message' => 'Errore durante il salvataggio nel database: ' . $e->getMessage()]);
-    exit;
-}
 
 echo json_encode(['success' => true, 'message' => 'Foto caricata con successo']);

public/userarea/upload_photos_mobile.php

@@ -5,41 +5,24 @@ include('include/headscript.php');
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
 
-// Verifica che almeno uno degli ID sia passato
+// Verifica che l'iddatadb sia stato passato
-$iddatadb = isset($_GET['iddatadb']) && !empty($_GET['iddatadb']) ? intval($_GET['iddatadb']) : null;
+if (!isset($_GET['iddatadb']) || empty($_GET['iddatadb'])) {
-$idquotations = isset($_GET['idquotations']) && !empty($_GET['idquotations']) ? intval($_GET['idquotations']) : null;
+    die('ID riga non fornito');
-
-if (!$iddatadb && !$idquotations) {
-    die('ID riga o ID quotations non fornito');
 }
 
-if ($iddatadb && $idquotations) {
+$iddatadb = intval($_GET['iddatadb']);
-    die('Non è possibile specificare sia iddatadb che idquotations');
-}
 
-// Verifica che l'utente loggato esista
+// Recupera i dettagli della riga (idriga e sample_code)
-$stmt = $pdo->prepare("SELECT id FROM auth_users WHERE id = ?");
+$stmt = $pdo->prepare("SELECT iddatadb, sample_code FROM datadb WHERE iddatadb = ?");
-$stmt->execute([$iduserlogin]);
+$stmt->execute([$iddatadb]);
-if (!$stmt->fetch(PDO::FETCH_ASSOC)) {
-    die('Utente non valido');
-}
-
-// Determina quale ID usare e verifica l'esistenza
-$paramName = $iddatadb ? 'iddatadb' : 'idquotations';
-$paramValue = $iddatadb ?: $idquotations;
-$table = $iddatadb ? 'datadb' : 'quotations';
-$field = $iddatadb ? 'sample_code' : 'quotation_code';
-
-$stmt = $pdo->prepare("SELECT {$paramName}, {$field} FROM {$table} WHERE {$paramName} = ?");
-$stmt->execute([$paramValue]);
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 
 if (!$row) {
     die('Riga non trovata');
 }
 
-$id = $row[$paramName];
+$idriga = $row['iddatadb'];
-$code = $row[$field] ?? 'Non disponibile';
+$sampleCode = $row['sample_code'] ?? 'Non disponibile';
 ?>
 
 <!DOCTYPE html>
@@ -49,23 +32,17 @@ $code = $row[$field] ?? 'Non disponibile';
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Carica Foto da Mobile</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
     <style>
         body {
             font-family: Arial, sans-serif;
             padding: 20px;
             text-align: center;
-            background: #f4f4f4;
         }
 
         .upload-area {
             border: 2px dashed #ccc;
             padding: 20px;
-            margin: 20px auto;
+            margin: 20px 0;
-            max-width: 500px;
-            background: white;
-            border-radius: 8px;
-            cursor: pointer;
         }
 
         .upload-area.highlight {
@@ -79,121 +56,57 @@ $code = $row[$field] ?? 'Non disponibile';
             margin-bottom: 10px;
             border-bottom: 1px solid #eee;
             padding-bottom: 10px;
-            max-width: 500px;
-            margin-left: auto;
-            margin-right: auto;
         }
 
         .photo-item img {
             max-width: 100px;
             max-height: 100px;
             margin-right: 10px;
-            border-radius: 4px;
-        }
-
-        .loader {
-            display: none;
-            position: fixed;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background: rgba(0, 0, 0, 0.5);
-            z-index: 1000;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            color: white;
-        }
-
-        .loader i {
-            font-size: 40px;
-            margin-bottom: 10px;
-        }
-
-        .error-message {
-            color: red;
-            margin: 10px 0;
-            display: none;
-        }
-
-        button.delete-photo-btn {
-            background: none;
-            border: none;
-            color: #dc3545;
-            cursor: pointer;
-            font-size: 18px;
         }
     </style>
 </head>
 
 <body>
-    <h2>Carica Foto per ID: <?= htmlspecialchars($id) ?></h2>
+    <h2>Carica Foto per ID Riga: <?= htmlspecialchars($idriga) ?></h2>
-    <p><strong>Codice:</strong> <?= htmlspecialchars($code) ?></p>
+    <p><strong>Sample Code:</strong> <?= htmlspecialchars($sampleCode) ?></p>
-    <div class="loader" id="loader">
+
-        <div>
-            <i class="fas fa-spinner fa-spin"></i>
-            <p>Caricamento in corso...</p>
-        </div>
-    </div>
-    <div class="error-message" id="errorMessage"></div>
     <div class="upload-area" id="uploadArea">
-        <p>Scatta una foto o seleziona immagini</p>
+        <p>Scatta una foto o seleziona un'immagine</p>
-        <input type="file" id="photoInput" accept="image/*" capture="camera" multiple style="display: none;">
+        <input type="file" id="photoInput" accept="image/*" capture="camera">
+    </div>
+
+    <div id="photosList">
+        <!-- Le foto verranno caricate dinamicamente -->
     </div>
-    <div id="photosList"></div>
 
     <script>
         const uploadArea = document.getElementById('uploadArea');
         const photoInput = document.getElementById('photoInput');
         const photosList = document.getElementById('photosList');
-        const loader = document.getElementById('loader');
-        const errorMessage = document.getElementById('errorMessage');
-        const iddatadb = '<?= $iddatadb ?>';
-        const idquotations = '<?= $idquotations ?>';
-        const endpoint = idquotations ? 'load_photo_quotation.php' : 'load_photo.php';
-        const dataParam = idquotations ? {
-            idquotations: idquotations
-        } : {
-            iddatadb: iddatadb
-        };
 
         // Carica le foto esistenti all'avvio
         loadPhotos();
 
-        // Gestione drag-and-drop
+        // Gestione del click sull'area di upload
-        uploadArea.addEventListener('dragover', (e) => {
+        uploadArea.addEventListener('click', () => {
-            e.preventDefault();
+            photoInput.click();
-            uploadArea.classList.add('highlight');
-        });
-        uploadArea.addEventListener('dragleave', () => {
-            uploadArea.classList.remove('highlight');
-        });
-        uploadArea.addEventListener('drop', (e) => {
-            e.preventDefault();
-            uploadArea.classList.remove('highlight');
-            handleFiles(e.dataTransfer.files);
         });
 
-        // Gestione click sull'area di upload
+        // Gestione del caricamento delle foto
-        uploadArea.addEventListener('click', () => photoInput.click());
+        photoInput.addEventListener('change', () => {
-
+            handleFiles(photoInput.files);
-        // Gestione caricamento foto
+        });
-        photoInput.addEventListener('change', () => handleFiles(photoInput.files));
 
         async function handleFiles(files) {
-            loader.style.display = 'flex';
-            errorMessage.style.display = 'none';
             for (const file of files) {
                 if (!file.type.startsWith('image/')) {
-                    showError('Per favore, carica solo immagini!');
+                    alert('Per favore, carica solo immagini!');
                     continue;
                 }
 
                 const formData = new FormData();
                 formData.append('photo', file);
-                if (iddatadb) formData.append('iddatadb', iddatadb);
+                formData.append('iddatadb', '<?= $iddatadb ?>');
-                if (idquotations) formData.append('idquotations', idquotations);
 
                 try {
                     const response = await fetch('upload_photo.php', {
@@ -201,86 +114,32 @@ $code = $row[$field] ?? 'Non disponibile';
                         body: formData
                     });
                     const result = await response.json();
-                    if (!result.success) {
+
-                        showError('Errore durante il caricamento: ' + result.message);
+                    if (result.success) {
+                        loadPhotos(); // Ricarica le foto
+                    } else {
+                        alert('Errore durante il caricamento: ' + result.message);
                     }
                 } catch (error) {
-                    showError('Errore di rete: ' + error.message);
+                    alert('Errore durante il caricamento: ' + error.message);
                 }
             }
-            loadPhotos();
-            loader.style.display = 'none';
         }
 
+        // Funzione per caricare le foto esistenti
         async function loadPhotos() {
-            loader.style.display = 'flex';
-            errorMessage.style.display = 'none';
             try {
-                const response = await fetch(`${endpoint}?${new URLSearchParams(dataParam)}`);
+                const response = await fetch(`photos_popup.php?iddatadb=<?= $iddatadb ?>`);
-                const result = await response.json();
+                const html = await response.text();
-                photosList.innerHTML = '';
+                const parser = new DOMParser();
-                if (result.success && result.photos && result.photos.length > 0) {
+                const doc = parser.parseFromString(html, 'text/html');
-                    for (const photo of result.photos) {
+                const photosListContent = doc.querySelector('#photosList').innerHTML;
-                        const photoName = photo.split('/').pop();
+                photosList.innerHTML = photosListContent;
-                        const photoItem = document.createElement('div');
-                        photoItem.className = 'photo-item';
-                        photoItem.innerHTML = `
-                            <img src="${photo}" alt="${photoName}">
-                            <div style="flex: 1; text-align: left;">
-                                <strong>Nome:</strong> ${photoName}<br>
-                                <strong>Caricata il:</strong> Non disponibile
-                            </div>
-                            <button class="delete-photo-btn" data-photo-path="${photo}">
-                                <i class="fas fa-trash"></i>
-                            </button>`;
-                        photosList.appendChild(photoItem);
-                    }
-                } else {
-                    photosList.innerHTML = '<p>Nessuna foto presente.</p>';
-                }
             } catch (error) {
-                showError('Errore durante il caricamento delle foto: ' + error.message);
+                photosList.innerHTML = `<p>Errore durante il caricamento delle foto: ${error.message}</p>`;
             }
-            loader.style.display = 'none';
         }
-
-        function showError(message) {
-            errorMessage.textContent = message;
-            errorMessage.style.display = 'block';
-            setTimeout(() => errorMessage.style.display = 'none', 5000);
-        }
-
-        // Gestione eliminazione foto
-        photosList.addEventListener('click', async (e) => {
-            if (e.target.closest('.delete-photo-btn')) {
-                const button = e.target.closest('.delete-photo-btn');
-                const photoPath = button.dataset.photoPath;
-                if (confirm('Sei sicuro di voler eliminare questa foto?')) {
-                    loader.style.display = 'flex';
-                    try {
-                        const response = await fetch('delete_photo.php', {
-                            method: 'POST',
-                            headers: {
-                                'Content-Type': 'application/json'
-                            },
-                            body: JSON.stringify({
-                                file_path: photoPath
-                            })
-                        });
-                        const result = await response.json();
-                        if (result.success) {
-                            loadPhotos();
-                        } else {
-                            showError('Errore durante l\'eliminazione: ' + result.message);
-                        }
-                    } catch (error) {
-                        showError('Errore durante l\'eliminazione: ' + error.message);
-                    }
-                    loader.style.display = 'none';
-                }
-            }
-        });
     </script>
 </body>
 
-</html>
+</html>

resources/views/auth/social/buttons.blade.php

@@ -26,9 +26,15 @@
     </div>
     @endif
 
+<<<<<<< HEAD
     @if (in_array('microsoft', $socialProviders))
     <div class="col-{{ $colSize }} d-flex align-items-center justify-content-center">
         <a href="{{ url('auth/microsoft/login') }}" class="btn-microsoft">
+=======
+    @if (in_array('azure', $socialProviders))
+    <div class="col-{{ $colSize }} d-flex align-items-center justify-content-center">
+        <a href="{{ url('auth/azure/login') }}" style="color: #0078d4;">
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             <i class="fab fa-microsoft fa-2x"></i>
         </a>
     </div>

vendor/composer/autoload_classmap.php

@@ -6314,6 +6314,12 @@ return array(
     'SebastianBergmann\\Type\\UnknownType' => $vendorDir . '/sebastian/type/src/type/UnknownType.php',
     'SebastianBergmann\\Type\\VoidType' => $vendorDir . '/sebastian/type/src/type/VoidType.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
+<<<<<<< HEAD
+=======
+    'SocialiteProviders\\Azure\\AzureExtendSocialite' => $vendorDir . '/socialiteproviders/microsoft-azure/AzureExtendSocialite.php',
+    'SocialiteProviders\\Azure\\Provider' => $vendorDir . '/socialiteproviders/microsoft-azure/Provider.php',
+    'SocialiteProviders\\Azure\\User' => $vendorDir . '/socialiteproviders/microsoft-azure/User.php',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'SocialiteProviders\\Manager\\Config' => $vendorDir . '/socialiteproviders/manager/src/Config.php',
     'SocialiteProviders\\Manager\\ConfigTrait' => $vendorDir . '/socialiteproviders/manager/src/ConfigTrait.php',
     'SocialiteProviders\\Manager\\Contracts\\ConfigInterface' => $vendorDir . '/socialiteproviders/manager/src/Contracts/ConfigInterface.php',
@@ -6330,10 +6336,13 @@ return array(
     'SocialiteProviders\\Manager\\OAuth2\\User' => $vendorDir . '/socialiteproviders/manager/src/OAuth2/User.php',
     'SocialiteProviders\\Manager\\ServiceProvider' => $vendorDir . '/socialiteproviders/manager/src/ServiceProvider.php',
     'SocialiteProviders\\Manager\\SocialiteWasCalled' => $vendorDir . '/socialiteproviders/manager/src/SocialiteWasCalled.php',
+<<<<<<< HEAD
     'SocialiteProviders\\Microsoft\\MicrosoftAvatar' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftAvatar.php',
     'SocialiteProviders\\Microsoft\\MicrosoftExtendSocialite' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftExtendSocialite.php',
     'SocialiteProviders\\Microsoft\\MicrosoftUser' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftUser.php',
     'SocialiteProviders\\Microsoft\\Provider' => $vendorDir . '/socialiteproviders/microsoft/Provider.php',
+=======
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'Spatie\\Backtrace\\Arguments\\ArgumentReducers' => $vendorDir . '/spatie/backtrace/src/Arguments/ArgumentReducers.php',
     'Spatie\\Backtrace\\Arguments\\ProvidedArgument' => $vendorDir . '/spatie/backtrace/src/Arguments/ProvidedArgument.php',
     'Spatie\\Backtrace\\Arguments\\ReduceArgumentPayloadAction' => $vendorDir . '/spatie/backtrace/src/Arguments/ReduceArgumentPayloadAction.php',

vendor/composer/autoload_psr4.php

@@ -60,8 +60,13 @@ return array(
     'Spatie\\FlareClient\\' => array($vendorDir . '/spatie/flare-client-php/src'),
     'Spatie\\ErrorSolutions\\' => array($vendorDir . '/spatie/error-solutions/src'),
     'Spatie\\Backtrace\\' => array($vendorDir . '/spatie/backtrace/src'),
+<<<<<<< HEAD
     'SocialiteProviders\\Microsoft\\' => array($vendorDir . '/socialiteproviders/microsoft'),
     'SocialiteProviders\\Manager\\' => array($vendorDir . '/socialiteproviders/manager/src'),
+=======
+    'SocialiteProviders\\Manager\\' => array($vendorDir . '/socialiteproviders/manager/src'),
+    'SocialiteProviders\\Azure\\' => array($vendorDir . '/socialiteproviders/microsoft-azure'),
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
     'Psy\\' => array($vendorDir . '/psy/psysh/src'),

vendor/composer/autoload_static.php

@@ -120,8 +120,13 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
             'Spatie\\FlareClient\\' => 19,
             'Spatie\\ErrorSolutions\\' => 22,
             'Spatie\\Backtrace\\' => 17,
+<<<<<<< HEAD
             'SocialiteProviders\\Microsoft\\' => 29,
             'SocialiteProviders\\Manager\\' => 27,
+=======
+            'SocialiteProviders\\Manager\\' => 27,
+            'SocialiteProviders\\Azure\\' => 25,
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         ),
         'R' => 
         array (
@@ -466,14 +471,24 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         array (
             0 => __DIR__ . '/..' . '/spatie/backtrace/src',
         ),
+<<<<<<< HEAD
         'SocialiteProviders\\Microsoft\\' => 
         array (
             0 => __DIR__ . '/..' . '/socialiteproviders/microsoft',
         ),
+=======
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'SocialiteProviders\\Manager\\' => 
         array (
             0 => __DIR__ . '/..' . '/socialiteproviders/manager/src',
         ),
+<<<<<<< HEAD
+=======
+        'SocialiteProviders\\Azure\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure',
+        ),
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'Ramsey\\Uuid\\' => 
         array (
             0 => __DIR__ . '/..' . '/ramsey/uuid/src',
@@ -7130,6 +7145,12 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         'SebastianBergmann\\Type\\UnknownType' => __DIR__ . '/..' . '/sebastian/type/src/type/UnknownType.php',
         'SebastianBergmann\\Type\\VoidType' => __DIR__ . '/..' . '/sebastian/type/src/type/VoidType.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
+<<<<<<< HEAD
+=======
+        'SocialiteProviders\\Azure\\AzureExtendSocialite' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/AzureExtendSocialite.php',
+        'SocialiteProviders\\Azure\\Provider' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/Provider.php',
+        'SocialiteProviders\\Azure\\User' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/User.php',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'SocialiteProviders\\Manager\\Config' => __DIR__ . '/..' . '/socialiteproviders/manager/src/Config.php',
         'SocialiteProviders\\Manager\\ConfigTrait' => __DIR__ . '/..' . '/socialiteproviders/manager/src/ConfigTrait.php',
         'SocialiteProviders\\Manager\\Contracts\\ConfigInterface' => __DIR__ . '/..' . '/socialiteproviders/manager/src/Contracts/ConfigInterface.php',
@@ -7146,10 +7167,13 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         'SocialiteProviders\\Manager\\OAuth2\\User' => __DIR__ . '/..' . '/socialiteproviders/manager/src/OAuth2/User.php',
         'SocialiteProviders\\Manager\\ServiceProvider' => __DIR__ . '/..' . '/socialiteproviders/manager/src/ServiceProvider.php',
         'SocialiteProviders\\Manager\\SocialiteWasCalled' => __DIR__ . '/..' . '/socialiteproviders/manager/src/SocialiteWasCalled.php',
+<<<<<<< HEAD
         'SocialiteProviders\\Microsoft\\MicrosoftAvatar' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftAvatar.php',
         'SocialiteProviders\\Microsoft\\MicrosoftExtendSocialite' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftExtendSocialite.php',
         'SocialiteProviders\\Microsoft\\MicrosoftUser' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftUser.php',
         'SocialiteProviders\\Microsoft\\Provider' => __DIR__ . '/..' . '/socialiteproviders/microsoft/Provider.php',
+=======
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'Spatie\\Backtrace\\Arguments\\ArgumentReducers' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ArgumentReducers.php',
         'Spatie\\Backtrace\\Arguments\\ProvidedArgument' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ProvidedArgument.php',
         'Spatie\\Backtrace\\Arguments\\ReduceArgumentPayloadAction' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ReduceArgumentPayloadAction.php',

vendor/composer/installed.json

@@ -8185,6 +8185,7 @@
             "install-path": "../socialiteproviders/manager"
         },
         {
+<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "version_normalized": "4.7.0.0",
@@ -8197,20 +8198,45 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/824ef97a4f6e3f363c21702b76676d54e8265573",
                 "reference": "824ef97a4f6e3f363c21702b76676d54e8265573",
+=======
+            "name": "socialiteproviders/microsoft-azure",
+            "version": "5.2.0",
+            "version_normalized": "5.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
+<<<<<<< HEAD
                 "firebase/php-jwt": "^6.8",
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
             "time": "2025-07-06T00:25:25+00:00",
+=======
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
+            },
+            "time": "2024-03-15T03:02:10+00:00",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
+<<<<<<< HEAD
                     "SocialiteProviders\\Microsoft\\": ""
+=======
+                    "SocialiteProviders\\Azure\\": ""
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -8219,12 +8245,22 @@
             ],
             "authors": [
                 {
+<<<<<<< HEAD
                     "name": "Brian Faust",
                     "email": "hello@brianfaust.de"
                 }
             ],
             "description": "Microsoft OAuth2 Provider for Laravel Socialite",
             "keywords": [
+=======
+                    "name": "Chris Hemmings",
+                    "email": "chris@hemmin.gs"
+                }
+            ],
+            "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "azure",
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "laravel",
                 "microsoft",
                 "oauth",
@@ -8232,11 +8268,19 @@
                 "socialite"
             ],
             "support": {
+<<<<<<< HEAD
                 "docs": "https://socialiteproviders.com/microsoft",
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
             "install-path": "../socialiteproviders/microsoft"
+=======
+                "docs": "https://socialiteproviders.com/microsoft-azure",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "install-path": "../socialiteproviders/microsoft-azure"
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         },
         {
             "name": "spatie/backtrace",

vendor/composer/installed.php

@@ -3,7 +3,11 @@
         'name' => 'loshmis/vanguard',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
+<<<<<<< HEAD
         'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
+=======
+        'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -688,7 +692,11 @@
         'loshmis/vanguard' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
+<<<<<<< HEAD
             'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
+=======
+            'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -1304,12 +1312,21 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+<<<<<<< HEAD
         'socialiteproviders/microsoft' => array(
             'pretty_version' => '4.7.0',
             'version' => '4.7.0.0',
             'reference' => '824ef97a4f6e3f363c21702b76676d54e8265573',
             'type' => 'library',
             'install_path' => __DIR__ . '/../socialiteproviders/microsoft',
+=======
+        'socialiteproviders/microsoft-azure' => array(
+            'pretty_version' => '5.2.0',
+            'version' => '5.2.0.0',
+            'reference' => '453d62c9d7e3b3b76e94c913fb46e68a33347b16',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../socialiteproviders/microsoft-azure',
+>>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             'aliases' => array(),
             'dev_requirement' => false,
         ),