fixed photo quotations

.gitignore

@@ -51,4 +51,16 @@ 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,13 +34,8 @@ 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
         ],
     ];
 
@@ -51,7 +46,7 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        parent::boot(); // Aggiungi questa linea per sicurezza
+        //
     }
 
     /**

composer.json

@@ -44,11 +44,7 @@
         "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,11 +4,7 @@
         "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",
@@ -5059,7 +5055,6 @@
             "time": "2025-02-24T19:33:30+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "source": {
@@ -5071,38 +5066,18 @@
                 "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/",
@@ -5111,22 +5086,12 @@
             ],
             "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",
@@ -5134,19 +5099,11 @@
                 "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,11 +12,7 @@ return [
     */
 
     'social' => [
-<<<<<<< HEAD
-        'providers' => ['facebook', 'twitter', 'google', 'microsoft'],
-=======
-        'providers' => ['azure'],
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
+        'providers' => ['microsoft'],
     ],
 
     /*

config/services.php

@@ -64,15 +64,12 @@ 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'),
     //   ],
@@ -87,11 +84,4 @@ 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,3 +32,4 @@ $langdatatables = [
     "paginate_next" => "Next",
     "paginate_previous" => "Previous"
 ];
+$quotationstitle = "Quotations";

public/userarea/delete_part_quotation.php

@@ -0,0 +1,28 @@
+<?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,17 +20,10 @@ if (!$template) {
     exit;
 }
 
-// Debug del JSON
-$clientSpecificFieldsJson = $template['client_specific_fields'] ?? '{}';
-error_log("Raw client_specific_fields JSON: " . $clientSpecificFieldsJson);
-
-$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));
-}
+// Recupera tutte le routine dal database
+$stmt = $pdo->prepare("SELECT * FROM routine");
+$stmt->execute();
+$routines = $stmt->fetchAll(PDO::FETCH_ASSOC);
 ?>
 <!doctype html>
 <html lang="en">
@@ -41,28 +34,9 @@ if (json_last_error() !== JSON_ERROR_NONE) {
     <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'); ?>
-    <style>
-        .client-field-row .row {
-            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>
+    <!-- Include jQuery prima di Select2 -->
+    <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>Edit Template <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
 
@@ -82,7 +56,7 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                         <ul class="mb-0">
                             <li>Template Name</li>
                             <li>Row Header and Column Header: where the title of the excel starts</li>
-                            <li>Cheme</li>
+                            <li>Schema</li>
                         </ul>
                     </div>
                 </div>
@@ -124,96 +98,43 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                                     <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">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">Client-Specific Fields</label>
-
-                                    <!-- Intestazioni colonne -->
-                                    <div class="row fw-bold text-secondary mb-1">
-                                        <div class="col-md-3">Field Name</div>
-                                        <div class="col-md-2">Type</div>
-                                        <div class="col-md-2">Possible Values</div>
-                                        <div class="col-md-1">Required</div>
-                                        <div class="col-md-2">Export Column Name</div>
-                                        <div class="col-md-1">Default Value</div>
-                                        <div class="col-md-1">Actions</div>
+                                    <label class="form-label">Select Routine</label>
+                                    <select name="idroutine" id="routineSelect" class="form-control">
+                                        <option value="">Select a routine...</option>
+                                        <?php foreach ($routines as $routine): ?>
+                                            <option value="<?php echo $routine['idroutine']; ?>" <?php echo ($template['idroutine'] ?? '') == $routine['idroutine'] ? 'selected' : ''; ?>>
+                                                <?php echo htmlspecialchars($routine['name']); ?>
+                                            </option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                    <div id="routineDetails" class="mt-2" style="display: none;">
+                                        <h6>Routine Details</h6>
+                                        <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>
@@ -223,132 +144,78 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                 </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 || !addFieldButton || !container || !clientLoadingStatus || !schemaLoadingStatus) {
-                console.error("One or more DOM elements not found:", {
-                    form,
-                    addFieldButton,
-                    container,
-                    clientLoadingStatus,
-                    schemaLoadingStatus
-                });
+            if (!form || !clientLoadingStatus || !schemaLoadingStatus || !routineSelect || !routineDetails) {
+                alert("Errore: Uno o più elementi della pagina non sono stati trovati. Contatta l'amministratore.");
                 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
+            // Inizializza Select2
             $('#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);
             });
 
-            // Carica i clienti al caricamento della pagina
+            $('#routineSelect').select2({
+                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 text = await response.text();
-                    console.log("Risposta raw (clienti):", text);
-                    const data = JSON.parse(text);
-
-                    if (!response.ok) {
-                        throw new Error(data.error || `Errore HTTP: ${response.status}`);
-                    }
-
-                    if (data.value && Array.isArray(data.value)) {
-                        const select = document.getElementById("clientSelect");
-                        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);
-                            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"
-                        });
-                    }
+                    const data = await response.json();
+                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    const select = document.getElementById("clientSelect");
+                    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);
+                        if (parseInt(id) === parseInt(<?php echo json_encode($template['idclient'] ?? 0); ?>)) {
+                            option.selected = true;
+                        }
+                        select.add(option);
+                    });
+                    $(select).trigger('change');
+                    clientLoadingStatus.textContent = "Clienti caricati.";
                 } catch (error) {
-                    console.error("Errore nel caricamento dei clienti:", error);
                     clientLoadingStatus.textContent = "Errore nel caricamento.";
                     Swal.fire({
                         title: "Errore!",
@@ -357,50 +224,37 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                         confirmButtonText: "OK"
                     });
                 } finally {
-                    setTimeout(() => {
-                        clientLoadingStatus.style.display = 'none';
-                    }, 2000);
+                    setTimeout(() => clientLoadingStatus.style.display = 'none', 2000);
                 }
             }
 
-            // Carica gli schemi al caricamento della pagina
+            // Carica gli schemi
             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 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 data = await response.json();
+                    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 optionText = `${nome.trim()} (ID: ${id})`;
-                        const option = new Option(optionText, id);
-                        if (parseInt(id) === parseInt(templateSchemaId)) {
+                        const option = new Option(`${nome.trim()} (ID: ${id})`, id);
+                        if (parseInt(id) === parseInt(<?php echo json_encode($template['idschema'] ?? 0); ?>)) {
                             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!",
@@ -409,169 +263,68 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                         confirmButtonText: "OK"
                     });
                 } finally {
-                    setTimeout(() => {
-                        schemaLoadingStatus.style.display = 'none';
-                    }, 2000);
+                    setTimeout(() => schemaLoadingStatus.style.display = 'none', 2000);
                 }
             }
 
-            // Carica i dati in sequenza
+            // Carica i dati
             async function loadData() {
                 try {
                     await loadClients();
                     await loadSchemas();
                 } catch (error) {
-                    console.error("Errore nel caricamento dei dati:", error);
-                }
-            }
-
-            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;
+                    Swal.fire({
+                        title: "Errore!",
+                        text: "Errore nel caricamento dei dati: " + error.message,
+                        icon: "error",
+                        confirmButtonText: "OK"
                     });
                 }
             }
+            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!",
@@ -582,22 +335,18 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                     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!",
@@ -608,63 +357,18 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                     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("schemamaname", schemaName);
+                formData.append("schemaname", schemaName);
 
-                // 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]);
-                }
+                // Aggiungi idroutine
+                const routineId = routineSelect.value;
+                formData.append("idroutine", routineId);
 
                 fetch("process_edit_template_xls.php", {
                         method: "POST",
@@ -672,7 +376,6 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                     })
                     .then(response => response.json())
                     .then(data => {
-                        console.log("Fetch response:", data);
                         if (data.success) {
                             Swal.fire({
                                 title: "Successo!",
@@ -692,7 +395,6 @@ if (json_last_error() !== JSON_ERROR_NONE) {
                         }
                     })
                     .catch(error => {
-                        console.error("Errore Fetch:", error);
                         Swal.fire({
                             title: "Errore!",
                             text: "Si è verificato un errore imprevisto.",

public/userarea/export_to_lims.js

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

@@ -0,0 +1,243 @@
+<?php
+// File: export_to_lims.php
+ini_set('display_errors', '0');
+error_reporting(E_ALL);
+ini_set('log_errors', 1);
+ini_set('error_log', __DIR__ . '/logsapi/export_lims_error.log');
+
+// Includi il file con la connessione al database e Dotenv
+require_once __DIR__ . '/include/headscript.php';
+require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
+require_once __DIR__ . '/class/VisualLimsApiClient.class.php';
+
+use Dotenv\Dotenv;
+
+// Carica il file .env
+$dotenv = Dotenv::createImmutable(dirname(__DIR__, 3)); // Torna al livello di public
+$dotenv->load();
+
+// Leggi la variabile SIMULATE_EXPORT_LIMS
+$simulate = filter_var($_ENV['SIMULATE_EXPORT_LIMS'] ?? true, FILTER_VALIDATE_BOOLEAN);
+
+header('Content-Type: application/json');
+
+try {
+    // Verifica che la richiesta sia POST e contenga iddatadb
+    if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['iddatadb'])) {
+        throw new Exception('Richiesta non valida: iddatadb mancante');
+    }
+
+    $iddatadb = (int)$_POST['iddatadb'];
+
+    // Crea la cartella logsapi se non esiste
+    $logDir = __DIR__ . '/logsapi';
+    if (!is_dir($logDir)) {
+        mkdir($logDir, 0755, true);
+    }
+
+    // Ottieni connessione al database
+    $db = DBHandlerSelect::getInstance();
+    $pdo = $db->getConnection();
+
+    // Step 1: Creazione payload per CommessaWeb
+    $queryCommessa = "
+        SELECT 
+            d.iddatadb, 
+            e.idclient AS Cliente, 
+            e.idschema AS SchemaCustomField
+        FROM datadb d
+        LEFT JOIN excel_templates e ON d.templateid = e.id
+        WHERE d.iddatadb = :iddatadb
+    ";
+
+    $stmtCommessa = $pdo->prepare($queryCommessa);
+    $stmtCommessa->execute(['iddatadb' => $iddatadb]);
+    $recordCommessa = $stmtCommessa->fetch(PDO::FETCH_ASSOC);
+
+    if (!$recordCommessa) {
+        throw new Exception("Nessun record trovato per iddatadb: {$iddatadb}");
+    }
+
+    // Validazione payload
+    if (empty($recordCommessa['Cliente']) || empty($recordCommessa['SchemaCustomField'])) {
+        throw new Exception("Dati mancanti per CommessaWeb: Cliente o SchemaCustomField non validi");
+    }
+
+    // Payload per creazione CommessaWeb
+    $payloadCommessa = [
+        'Cliente' => (int)$recordCommessa['Cliente'],
+        'SchemaCustomField' => (int)$recordCommessa['SchemaCustomField'],
+        'Richiedente' => null,
+        'Descrizione' => 'example'
+    ];
+
+    // Step 2: Creazione payload per campi custom (CommesseCustomFields)
+    $queryCustomFields = "
+        SELECT 
+            tm.field_id AS IdCommesseCustomFields, 
+            idd.field_value AS Valore
+        FROM import_data_details idd
+        JOIN template_mapping tm ON idd.mapping_id = tm.id
+        WHERE idd.id = :iddatadb
+    ";
+
+    $stmtCustomFields = $pdo->prepare($queryCustomFields);
+    $stmtCustomFields->execute(['iddatadb' => $iddatadb]);
+    $customFields = $stmtCustomFields->fetchAll(PDO::FETCH_ASSOC);
+
+    // Costruisci l'array CommesseCustomFields
+    $commesseCustomFields = [];
+    foreach ($customFields as $field) {
+        $commesseCustomFields[] = [
+            'IdCommesseCustomFields' => (int)$field['IdCommesseCustomFields'],
+            'Valore' => $field['Valore'] ?? ''
+        ];
+    }
+
+    // Payload per aggiornamento campi custom
+    $payloadCustomFields = [
+        'CommesseCustomFields' => $commesseCustomFields
+    ];
+
+    // Step 3: Creazione payload per Campioni (da identification_parts)
+    $queryCampioni = "
+        SELECT 
+            part_number,
+            idmatrice AS Matrice,
+            part_description AS NoteWeb
+        FROM identification_parts
+        WHERE iddatadb = :iddatadb
+    ";
+
+    $stmtCampioni = $pdo->prepare($queryCampioni);
+    $stmtCampioni->execute(['iddatadb' => $iddatadb]);
+    $campioni = $stmtCampioni->fetchAll(PDO::FETCH_ASSOC);
+
+    $payloadsCampioni = [];
+    foreach ($campioni as $campione) {
+        if (empty($campione['Matrice'])) {
+            throw new Exception("Matrice non valida per campione: {$campione['part_number']}");
+        }
+        $payloadCampione = [
+            'Commessa' => null, // Sarà impostato dopo
+            'Matrice' => (int)$campione['Matrice'],
+            'SottoMatrice' => null,
+            'SchemaCustomField' => 1,
+            'NoteWeb' => $campione['NoteWeb'] ?? ''
+        ];
+        $payloadsCampioni[] = $payloadCampione;
+    }
+
+    // Step 4: Creazione payload per InviaCommessa
+    $payloadInviaCommessa = [];
+
+    // Variabile per idcommessaweb
+    $idcommessaweb = null;
+    $commessaweb = '';
+
+    if ($simulate) {
+        // Flusso simulato
+        $idcommessaweb = 10176; // Fittizio per il test
+
+        // Salva idcommessaweb in datadb
+        $updateStmt = $pdo->prepare("UPDATE datadb SET idcommessaweb = :idcommessaweb WHERE iddatadb = :iddatadb");
+        $updateStmt->execute(['idcommessaweb' => $idcommessaweb, 'iddatadb' => $iddatadb]);
+
+        // Salva i payload in file JSON
+        $outputFileCommessa = $logDir . "/commessaweb_create_{$iddatadb}.json";
+        file_put_contents($outputFileCommessa, json_encode($payloadCommessa, JSON_PRETTY_PRINT));
+
+        $outputFileCustomFields = $logDir . "/commessaweb_customfields_{$iddatadb}.json";
+        file_put_contents($outputFileCustomFields, json_encode($payloadCustomFields, JSON_PRETTY_PRINT));
+
+        foreach ($payloadsCampioni as $index => $payloadCampione) {
+            $payloadCampione['Commessa'] = $idcommessaweb;
+            $outputFileCampione = $logDir . "/campione_{$iddatadb}_{$campioni[$index]['part_number']}.json";
+            file_put_contents($outputFileCampione, json_encode($payloadCampione, JSON_PRETTY_PRINT));
+        }
+
+        $outputFileInviaCommessa = $logDir . "/commessaweb_invia_{$iddatadb}.json";
+        file_put_contents($outputFileInviaCommessa, json_encode($payloadInviaCommessa, JSON_PRETTY_PRINT));
+
+        // Aggiorna lo status a 'l' (To LIMS)
+        $updateStmt = $pdo->prepare("UPDATE datadb SET status = 'l' WHERE iddatadb = :iddatadb");
+        $updateStmt->execute(['iddatadb' => $iddatadb]);
+
+        // Risposta di successo (simulazione)
+        echo json_encode([
+            'success' => true,
+            'mode' => 'simulated',
+            'message' => "Payload generati e salvati in {$outputFileCommessa}, {$outputFileCustomFields}, file campioni e {$outputFileInviaCommessa}",
+            'idcommessaweb' => $idcommessaweb,
+            'commessaweb' => $commessaweb,
+            'payload_commessa' => $payloadCommessa,
+            'payload_customfields' => $payloadCustomFields,
+            'payload_campioni' => $payloadsCampioni,
+            'payload_invia_commessa' => $payloadInviaCommessa
+        ]);
+    } else {
+        // Flusso reale
+        $apiClient = VisualLimsApiClient::getInstance();
+
+        // Step 1: Crea CommessaWeb
+        $response = $apiClient->post('/api/odata/CommessaWeb', $payloadCommessa);
+        if (!isset($response['success']) || !isset($response['CommessaId'])) {
+            throw new Exception('Errore nella creazione della CommessaWeb: ' . json_encode($response));
+        }
+        $idcommessaweb = (int)$response['CommessaId'];
+
+        // Salva idcommessaweb in datadb
+        $updateStmt = $pdo->prepare("UPDATE datadb SET idcommessaweb = :idcommessaweb WHERE iddatadb = :iddatadb");
+        $updateStmt->execute(['idcommessaweb' => $idcommessaweb, 'iddatadb' => $iddatadb]);
+
+        // Logga il successo della creazione CommessaWeb
+        file_put_contents($logDir . '/export_lims_success.log', date('Y-m-d H:i:s') . " - CommessaWeb creata: idcommessaweb {$idcommessaweb} per iddatadb {$iddatadb}\n", FILE_APPEND);
+
+        // Step 2: Aggiorna CommesseCustomFields
+        $apiClient->patch("/api/odata/CommessaWeb({$idcommessaweb})", $payloadCustomFields);
+
+        // Step 3: Crea Campioni
+        foreach ($payloadsCampioni as $index => $payloadCampione) {
+            $payloadCampione['Commessa'] = $idcommessaweb;
+            $apiClient->post('/api/odata/Campione', $payloadCampione);
+            $payloadsCampioni[$index] = $payloadCampione; // Aggiorna il payload con Commessa
+        }
+
+        // Step 4: Invia Commessa
+        $apiClient->post("/api/odata/CommessaWeb({$idcommessaweb})/InviaCommessa", $payloadInviaCommessa);
+
+        // Step 5: Recupera il numero commessaweb (opzionale)
+        $commessaData = $apiClient->get("/api/odata/CommessaWeb({$idcommessaweb})");
+        $commessaweb = $commessaData['Numero'] ?? '';
+        if ($commessaweb) {
+            $updateStmt = $pdo->prepare("UPDATE datadb SET commessaweb = :commessaweb WHERE iddatadb = :iddatadb");
+            $updateStmt->execute(['commessaweb' => $commessaweb, 'iddatadb' => $iddatadb]);
+        }
+
+        // Aggiorna lo status a 'l' (To LIMS)
+        $updateStmt = $pdo->prepare("UPDATE datadb SET status = 'l' WHERE iddatadb = :iddatadb");
+        $updateStmt->execute(['iddatadb' => $iddatadb]);
+
+        // Risposta di successo (flusso reale)
+        echo json_encode([
+            'success' => true,
+            'mode' => 'real',
+            'message' => "Dati inviati al LIMS con successo",
+            'idcommessaweb' => $idcommessaweb,
+            'commessaweb' => $commessaweb,
+            'payload_commessa' => $payloadCommessa,
+            'payload_customfields' => $payloadCustomFields,
+            'payload_campioni' => $payloadsCampioni,
+            'payload_invia_commessa' => $payloadInviaCommessa
+        ]);
+    }
+} catch (Exception $e) {
+    // Log dell'errore
+    file_put_contents($logDir . '/export_lims_error.log', date('Y-m-d H:i:s') . ' - Flusso ' . ($simulate ? 'simulato' : 'reale') . ' fallito: ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+    http_response_code(500);
+    echo json_encode([
+        'success' => false,
+        'mode' => $simulate ? 'simulated' : 'real',
+        'message' => 'Errore: ' . $e->getMessage()
+    ]);
+}

public/userarea/import_edit2.php

@@ -405,6 +405,16 @@ 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;
+        }
     </style>
     <title>Edit Imported Data - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
 </head>
@@ -708,6 +718,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
     <script src="photos.js"></script>
     <script src="parts.js"></script>
     <script src="tracking.js"></script>
+    <script src="export_to_lims.js"></script>
     <script>
         document.addEventListener("DOMContentLoaded", function() {
             console.log("Page loaded, initializing event listeners");
@@ -900,6 +911,8 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
                 }
             });
 
+
+
             window.addEventListener("beforeunload", function(e) {
                 if (hasChanges) {
                     e.preventDefault();
@@ -907,6 +920,26 @@ 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', () => {
+                console.log(`Modal ${modal.id} closed, removing backdrops`);
+                // 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 = '';
+                // 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() {
@@ -1066,6 +1099,43 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
             populateDropdowns();
         });
     </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/include/navbar.php

@@ -41,7 +41,21 @@
                     </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,28 +1,30 @@
-<?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">
@@ -35,7 +37,7 @@
                         <ul class="mb-0">
                             <li>Template Name</li>
                             <li>Row Header and Column Header: where the title of the excel starts</li>
-                            <li>Scheme and client</li>
+                            <li>Schema and client</li>
                         </ul>
                     </div>
                 </div>
@@ -73,7 +75,6 @@
 
                                 <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">
@@ -97,7 +98,7 @@
                                     <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>
@@ -105,68 +106,33 @@
                                     </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;">Loading schemas...</span>
+                                    <span id="schemaLoadingStatus" class="text-muted" style="margin-left: 10px; display: none;">Caricamento schemi in corso...</span>
                                 </div>
 
-                                <!-- new section for specific client field -->
                                 <div class="mb-3">
-                                    <label class="form-label">Client-Specific Fields</label>
-
-                                    <!-- Intestazioni -->
-                                    <div class="row fw-bold text-secondary mb-1">
-                                        <div class="col-md-3">Field Name</div>
-                                        <div class="col-md-2">Type</div>
-                                        <div class="col-md-2 dropdown-values">Possible Values</div>
-                                        <div class="col-md-1">Required</div>
-                                        <div class="col-md-2">Export Column Name</div>
-                                        <div class="col-md-1">Default Value</div>
-                                        <div class="col-md-1">Actions</div>
+                                    <label class="form-label">Select Routine</label>
+                                    <select name="idroutine" id="routineSelect" class="form-control">
+                                        <option value="">Select a routine...</option>
+                                        <?php foreach ($routines as $routine): ?>
+                                            <option value="<?php echo $routine['idroutine']; ?>">
+                                                <?php echo htmlspecialchars($routine['name']); ?>
+                                            </option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                    <div id="routineDetails" class="mt-2" style="display: none;">
+                                        <h6>Routine Details</h6>
+                                        <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>
@@ -178,125 +144,72 @@
                 </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() {
-            console.log("DOM is loaded");
+            if (typeof jQuery === 'undefined') {
+                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 || !addFieldButton || !container || !clientLoadingStatus || !schemaLoadingStatus) {
-                console.error("One or more DOM elements not found:", {
-                    form,
-                    addFieldButton,
-                    container,
-                    clientLoadingStatus,
-                    schemaLoadingStatus
-                });
+            if (!form || !clientLoadingStatus || !schemaLoadingStatus || !routineSelect || !routineDetails) {
+                alert("Errore: Uno o più elementi della pagina non sono stati trovati. Contatta l'amministratore.");
                 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");
             });
 
-            // Funzione per caricare i clienti
+            $('#routineSelect').select2({
+                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 text = await response.text();
-                    console.log("Risposta raw (clienti):", text);
-                    const data = JSON.parse(text);
-
-                    if (!response.ok) {
-                        throw new Error(data.error || `Errore HTTP: ${response.status}, Dettagli: ${JSON.stringify(data)}`);
-                    }
-
-                    if (data.value && Array.isArray(data.value)) {
-                        const select = document.getElementById("clientSelect");
-                        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"
-                        });
-                    }
+                    const data = await response.json();
+                    if (!response.ok) throw new Error(data.error || `Errore HTTP: ${response.status}`);
+                    const select = document.getElementById("clientSelect");
+                    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);
+                    });
+                    $(select).trigger('change');
+                    clientLoadingStatus.textContent = "Clienti caricati.";
                 } catch (error) {
-                    console.error("Errore nel caricamento dei clienti:", error);
                     clientLoadingStatus.textContent = "Errore nel caricamento.";
                     Swal.fire({
                         title: "Errore!",
@@ -305,175 +218,110 @@
                         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() {
-                const maxRetries = 3;
-                let attempt = 0;
-
-                while (attempt < maxRetries) {
-                    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 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)}`);
+                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 select = document.getElementById("schemaSelect");
-                        select.innerHTML = '<option value="">Select a schema...</option>';
-                        data.value.forEach(schema => { // Nota: usa data.value per coerenza con il JSON restituito
-                            const option = new Option(`${schema.Nome} (ID: ${schema.IdSchemaCustomFields})`, schema.IdSchemaCustomFields);
-                            select.add(option);
-                        });
-
-                        schemaLoadingStatus.textContent = "Schemi caricati.";
-                        break; // Esci dal ciclo se la chiamata ha successo
-                    } catch (error) {
-                        attempt++;
-                        console.error(`Tentativo ${attempt} fallito per schemi:`, error);
-                        if (attempt === maxRetries) {
-                            console.error("Errore finale nel caricamento degli schemi:", error);
-                            schemaLoadingStatus.textContent = "Errore nel caricamento.";
-                            Swal.fire({
-                                title: "Errore!",
-                                text: "Impossibile caricare gli schemi: " + error.message,
-                                icon: "error",
-                                confirmButtonText: "OK"
-                            });
-                        } 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);
-                        }
-                    }
+                    });
+                    const data = await response.json();
+                    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);
+                        select.add(option);
+                    });
+                    $(select).trigger('change');
+                    schemaLoadingStatus.textContent = "Schemi caricati.";
+                } catch (error) {
+                    schemaLoadingStatus.textContent = "Errore nel caricamento.";
+                    Swal.fire({
+                        title: "Errore!",
+                        text: "Impossibile caricare gli schemi: " + error.message,
+                        icon: "error",
+                        confirmButtonText: "OK"
+                    });
+                } finally {
+                    setTimeout(() => schemaLoadingStatus.style.display = 'none', 2000);
                 }
             }
 
-            // Funzione combinata per caricare i dati in sequenza
             async function loadData() {
                 try {
-                    await loadClients(); // Carica prima i clienti
-                    await loadSchemas(); // Poi carica gli schemi
+                    await loadClients();
+                    await loadSchemas();
                 } catch (error) {
-                    console.error("Errore nel caricamento dei dati:", error);
-                }
-            }
-
-            // 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;
+                    Swal.fire({
+                        title: "Errore!",
+                        text: "Errore nel caricamento dei dati: " + error.message,
+                        icon: "error",
+                        confirmButtonText: "OK"
                     });
                 }
             }
+            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();
@@ -482,18 +330,11 @@
                 }
                 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 (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 {
+
+                if (!schemaId) {
                     Swal.fire({
                         title: "Errore!",
                         text: "Per favore seleziona uno schema.",
@@ -503,48 +344,17 @@
                     return;
                 }
 
-                // 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 = {};
-                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]);
-                    }
+                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);
 
-                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]);
-                }
+                const routineId = routineSelect.value;
+                formData.append("idroutine", routineId);
 
                 fetch("process_insert_template_xls.php", {
                         method: "POST",
@@ -552,7 +362,6 @@
                     })
                     .then(response => response.json())
                     .then(data => {
-                        console.log("Fetch response:", data);
                         if (data.success) {
                             Swal.fire({
                                 title: "Successo!",
@@ -572,7 +381,6 @@
                         }
                     })
                     .catch(error => {
-                        console.error("Errore Fetch:", error);
                         Swal.fire({
                             title: "Errore!",
                             text: "Si è verificato un errore imprevisto.",

public/userarea/load_parts_quotation.php

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

@@ -0,0 +1,33 @@
+<?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 -->
+<!-- Modal modificato con pulsante per riconoscimento vocale e download -->
 <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,13 +44,14 @@
                     </div>
                     <div class="col-md-6">
                         <h6>Foto del Campione</h6>
-                        <div id="photoSelectorContainer" style="display: none;">
-                            <!-- Dropdown or buttons for photo selection will appear here -->
+                        <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                            <button type="button" class="btn btn-primary btn-sm" id="downloadPhotoBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem; margin-right: 10px;"><i class="fas fa-download"></i> </button>
+                            <div id="photoSelectorContainer" style="display: none;"></div>
                         </div>
                         <div style="position: relative; width: 100%; min-height: 400px;">
                             <img id="samplePhoto" src="" alt="Foto del campione" style="max-width: 100%; max-height: 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>
-                            <div id="descriptionList" class="draggable-description" style="display: none;"></div>
+                            <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="markerContainer"></div>
                         </div>
                     </div>
@@ -97,6 +98,14 @@
         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;
@@ -127,12 +136,33 @@
         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 {
@@ -162,21 +192,17 @@
         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);
@@ -191,7 +217,6 @@
         }
     }
 
-    /* Stile per il selettore personalizzato dei colori */
     .color-picker-container {
         position: relative;
         display: inline-block;

public/userarea/photos.js

@@ -1,19 +1,21 @@
 document.addEventListener("DOMContentLoaded", function () {
     // Funzione per caricare il contenuto del popup
-    async function loadPopupContent(iddatadb) {
+    async function loadPopupContent(iddatadb, idquotations) {
         const popupContent = document.getElementById("popupContent");
         if (!popupContent) {
             console.error("Elemento popupContent non trovato");
             return;
         }
         try {
-            const response = await fetch(
-                `photos_popup.php?iddatadb=${iddatadb}`,
-            );
+            const endpoint = idquotations
+                ? `photos_popup.php?idquotations=${idquotations}`
+                : `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);
+            attachPhotoEventListeners(iddatadb, idquotations);
         } catch (error) {
             popupContent.innerHTML = `<p>Errore durante il caricamento: ${error.message}</p>`;
             console.error("Errore in loadPopupContent:", error);
@@ -21,7 +23,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     // Funzione per gestire la webcam
-    function setupWebcam(iddatadb) {
+    function setupWebcam(iddatadb, idquotations) {
         const openWebcamBtn = document.getElementById("openWebcamBtn");
         const webcamArea = document.getElementById("webcamArea");
         const webcamVideo = document.getElementById("webcamVideo");
@@ -158,7 +160,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 if (loader) {
                     loader.style.display = "flex";
                 }
-                await handleFiles([file], iddatadb);
+                await handleFiles([file], iddatadb, idquotations);
                 if (stream) {
                     stream.getTracks().forEach((track) => track.stop());
                     stream = null;
@@ -171,7 +173,7 @@ document.addEventListener("DOMContentLoaded", function () {
         });
     }
 
-    async function handleFiles(files, iddatadb) {
+    async function handleFiles(files, iddatadb, idquotations) {
         const loader = document.getElementById("loader");
         if (!loader) {
             console.error("Elemento loader non trovato");
@@ -193,7 +195,12 @@ document.addEventListener("DOMContentLoaded", function () {
 
             const formData = new FormData();
             formData.append("photo", file);
-            formData.append("iddatadb", iddatadb);
+            if (idquotations) {
+                formData.append("idquotations", idquotations);
+            } else {
+                formData.append("iddatadb", iddatadb);
+            }
+
             try {
                 const response = await fetch("upload_photo.php", {
                     method: "POST",
@@ -201,7 +208,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 });
                 const result = await response.json();
                 if (result.success) {
-                    loadPopupContent(iddatadb);
+                    loadPopupContent(iddatadb, idquotations);
                 } else {
                     alert("Errore durante il caricamento: " + result.message);
                 }
@@ -213,7 +220,7 @@ document.addEventListener("DOMContentLoaded", function () {
         }
     }
 
-    function attachPhotoEventListeners(iddatadb) {
+    function attachPhotoEventListeners(iddatadb, idquotations) {
         const dropArea = document.getElementById("dropArea");
         const photoInput = document.getElementById("photoInput");
         const photosModal = document.getElementById("photosModal");
@@ -257,7 +264,7 @@ document.addEventListener("DOMContentLoaded", function () {
             (e) => {
                 const files = e.dataTransfer.files;
                 if (files.length > 0) {
-                    handleFiles(files, iddatadb);
+                    handleFiles(files, iddatadb, idquotations);
                 }
             },
             false,
@@ -276,7 +283,7 @@ document.addEventListener("DOMContentLoaded", function () {
             (e) => {
                 const files = e.target.files;
                 if (files.length > 0) {
-                    handleFiles(files, iddatadb);
+                    handleFiles(files, iddatadb, idquotations);
                 }
                 e.target.value = "";
             },
@@ -298,7 +305,7 @@ document.addEventListener("DOMContentLoaded", function () {
                         });
                         const result = await response.json();
                         if (result.success) {
-                            loadPopupContent(iddatadb);
+                            loadPopupContent(iddatadb, idquotations);
                         } else {
                             alert(
                                 "Errore durante l'eliminazione: " +
@@ -336,7 +343,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 }
             });
 
-        setupWebcam(iddatadb);
+        setupWebcam(iddatadb, idquotations);
 
         const createCollageBtn = document.getElementById("createCollageBtn");
         if (createCollageBtn) {
@@ -869,9 +876,9 @@ document.addEventListener("DOMContentLoaded", function () {
                     type: "image/jpeg",
                 });
 
-                await handleFiles([file], iddatadb);
+                await handleFiles([file], iddatadb, idquotations);
                 document.getElementById("collageModal").style.display = "none";
-                loadPopupContent(iddatadb);
+                loadPopupContent(iddatadb, idquotations);
             });
         }
 
@@ -992,8 +999,14 @@ document.addEventListener("DOMContentLoaded", function () {
     if (photosButtons.length && photosModal && closeBtn) {
         photosButtons.forEach((button) => {
             button.addEventListener("click", function () {
-                const iddatadb = this.getAttribute("data-iddatadb");
-                loadPopupContent(iddatadb);
+                const iddatadb = this.getAttribute("data-iddatadb") || null;
+                const idquotations =
+                    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,69 +17,131 @@ 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 l'iddatadb sia stato passato
-if (!isset($_GET['iddatadb']) || empty($_GET['iddatadb'])) {
-    echo json_encode(['error' => 'ID riga non fornito']);
+// Verifica che almeno uno degli ID sia passato
+$iddatadb = isset($_GET['iddatadb']) && !empty($_GET['iddatadb']) ? intval($_GET['iddatadb']) : null;
+$idquotations = isset($_GET['idquotations']) && !empty($_GET['idquotations']) ? intval($_GET['idquotations']) : null;
+
+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;
 }
 
-$iddatadb = intval($_GET['iddatadb']);
-
-// Recupera i dettagli della riga (idriga e sample_code)
-$stmt = $pdo->prepare("SELECT iddatadb, sample_code FROM datadb WHERE iddatadb = ?");
-$stmt->execute([$iddatadb]);
-$row = $stmt->fetch(PDO::FETCH_ASSOC);
-
-if (!$row) {
-    echo json_encode(['error' => 'Riga non trovata']);
+if ($iddatadb && $idquotations) {
+    error_log("Errore: Non è possibile specificare sia iddatadb che idquotations");
+?>
+    <div class="popup-content">
+        <p>Errore: Non è possibile specificare sia iddatadb che idquotations.</p>
+    </div>
+    <?php
     exit;
 }
 
-$idriga = $row['iddatadb'];
-$sampleCode = $row['sample_code'] ?? 'Non disponibile';
+// Determina quale ID e tabella usare
+$paramName = $iddatadb ? 'iddatadb' : 'id'; // Usa 'id' per quotations
+$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
-$stmt = $pdo->prepare("SELECT id, file_path, file_name, description, uploaded_at FROM datadb_photos WHERE iddatadb = ? ORDER BY uploaded_at DESC");
-$stmt->execute([$iddatadb]);
-$photos = $stmt->fetchAll(PDO::FETCH_ASSOC);
+try {
+    $stmt = $pdo->prepare("SELECT id, file_path, file_name, description, uploaded_at FROM {$photoTable} WHERE {$photoParamName} = ? ORDER BY uploaded_at DESC");
+    $stmt->execute([$paramValue]);
+    $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'], '/'); // Rimuove eventuali slash finali
-$uploadUrl = $baseUrl . "/upload_photos_mobile.php?iddatadb=" . $iddatadb;
+$baseUrl = rtrim($_ENV['BASE_URL'], '/');
+$uploadUrl = $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_{$iddatadb}.png";
+$qrCodeFile = $qrCodeDir . "qrcode_{$id}.png";
 
 $writer = new PngWriter();
-
-// Crea il QR code usando il costruttore
 $qrCode = new QrCode(
     data: $uploadUrl,
     encoding: new Encoding('UTF-8'),
@@ -103,13 +165,13 @@ $result->saveToFile($qrCodeFile);
         </div>
     </div>
     <h3>Manage Photos</h3>
-    <p><strong>ID Row:</strong> <?= htmlspecialchars($idriga) ?></p>
-    <p><strong>Sample Code:</strong> <?= htmlspecialchars($sampleCode) ?></p>
+    <p><strong>ID:</strong> <?= htmlspecialchars($id) ?></p>
+    <p><strong>Code:</strong> <?= htmlspecialchars($code) ?></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_<?= $iddatadb ?>.png" alt="QR Code" style="max-width: 150px;">
+        <img src="../photostrf/qrcodes/qrcode_<?= htmlspecialchars($id) ?>.png" alt="QR Code" style="max-width: 150px;">
         <p style="margin-top: 10px;">
             <a href="<?= htmlspecialchars($uploadUrl) ?>" target="_blank"><?= htmlspecialchars($uploadUrl) ?></a>
         </p>
@@ -136,7 +198,7 @@ $result->saveToFile($qrCodeFile);
     <!-- Elenco delle foto -->
     <div id="photosList">
         <?php if (empty($photos)): ?>
-            <p>No Photos present.</p>
+            <p>Nessuna foto presente.</p>
         <?php else: ?>
             <?php foreach ($photos as $photo): ?>
                 <?php

public/userarea/process_edit_template_xls.php

@@ -18,9 +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
-    $schemamaname = trim($_POST['schemamaname'] ?? ''); // Nuovo campo
+    $schemaname = trim($_POST['schemaname'] ?? ''); // Corretto da schemamaname
+    $idroutine = isset($_POST['idroutine']) && $_POST['idroutine'] !== '' ? intval($_POST['idroutine']) : null; // Aggiunto idroutine
 
     // Controllo sui campi obbligatori
     if (empty($id) || empty($name) || empty($header_row) || empty($start_column) || empty($target_table) || $idschema <= 0) {
@@ -32,20 +32,14 @@ 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 idschema e schemaname
+    // Aggiorna il database, includendo idschema, schemaname e idroutine
     $stmt = $pdo->prepare("UPDATE excel_templates 
                            SET name = ?, header_row = ?, start_column = ?, description = ?, target_table = ?, 
-                               idclient = ?, clientname = ?, client_specific_fields = ?, schemaname = ?, idschema = ?, updated_at = NOW() 
+                               idclient = ?, clientname = ?, schemaname = ?, idschema = ?, idroutine = ?, updated_at = NOW() 
                            WHERE id = ?");
     $stmt->execute([
         $name,
@@ -55,9 +49,9 @@ try {
         $target_table,
         $idclient,
         $clientname,
-        $client_specific_fields,
-        $schemamaname,
+        $schemaname,
         $idschema,
+        $idroutine,
         $id
     ]);
 

public/userarea/process_insert_template_xls.php

@@ -15,71 +15,53 @@ 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) || $idschema <= 0) {
-        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.");
+    if (empty($name) || empty($header_row) || empty($start_column) || empty($target_table) || $idclient <= 0 || $idschema <= 0) {
+        throw new Exception("All fields marked with * are required, including client and schema.");
     }
 
     // Connessione al database
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
-    // Inserisci nel database, aggiungendo idschema e schemaname
-    $stmt = $pdo->prepare("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) 
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())");
+    // Inserisci il nuovo template
+    $stmt = $pdo->prepare("
+        INSERT INTO excel_templates 
+        (name, header_row, start_column, description, target_table, idclient, clientname, idschema, schemaname, idroutine, 
+         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,
-        $idclient,
-        $clientname,
-        $status,
-        $client_specific_fields,
-        $schemamaname,
-        $idschema
+        $button_label
     ]);
 
-    if ($stmt->rowCount() > 0) {
-        $response["success"] = true;
-        $response["message"] = "Template created successfully!";
-    } else {
-        throw new Exception("Failed to insert template.");
-    }
+    $response["success"] = true;
+    $response["message"] = "Template created successfully!";
 } catch (Exception $e) {
     $response["message"] = $e->getMessage();
 }
 
-// Restituisce un JSON per il fetch
 echo json_encode($response);

public/userarea/quotations.php

@@ -25,15 +25,21 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
     $description = '';
     $customer = '';
 
-    $stmt = $pdo->prepare("INSERT INTO quotations (description, customer, iduser) VALUES (?, ?, ?)");
-    $stmt->execute([$description, $customer, $user_id]);
-    $newId = $pdo->lastInsertId();
-
-    // Log creazione
-    error_log("Creata nuova quotation ID: $newId");
-
-    // Reindirizza alla modifica della nuova quotation
-    header("Location: quotations.php?edit_id=" . $newId . "&status=success&message=" . urlencode("Quotation creata con successo"));
+    try {
+        $stmt = $pdo->prepare("INSERT INTO quotations (description, customer, iduser) VALUES (?, ?, ?)");
+        $success = $stmt->execute([$description, $customer, $user_id]);
+        if ($success) {
+            $newId = $pdo->lastInsertId();
+            error_log("Creata nuova quotation ID: $newId");
+            header("Location: quotations.php?edit_id=" . $newId . "&status=success&message=" . urlencode("Quotation creata con successo"));
+        } else {
+            error_log("Errore: Impossibile creare la quotation, nessun ID generato.");
+            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;
 }
 
@@ -43,14 +49,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
     $description = $_POST['description'] ?? '';
     $customer = $_POST['customer'] ?? '';
 
-    $stmt = $pdo->prepare("UPDATE quotations SET description = ?, customer = ? WHERE id = ? AND iduser = ?");
-    $stmt->execute([$description, $customer, $id, $user_id]);
-
-    // Log modifica
-    error_log("Modificata quotation ID: $id");
-
-    // Reindirizza alla lista delle quotations
-    header("Location: quotations.php?status=success&message=" . urlencode("Quotation modificata con successo"));
+    try {
+        $stmt = $pdo->prepare("UPDATE quotations SET description = ?, customer = ? WHERE id = ? AND iduser = ?");
+        $stmt->execute([$description, $customer, $id, $user_id]);
+        error_log("Modificata quotation ID: $id");
+        header("Location: quotations.php?status=success&message=" . urlencode("Quotation modificata con successo"));
+    } catch (PDOException $e) {
+        error_log("Errore PDO durante la modifica della quotation: " . $e->getMessage());
+        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+    }
     exit;
 }
 
@@ -58,28 +65,43 @@ 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']);
 
-    $stmt = $pdo->prepare("DELETE FROM quotations WHERE id = ? AND iduser = ?");
-    $stmt->execute([$id, $user_id]);
-
-    // Log cancellazione
-    error_log("Cancellata quotation ID: $id");
-
-    header("Location: quotations.php?status=success&message=" . urlencode("Quotation cancellata con successo"));
+    try {
+        $stmt = $pdo->prepare("DELETE FROM quotations WHERE id = ? AND iduser = ?");
+        $stmt->execute([$id, $user_id]);
+        error_log("Cancellata quotation ID: $id");
+        header("Location: quotations.php?status=success&message=" . urlencode("Quotation cancellata con successo"));
+    } catch (PDOException $e) {
+        error_log("Errore PDO durante la cancellazione della quotation: " . $e->getMessage());
+        header("Location: quotations.php?status=error&message=" . urlencode("Errore database: " . $e->getMessage()));
+    }
     exit;
 }
 
 // Recupera tutte le quotations per l'utente
-$stmt = $pdo->prepare("SELECT * FROM quotations WHERE iduser = ? ORDER BY creation_date DESC");
-$stmt->execute([$user_id]);
-$quotations = $stmt->fetchAll(PDO::FETCH_ASSOC);
+try {
+    $stmt = $pdo->prepare("SELECT * FROM quotations WHERE iduser = ? ORDER BY creation_date DESC");
+    $stmt->execute([$user_id]);
+    $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']);
-    $stmt = $pdo->prepare("SELECT * FROM quotations WHERE id = ? AND iduser = ?");
-    $stmt->execute([$editId, $user_id]);
-    $editQuotation = $stmt->fetch(PDO::FETCH_ASSOC);
+    try {
+        $stmt = $pdo->prepare("SELECT * FROM quotations WHERE id = ? AND iduser = ?");
+        $stmt->execute([$editId, $user_id]);
+        $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;
+    }
 }
 ?>
 
@@ -93,8 +115,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;
@@ -174,6 +196,73 @@ 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>
@@ -193,6 +282,11 @@ 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>
@@ -212,8 +306,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-idquotations="<?= $editQuotation['id'] ?>" title="Photos"><i class="fas fa-camera"></i></button>
-                                <button type="button" class="parts-btn action-btn" data-idquotations="<?= $editQuotation['id'] ?>" title="Parts"><i class="fas fa-puzzle-piece"></i></button>
+                                <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="parts-btn action-btn" data-iddatadb="" data-idquotations="<?= $editQuotation['id'] ?>" data-row="0">Parti</button>
                             </div>
                         <?php else: ?>
                             <!-- Lista Quotations -->
@@ -232,7 +326,7 @@ if (isset($_GET['edit_id'])) {
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php foreach ($quotations as $row): ?>
+                                    <?php foreach ($quotations as $index => $row): ?>
                                         <tr data-id="<?= $row['id'] ?>">
                                             <td><?= htmlspecialchars($row['id']) ?></td>
                                             <td><?= htmlspecialchars($row['creation_date']) ?></td>
@@ -245,8 +339,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-idquotations="<?= $row['id'] ?>" title="Photos"><i class="fas fa-camera"></i></button>
-                                                <button type="button" class="parts-btn action-btn" data-idquotations="<?= $row['id'] ?>" title="Parts"><i class="fas fa-puzzle-piece"></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="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>
                                                 <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>
@@ -309,26 +403,75 @@ 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,
-                    "searching": true,
-                    "ordering": true,
-                    "info": true,
-                    "autoWidth": false,
-                    "responsive": true
+                    paging: true,
+                    searching: true,
+                    ordering: true,
+                    info: true,
+                    autoWidth: false,
+                    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() {
-                document.getElementById('createModalForm').submit();
+                const createModal = bootstrap.Modal.getInstance(document.getElementById('createModal'));
+                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
@@ -356,6 +499,9 @@ 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);
                     });
                 });
             });
@@ -376,6 +522,15 @@ 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

@@ -0,0 +1,63 @@
+<?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/save_annotated_photo.php

@@ -1,36 +1,60 @@
 <?php
 header('Content-Type: application/json');
-
-include('include/headscript.php'); // აქედან უნდა იყოს DB კავშირიც
+include('include/headscript.php');
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-$dataURL  = $_POST['dataURL']   ?? null;
-$filename = $_POST['filename']  ?? null;
-$iddatadb = $_POST['iddatadb']  ?? null; // 🟢 ახალი ველი
+$file = $_FILES['file'] ?? null;
+$filename = $_POST['filename'] ?? null;
+$iddatadb = $_POST['iddatadb'] ?? null;
 
-if (!$dataURL || !$filename || !$iddatadb) {
+if (!$file || !$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 {
-    // --- ფაილის შენახვა ---
-    $data = explode(',', $dataURL)[1];
-    $decodedData = base64_decode($data);
+    $dbHandler = DBHandlerSelect::getInstance();
+    $pdo = $dbHandler->getConnection();
+    $stmt = $pdo->prepare("SELECT iddatadb FROM datadb WHERE iddatadb = :iddatadb");
+    $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, 0777, true);
+        mkdir($dirPath, 0755, true);
     }
 
     $filePath = $dirPath . '/' . $filename;
-    file_put_contents($filePath, $decodedData);
+    if (file_exists($filePath)) {
+        echo json_encode(['success' => false, 'message' => 'File già esistente']);
+        exit;
+    }
 
-    $db = DBHandlerSelect::getInstance();
-    $pdo = $db->getConnection();
+    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 (iddatadb, file_path, file_name, uploaded_at, uploaded_by)
         VALUES (:iddatadb, :file_path, :file_name, NOW(), :uploaded_by)
@@ -39,7 +63,7 @@ try {
         ':iddatadb'   => $iddatadb,
         ':file_path'  => $filePath,
         ':file_name'  => $filename,
-        ':uploaded_by'=> $iduserlogin
+        ':uploaded_by' => $iduserlogin
     ]);
 
     echo json_encode([
@@ -47,7 +71,6 @@ 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

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

@@ -0,0 +1,60 @@
+<?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/test_auth.php

@@ -0,0 +1,58 @@
+<?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,13 +4,23 @@ include('include/headscript.php');
 
 header('Content-Type: application/json');
 
-if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_FILES['photo']) || !isset($_POST['iddatadb'])) {
+if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_FILES['photo']) || (!isset($_POST['iddatadb']) && !isset($_POST['idquotations']))) {
     echo json_encode(['success' => false, 'message' => 'Richiesta non valida']);
     exit;
 }
 
-$iddatadb = intval($_POST['iddatadb']);
-$photo = $_FILES['photo'];
+$iddatadb = isset($_POST['iddatadb']) ? intval($_POST['iddatadb']) : null;
+$idquotations = isset($_POST['idquotations']) ? intval($_POST['idquotations']) : null;
+
+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();
@@ -25,6 +35,28 @@ 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)) {
@@ -41,6 +73,7 @@ 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)']);
@@ -53,10 +86,11 @@ if (!file_exists($photo['tmp_name']) || !is_uploaded_file($photo['tmp_name'])) {
     exit;
 }
 
-// Rinomina il file: idriga-timestamp-nomeoriginale.estensione
+// Rinomina il file: id-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'])) {
@@ -74,11 +108,11 @@ if (in_array($photo['type'], ['image/heic', 'image/heif'])) {
     }
 
     // Crea un nuovo nome per il file JPEG
-    $newFileName = "{$iddatadb}-{$timestamp}-{$originalName}.jpg";
+    $newFileName = "{$id}-{$timestamp}-{$originalName}.jpg";
     $destination = $uploadDir . $newFileName;
 
     // Salva l'immagine come JPEG
-    if (!imagejpeg($image, $destination, 90)) { // 90 è la qualità JPEG
+    if (!imagejpeg($image, $destination, 90)) {
         imagedestroy($image);
         echo json_encode(['success' => false, 'message' => 'Errore durante la conversione del file HEIC in JPEG']);
         exit;
@@ -88,7 +122,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 = "{$iddatadb}-{$timestamp}-{$originalName}.{$extension}";
+    $newFileName = "{$id}-{$timestamp}-{$originalName}.{$extension}";
     $destination = $uploadDir . $newFileName;
 
     // Salva il file
@@ -105,7 +139,12 @@ error_log("Destination: $destination");
 error_log("Temp file: " . $photo['tmp_name']);
 
 // Salva il riferimento nel database
-$stmt = $pdo->prepare("INSERT INTO datadb_photos (iddatadb, file_path, file_name, uploaded_by) VALUES (?, ?, ?, ?)");
-$stmt->execute([$iddatadb, $newFileName, $newFileName, $iduserlogin]);
+try {
+    $stmt = $pdo->prepare("INSERT INTO datadb_photos (iddatadb, idquotations, file_path, file_name, uploaded_by) VALUES (?, ?, ?, ?, ?)");
+    $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,24 +5,41 @@ include('include/headscript.php');
 $db = DBHandlerSelect::getInstance();
 $pdo = $db->getConnection();
 
-// Verifica che l'iddatadb sia stato passato
-if (!isset($_GET['iddatadb']) || empty($_GET['iddatadb'])) {
-    die('ID riga non fornito');
+// Verifica che almeno uno degli ID sia passato
+$iddatadb = isset($_GET['iddatadb']) && !empty($_GET['iddatadb']) ? intval($_GET['iddatadb']) : null;
+$idquotations = isset($_GET['idquotations']) && !empty($_GET['idquotations']) ? intval($_GET['idquotations']) : null;
+
+if (!$iddatadb && !$idquotations) {
+    die('ID riga o ID quotations non fornito');
 }
 
-$iddatadb = intval($_GET['iddatadb']);
+if ($iddatadb && $idquotations) {
+    die('Non è possibile specificare sia iddatadb che idquotations');
+}
 
-// Recupera i dettagli della riga (idriga e sample_code)
-$stmt = $pdo->prepare("SELECT iddatadb, sample_code FROM datadb WHERE iddatadb = ?");
-$stmt->execute([$iddatadb]);
+// Verifica che l'utente loggato esista
+$stmt = $pdo->prepare("SELECT id FROM auth_users WHERE id = ?");
+$stmt->execute([$iduserlogin]);
+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');
 }
 
-$idriga = $row['iddatadb'];
-$sampleCode = $row['sample_code'] ?? 'Non disponibile';
+$id = $row[$paramName];
+$code = $row[$field] ?? 'Non disponibile';
 ?>
 
 <!DOCTYPE html>
@@ -32,17 +49,23 @@ $sampleCode = $row['sample_code'] ?? '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 0;
+            margin: 20px auto;
+            max-width: 500px;
+            background: white;
+            border-radius: 8px;
+            cursor: pointer;
         }
 
         .upload-area.highlight {
@@ -56,57 +79,121 @@ $sampleCode = $row['sample_code'] ?? '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 Riga: <?= htmlspecialchars($idriga) ?></h2>
-    <p><strong>Sample Code:</strong> <?= htmlspecialchars($sampleCode) ?></p>
-
+    <h2>Carica Foto per ID: <?= htmlspecialchars($id) ?></h2>
+    <p><strong>Codice:</strong> <?= htmlspecialchars($code) ?></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 un'immagine</p>
-        <input type="file" id="photoInput" accept="image/*" capture="camera">
-    </div>
-
-    <div id="photosList">
-        <!-- Le foto verranno caricate dinamicamente -->
+        <p>Scatta una foto o seleziona immagini</p>
+        <input type="file" id="photoInput" accept="image/*" capture="camera" multiple style="display: none;">
     </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 del click sull'area di upload
-        uploadArea.addEventListener('click', () => {
-            photoInput.click();
+        // Gestione drag-and-drop
+        uploadArea.addEventListener('dragover', (e) => {
+            e.preventDefault();
+            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 del caricamento delle foto
-        photoInput.addEventListener('change', () => {
-            handleFiles(photoInput.files);
-        });
+        // Gestione click sull'area di upload
+        uploadArea.addEventListener('click', () => photoInput.click());
+
+        // 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/')) {
-                    alert('Per favore, carica solo immagini!');
+                    showError('Per favore, carica solo immagini!');
                     continue;
                 }
 
                 const formData = new FormData();
                 formData.append('photo', file);
-                formData.append('iddatadb', '<?= $iddatadb ?>');
+                if (iddatadb) formData.append('iddatadb', iddatadb);
+                if (idquotations) formData.append('idquotations', idquotations);
 
                 try {
                     const response = await fetch('upload_photo.php', {
@@ -114,32 +201,86 @@ $sampleCode = $row['sample_code'] ?? 'Non disponibile';
                         body: formData
                     });
                     const result = await response.json();
-
-                    if (result.success) {
-                        loadPhotos(); // Ricarica le foto
-                    } else {
-                        alert('Errore durante il caricamento: ' + result.message);
+                    if (!result.success) {
+                        showError('Errore durante il caricamento: ' + result.message);
                     }
                 } catch (error) {
-                    alert('Errore durante il caricamento: ' + error.message);
+                    showError('Errore di rete: ' + 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(`photos_popup.php?iddatadb=<?= $iddatadb ?>`);
-                const html = await response.text();
-                const parser = new DOMParser();
-                const doc = parser.parseFromString(html, 'text/html');
-                const photosListContent = doc.querySelector('#photosList').innerHTML;
-                photosList.innerHTML = photosListContent;
+                const response = await fetch(`${endpoint}?${new URLSearchParams(dataParam)}`);
+                const result = await response.json();
+                photosList.innerHTML = '';
+                if (result.success && result.photos && result.photos.length > 0) {
+                    for (const photo of result.photos) {
+                        const photoName = photo.split('/').pop();
+                        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) {
-                photosList.innerHTML = `<p>Errore durante il caricamento delle foto: ${error.message}</p>`;
+                showError('Errore durante il caricamento delle foto: ' + error.message);
             }
+            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,15 +26,9 @@
     </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,12 +6314,6 @@ 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',
@@ -6336,13 +6330,10 @@ 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,13 +60,8 @@ 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,13 +120,8 @@ 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 (
@@ -471,24 +466,14 @@ 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',
@@ -7145,12 +7130,6 @@ 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',
@@ -7167,13 +7146,10 @@ 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,7 +8185,6 @@
             "install-path": "../socialiteproviders/manager"
         },
         {
-<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "version_normalized": "4.7.0.0",
@@ -8198,45 +8197,20 @@
                 "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/",
@@ -8245,22 +8219,12 @@
             ],
             "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",
@@ -8268,19 +8232,11 @@
                 "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,11 +3,7 @@
         'name' => 'loshmis/vanguard',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-<<<<<<< HEAD
         'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
-=======
-        'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -692,11 +688,7 @@
         'loshmis/vanguard' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-<<<<<<< HEAD
             'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
-=======
-            'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -1312,21 +1304,12 @@
             '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,
         ),