Compare commits

...

12 Commits

9 changed files with 719 additions and 395 deletions
+25 -7
View File
@@ -1,16 +1,16 @@
APP_ENV=production APP_ENV=production
APP_DEBUG=false APP_DEBUG=true
APP_KEY= APP_KEY=base64:C+sutHm6xP5sE4QXhoZFhYjArlVN11s2mDU1F8beUkM=
APP_URL=http://vanguard.test APP_URL=http://vanguard.test
LOG_CHANNEL=stack LOG_CHANNEL=stack
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=localhost DB_HOST="localhost"
DB_DATABASE=vanguard DB_DATABASE="trfcertest"
DB_USERNAME=homestead DB_USERNAME="solocla"
DB_PASSWORD=secret DB_PASSWORD="xxxxxxx"
DB_PREFIX=vg_ DB_PREFIX="auth_"
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file
@@ -39,3 +39,21 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
# Credenziali API VisualLims
SIMULATE_EXPORT_LIMS=true
API_BASE_URL=https://93.43.5.102/limsapi
API_USERNAME=xxxx
API_PASSWORD=XXXX
BASE_URL=http://localhost:8000/userarea/
# Credenziali ENTRAID
AZURE_CLIENT_ID=your-client-id
AZURE_CLIENT_SECRET=your-client-secret
AZURE_REDIRECT_URI=https://your-app.com/auth/azure/callback
AZURE_TENANT_ID=
MICROSOFT_CLIENT_ID=your_client_id_here
MICROSOFT_CLIENT_SECRET=your_client_secret_here
MICROSOFT_REDIRECT_URI="${APP_URL}/auth/microsoft/callback"
+50
View File
@@ -0,0 +1,50 @@
<?php
ob_start();
session_start();
require_once '../../vendor/autoload.php';
$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '', 'excel_data' => []];
try {
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$input = json_decode(file_get_contents('php://input'), true);
$template_id = isset($input['template_id']) ? intval($input['template_id']) : 0;
$filename = $input['routine_data']['filename'] ?? '';
$headerrow = $input['routine_data']['headerrow'] ?? 1;
$excelData = $input['excel_data'] ?? [];
$routineData = $input['routine_data'] ?? [];
if (!$filename || empty($excelData)) {
throw new Exception("Dati della routine mancanti.");
}
$routineFile = __DIR__ . '/routines/' . $filename;
if (file_exists($routineFile)) {
include_once $routineFile;
$routineData['xls_headers'] = $_SESSION['headers'] ?? [];
applyRoutine($excelData, $routineData); // Modifica $excelData in place
error_log("Routine {$routineData['name']} applicata (file: {$filename}) per template {$template_id}, header row: {$headerrow}");
} else {
throw new Exception("File della routine non trovato: $routineFile");
}
// Aggiorna la sessione con i dati modificati
$_SESSION['excel_data'] = $excelData;
$response['excel_data'] = $excelData;
$response['rows'] = array_column($excelData, 'data');
$response['columns'] = $_SESSION['headers'];
$response['template_id'] = $template_id;
$response['filename'] = $input['filename'] ?? '';
} else {
$response['error'] = "Richiesta non valida.";
}
} catch (Exception $e) {
$response['error'] = "Errore durante l'applicazione della routine: " . $e->getMessage();
error_log("Exception in apply_routine.php: " . $e->getMessage());
}
ob_end_clean();
header('Content-Type: application/json');
echo json_encode($response);
exit;
@@ -120,4 +120,76 @@ class VisualLimsApiClient
return $data; return $data;
} }
public function post($endpoint, $payload)
{
$token = $this->getToken();
$url = "{$this->baseUrl}/api/odata/{$endpoint}";
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
curl_setopt($ch, CURLOPT_HTTPHEADER, [
"Authorization: Bearer {$token}",
"Content-Type: application/json",
"Accept: application/json"
]);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
$response = curl_exec($ch);
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$curl_error = curl_error($ch);
curl_close($ch);
if ($response === false) {
throw new Exception("Errore nella richiesta POST: {$curl_error}");
}
if ($http_code < 200 || $http_code >= 300) {
throw new Exception("POST fallito: HTTP {$http_code}, Risposta: " . substr($response, 0, 1000));
}
return json_decode($response, true);
}
public function patch($endpoint, $payload)
{
$token = $this->getToken();
$url = "{$this->baseUrl}/api/odata/{$endpoint}";
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PATCH");
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
curl_setopt($ch, CURLOPT_HTTPHEADER, [
"Authorization: Bearer {$token}",
"Content-Type: application/json",
"Accept: application/json"
]);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
$response = curl_exec($ch);
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$curl_error = curl_error($ch);
curl_close($ch);
if ($response === false) {
throw new Exception("Errore nella richiesta PATCH: {$curl_error}");
}
if ($http_code < 200 || $http_code >= 300) {
throw new Exception("PATCH fallito: HTTP {$http_code}, Risposta: " . substr($response, 0, 1000));
}
return json_decode($response, true);
}
public function getBaseUrl()
{
return $this->baseUrl;
}
} }
+140 -211
View File
@@ -1,243 +1,172 @@
<?php <?php
// File: export_to_lims.php require_once "class/VisualLimsApiClient.class.php";
ini_set('display_errors', '0'); include('include/headscript.php');
error_reporting(E_ALL);
ini_set('log_errors', 1);
ini_set('error_log', __DIR__ . '/logsapi/export_lims_error.log');
// Includi il file con la connessione al database e Dotenv $dbHandler = DBHandlerSelect::getInstance();
require_once __DIR__ . '/include/headscript.php'; $pdo = $dbHandler->getConnection();
require_once dirname(__DIR__, 2) . '/vendor/autoload.php';
require_once __DIR__ . '/class/VisualLimsApiClient.class.php';
use Dotenv\Dotenv; header("Content-Type: application/json");
// Carica il file .env
$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 { try {
// Verifica che la richiesta sia POST e contenga iddatadb $iddatadb = $_POST['iddatadb'] ?? null;
if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['iddatadb'])) { if (!$iddatadb) {
throw new Exception('Richiesta non valida: iddatadb mancante'); throw new Exception("Missing iddatadb");
} }
$iddatadb = (int)$_POST['iddatadb']; // 🔹 STEP 1+2: Fetch Cliente ID + Schema ID
$stmt = $pdo->prepare("
// Crea la cartella logsapi se non esiste SELECT et.idclient AS clienteId, et.idschema AS schemaId
$logDir = __DIR__ . '/logsapi'; FROM datadb as d
if (!is_dir($logDir)) { INNER JOIN excel_templates as et ON d.templateid = et.id
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 WHERE d.iddatadb = :iddatadb
"; LIMIT 1
");
$stmt->execute(['iddatadb' => $iddatadb]);
$result = $stmt->fetch(PDO::FETCH_ASSOC);
$stmtCommessa = $pdo->prepare($queryCommessa); if (!$result) {
$stmtCommessa->execute(['iddatadb' => $iddatadb]); throw new Exception("No Cliente/Schema found for iddatadb {$iddatadb}");
$recordCommessa = $stmtCommessa->fetch(PDO::FETCH_ASSOC);
if (!$recordCommessa) {
throw new Exception("Nessun record trovato per iddatadb: {$iddatadb}");
} }
// Validazione payload $clienteId = (int) $result['clienteId'];
if (empty($recordCommessa['Cliente']) || empty($recordCommessa['SchemaCustomField'])) { $schemaId = (int) $result['schemaId'];
throw new Exception("Dati mancanti per CommessaWeb: Cliente o SchemaCustomField non validi");
}
// Payload per creazione CommessaWeb // 🔹 STEP 3: Fetch Parts (including idmatrice)
$payloadCommessa = [ $stmt = $pdo->prepare("
'Cliente' => (int)$recordCommessa['Cliente'], SELECT part_number, part_description, material, color, mix, idmatrice
'SchemaCustomField' => (int)$recordCommessa['SchemaCustomField'],
'Richiedente' => null,
'Descrizione' => 'example'
];
// Step 2: Creazione payload per campi custom (CommesseCustomFields)
$queryCustomFields = "
SELECT
tm.field_id AS IdCommesseCustomFields,
idd.field_value AS Valore
FROM import_data_details idd
JOIN template_mapping tm ON idd.mapping_id = tm.id
WHERE idd.id = :iddatadb
";
$stmtCustomFields = $pdo->prepare($queryCustomFields);
$stmtCustomFields->execute(['iddatadb' => $iddatadb]);
$customFields = $stmtCustomFields->fetchAll(PDO::FETCH_ASSOC);
// Costruisci l'array CommesseCustomFields
$commesseCustomFields = [];
foreach ($customFields as $field) {
$commesseCustomFields[] = [
'IdCommesseCustomFields' => (int)$field['IdCommesseCustomFields'],
'Valore' => $field['Valore'] ?? ''
];
}
// Payload per aggiornamento campi custom
$payloadCustomFields = [
'CommesseCustomFields' => $commesseCustomFields
];
// Step 3: Creazione payload per Campioni (da identification_parts)
$queryCampioni = "
SELECT
part_number,
idmatrice AS Matrice,
part_description AS NoteWeb
FROM identification_parts FROM identification_parts
WHERE iddatadb = :iddatadb WHERE iddatadb = :iddatadb
"; ");
$stmt->execute(['iddatadb' => $iddatadb]);
$parts = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmtCampioni = $pdo->prepare($queryCampioni); // 🔹 STEP 4: Fetch Field Values with Labels
$stmtCampioni->execute(['iddatadb' => $iddatadb]); $stmt = $pdo->prepare("
$campioni = $stmtCampioni->fetchAll(PDO::FETCH_ASSOC); SELECT
idd.field_value,
m.field_label,
m.schema_id,
m.field_id
FROM
import_data_details as idd
JOIN template_mapping m ON idd.mapping_id = m.id
WHERE idd.id = :iddatadb
");
$stmt->execute(['iddatadb' => $iddatadb]);
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
$payloadsCampioni = []; $fieldValues = [];
foreach ($campioni as $campione) { foreach ($rows as $row) {
if (empty($campione['Matrice'])) { $fieldValues[] = [
throw new Exception("Matrice non valida per campione: {$campione['part_number']}"); "IdCommesseCustomFields" => (int) $row['field_id'],
} "Valore" => $row['field_value']
$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 // 🔹 Initialize API client
$payloadInviaCommessa = []; $api = VisualLimsApiClient::getInstance();
// Variabile per idcommessaweb // 🔹 STEP 5: Create CommessaWeb (NOT WebOrder)
$idcommessaweb = null; $commessaWebPayload = [
$commessaweb = ''; "Cliente" => $clienteId,
"SchemaCustomField" => $schemaId,
"Richiedente" => "Test Web Import",
"Descrizione" => "TEST CommessaWeb",
];
$commessaWeb = $api->post("CommessaWeb", $commessaWebPayload);
if ($simulate) { $commessaId = $commessaWeb["IdCommessa"];
// Flusso simulato // Estraiamo il numero della commessa usando CodiceCommessa
$idcommessaweb = 10176; // Fittizio per il test $commessaWebCode = substr($commessaWeb["CodiceCommessa"] ?? "TEST CommessaWeb", 0, 30); // Limite a 30 caratteri
// Salva idcommessaweb in datadb // 🔹 STEP 6: Create Campioni (Samples) for each part
$updateStmt = $pdo->prepare("UPDATE datadb SET idcommessaweb = :idcommessaweb WHERE iddatadb = :iddatadb"); $campioni = [];
$updateStmt->execute(['idcommessaweb' => $idcommessaweb, 'iddatadb' => $iddatadb]); foreach ($parts as $index => $part) {
$matriceId = (int) ($part["idmatrice"] ?? 0);
// Salva i payload in file JSON if ($matriceId <= 0) {
$outputFileCommessa = $logDir . "/commessaweb_create_{$iddatadb}.json"; throw new Exception("Invalid or missing idmatrice for part: " . ($part["part_number"] ?? "Unknown"));
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"; $campionePayload = [
file_put_contents($outputFileInviaCommessa, json_encode($payloadInviaCommessa, JSON_PRETTY_PRINT)); "Commessa" => $commessaId,
"Matrice" => $matriceId,
"SottoMatrice" => null,
"SchemaCustomField" => $schemaId,
"NoteWeb" => $part["part_description"] ?? ""
];
// Aggiorna lo status a 'l' (To LIMS) $campione = $api->post("Campione", $campionePayload);
$updateStmt = $pdo->prepare("UPDATE datadb SET status = 'l' WHERE iddatadb = :iddatadb");
$updateStmt->execute(['iddatadb' => $iddatadb]);
// Risposta di successo (simulazione) $campione["PartNumber"] = $part["part_number"] ?? "";
echo json_encode([ $campione["Material"] = $part["material"] ?? "";
'success' => true, $campione["Color"] = $part["color"] ?? "";
'mode' => 'simulated', $campione["Mix"] = $part["mix"] ?? "";
'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 $campioni[] = $campione;
$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 // 🔹 STEP 7: Update Custom Fields for CommessaWeb
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); if (!empty($fieldValues)) {
http_response_code(500); $commessaWithFields = $api->get("CommessaWeb(" . $commessaId . ")?\$expand=CommesseCustomFields");
$commessaCustomFields = [];
foreach ($commessaWithFields["CommesseCustomFields"] as $customField) {
foreach ($fieldValues as $fieldValue) {
if ($customField["IdCommesseCustomFields"] == $fieldValue["IdCommesseCustomFields"]) {
$commessaCustomFields[] = [
"IdCommesseCustomFields" => $customField["IdCommesseCustomFields"],
"Valore" => $fieldValue["Valore"]
];
break;
}
}
}
if (!empty($commessaCustomFields)) {
$updatePayload = ["CommesseCustomFields" => $commessaCustomFields];
$api->patch("CommessaWeb({$commessaId})", $updatePayload);
}
}
// 🔹 STEP 8: Update datadb with idcommessaweb, commessaweb, and status
$stmt = $pdo->prepare("
UPDATE datadb
SET idcommessaweb = :idcommessaweb, commessaweb = :commessaweb, status = 'l'
WHERE iddatadb = :iddatadb
");
$stmt->execute([
'idcommessaweb' => $commessaId,
'commessaweb' => $commessaWebCode,
'iddatadb' => $iddatadb
]);
// 🔹 STEP 9: Send CommessaWeb to laboratory
$sendResult = $api->post("CommessaWeb({$commessaId})/InviaCommessa", []);
// 🔹 STEP 10: Prepare final response
$finalCommessa = [
"Cliente" => $clienteId,
"SchemaCustomField" => $schemaId,
"Richiedente" => $commessaWeb["Richiedente"] ?? "Web Import",
"Descrizione" => $commessaWeb["Descrizione"] ?? "",
"CommesseCustomFields" => $fieldValues,
"Campioni" => $campioni,
"Inviata" => 1
];
echo json_encode([ echo json_encode([
'success' => false, "success" => true,
'mode' => $simulate ? 'simulated' : 'real', "commessaWeb" => $finalCommessa,
'message' => 'Errore: ' . $e->getMessage() "commessaWebApiResponse" => $commessaWeb, // Incluso per debug
"totalCampioni" => count($campioni),
"totalCustomFields" => count($fieldValues),
"message" => "Export successful"
]);
} catch (Exception $e) {
error_log("LIMS Export Error: " . $e->getMessage() . "\nTrace: " . $e->getTraceAsString());
echo json_encode([
"success" => false,
"message" => "Export failed: " . $e->getMessage()
]); ]);
} }
+32 -1
View File
@@ -569,7 +569,11 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
<?php foreach ($importedData as $index => $row): ?> <?php foreach ($importedData as $index => $row): ?>
<div class="grid-row" data-id="<?= $row['iddatadb'] ?>"> <div class="grid-row" data-id="<?= $row['iddatadb'] ?>">
<div class="grid-cell button-cell" style="flex: 0 0 210px; position: relative;"> <div class="grid-cell button-cell" style="flex: 0 0 210px; position: relative;">
<button type="button" class="export-lims-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Export to LIMS" style="background: #eb0b0bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-upload"></i></button> <!-- commented only for admin roles -->
<?php if ((Auth::user()->hasRole('Admin'))) : ?>
<button type="button" class="export-lims-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Export to LIMS" style="background: #eb0b0bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-upload"></i></button>
<?php endif; ?>
<button type="button" class="save-btn action-btn" data-row="<?= $index ?>" title="Save" style="background: #28a745; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-save"></i></button> <button type="button" class="save-btn action-btn" data-row="<?= $index ?>" title="Save" style="background: #28a745; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-save"></i></button>
<button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Photos" style="background: #007bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-camera"></i></button> <button type="button" class="photos-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Photos" style="background: #007bff; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-camera"></i></button>
<button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Parts" style="background: #ffc107; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-puzzle-piece"></i></button> <button type="button" class="parts-btn action-btn" data-row="<?= $index ?>" data-iddatadb="<?= $row['iddatadb'] ?>" title="Parts" style="background: #ffc107; color: white; border: none; border-radius: 5px; cursor: pointer;"><i class="fas fa-puzzle-piece"></i></button>
@@ -720,6 +724,33 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
<script src="tracking.js"></script> <script src="tracking.js"></script>
<script src="export_to_lims.js"></script> <script src="export_to_lims.js"></script>
<script> <script>
$(document).on("click", ".export-lims-btn", function() {
let rowId = $(this).data("row");
let idDataDb = $(this).data("iddatadb");
$.ajax({
url: "export_to_lims.php",
method: "POST",
data: {
iddatadb: idDataDb
},
dataType: "json",
beforeSend: function() {
alert("Export started in background for row " + rowId);
},
success: function(response) {
if (response.success) {
alert(response.message);
} else {
alert("❌ Error: " + response.message);
}
},
error: function(xhr, status, error) {
alert("❌ AJAX error: " + error);
}
});
});
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
console.log("Page loaded, initializing event listeners"); console.log("Page loaded, initializing event listeners");
+47 -38
View File
@@ -17,23 +17,27 @@ if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['template_id']) || !i
header("Location: xlstemplates_grid.php?status=error&message=" . urlencode("Richiesta non valida")); header("Location: xlstemplates_grid.php?status=error&message=" . urlencode("Richiesta non valida"));
exit; exit;
} }
$template_id = intval($_POST['template_id']); $template_id = intval($_POST['template_id']);
$selected_rows = $_POST['selected_rows']; $selected_rows = array_map('intval', $_POST['selected_rows']);
$columns = json_decode($_POST['columns'], true); // Header dell'XLS $columns = json_decode($_POST['columns'], true);
$rows = json_decode($_POST['rows'], true); // Dati dell'XLS $rows = json_decode($_POST['rows'], true);
$excelrows = json_decode($_POST['excelrows'], true);
$newFilename = htmlspecialchars($_POST['filename']); $newFilename = htmlspecialchars($_POST['filename']);
$_SESSION['template_id'] = $template_id; $_SESSION['template_id'] = $template_id;
$_SESSION['selected_rows'] = $selected_rows; $_SESSION['selected_rows'] = $selected_rows;
$_SESSION['columns'] = $columns; $_SESSION['columns'] = $columns;
$_SESSION['rows'] = $rows; $_SESSION['rows'] = $rows;
$_SESSION['excelrows'] = $excelrows;
$_SESSION['filename'] = $newFilename; $_SESSION['filename'] = $newFilename;
error_log("Received Data - Template ID: $template_id, Selected Rows: " . json_encode($selected_rows)); error_log("Received Data - Template ID: $template_id, Selected Rows: " . json_encode($selected_rows));
error_log("Columns: " . json_encode($columns)); error_log("Columns: " . json_encode($columns));
error_log("Rows: " . json_encode($rows)); error_log("Rows: " . json_encode($rows));
error_log("Excelrows: " . json_encode($excelrows));
$user_id = $iduserlogin ?? 1; // Default a 1 se non definito $user_id = $iduserlogin ?? 1;
$db = DBHandlerSelect::getInstance(); $db = DBHandlerSelect::getInstance();
$pdo = $db->getConnection(); $pdo = $db->getConnection();
@@ -60,30 +64,38 @@ foreach ($allMappings as $mapping) {
} }
} }
// Inserisci le righe selezionate in datadb (solo campi generici con templateid) // Inserisci le righe selezionate in datadb
$insertedIds = []; $insertedIds = [];
foreach ($selected_rows as $rowIndex) { foreach ($selected_rows as $rowIndex) {
$row = $rows[$rowIndex]; $row = $rows[$rowIndex] ?? null;
$excelrow = $excelrows[$rowIndex] ?? null;
if ($row === null || $excelrow === null) {
error_log("Errore: riga o excelrow mancante per rowIndex $rowIndex");
continue;
}
$values = [ $values = [
$template_id, // templateid $template_id,
$importReferenceCode, // importreferencecode $importReferenceCode,
$newFilename, // filename_import $newFilename,
'i', // status 'i',
$user_id, // user_id $user_id,
null, // limscode null,
date('Y-m-d') // importdate date('Y-m-d'),
$excelrow // Aggiunto excelrow per la colonna excelrow
]; ];
$sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate) VALUES (?, ?, ?, ?, ?, ?, ?)"; $sql = "INSERT INTO datadb (templateid, importreferencecode, filename_import, status, user_id, limscode, importdate, excelrow) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
$stmt = $pdo->prepare($sql); $stmt = $pdo->prepare($sql);
$stmt->execute($values); $stmt->execute($values);
$iddatadb = $pdo->lastInsertId(); $iddatadb = $pdo->lastInsertId();
$insertedIds[] = $iddatadb; $insertedIds[] = $iddatadb;
// Inserisci tutti i campi (automatici e manuali) in import_data_details // Inserisci tutti i campi in import_data_details
foreach ($allMappings as $mapping) { foreach ($allMappings as $mapping) {
$fieldValue = null; $fieldValue = null;
if (!$mapping['is_manual']) { // Campi automatici dall'XLS if (!$mapping['is_manual']) {
$excelColumn = trim($mapping['excel_column']); $excelColumn = trim($mapping['excel_column']);
$excelColumnIndex = array_search($excelColumn, array_map('trim', $columns)); $excelColumnIndex = array_search($excelColumn, array_map('trim', $columns));
if ($excelColumnIndex !== false && isset($row[$excelColumnIndex]) && $row[$excelColumnIndex] !== '') { if ($excelColumnIndex !== false && isset($row[$excelColumnIndex]) && $row[$excelColumnIndex] !== '') {
@@ -109,7 +121,7 @@ foreach ($selected_rows as $rowIndex) {
$fieldValue = !empty($fieldValue) ? htmlspecialchars((string)$fieldValue) : ($mapping['manual_default'] ?? ''); $fieldValue = !empty($fieldValue) ? htmlspecialchars((string)$fieldValue) : ($mapping['manual_default'] ?? '');
break; break;
} }
} else { // Campi manuali } else {
$fieldValue = $mapping['manual_default'] ?? ''; $fieldValue = $mapping['manual_default'] ?? '';
if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today') { if ($mapping['data_type'] === 'DATE' && $mapping['manual_default'] === 'today') {
$fieldValue = date('Y-m-d'); $fieldValue = date('Y-m-d');
@@ -129,29 +141,26 @@ $_SESSION['inserted_ids'] = $insertedIds;
$params = [ $params = [
'template_id' => $template_id, 'template_id' => $template_id,
'filename' => $newFilename, 'filename' => $newFilename,
]; ];
?> ?>
<form id="redirectForm" action="import_edit2.php" method="post"> <form id="redirectForm" action="import_edit2.php" method="post">
<input type="hidden" name="template_id" value="<?= htmlspecialchars($template_id) ?>"> <input type="hidden" name="template_id" value="<?= htmlspecialchars($template_id) ?>">
<input type="hidden" name="filename" value="<?= htmlspecialchars($newFilename) ?>"> <input type="hidden" name="filename" value="<?= htmlspecialchars($newFilename) ?>">
<?php foreach ($selected_rows as $row): ?>
<?php foreach ($selected_rows as $row): ?> <input type="hidden" name="selected_rows[]" value="<?= htmlspecialchars($row) ?>">
<input type="hidden" name="selected_rows[]" value="<?= htmlspecialchars($row) ?>"> <?php endforeach; ?>
<?php endforeach; ?> <?php foreach ($insertedIds as $id): ?>
<input type="hidden" name="inserted_ids[]" value="<?= htmlspecialchars($id) ?>">
<?php foreach ($insertedIds as $id): ?> <?php endforeach; ?>
<input type="hidden" name="inserted_ids[]" value="<?= htmlspecialchars($id) ?>"> <input type="hidden" name="columns" value='<?= json_encode($columns) ?>'>
<?php endforeach; ?> <input type="hidden" name="rows" value='<?= json_encode($rows) ?>'>
<input type="hidden" name="excelrows" value='<?= json_encode($excelrows) ?>'>
<input type="hidden" name="columns" value='<?= json_encode($columns) ?>'> </form>
<input type="hidden" name="rows" value='<?= json_encode($rows) ?>'> <script>
</form> document.getElementById('redirectForm').submit();
<script> </script>
document.getElementById('redirectForm').submit();
</script>
<?php <?php
exit; exit;
?>
+206 -127
View File
@@ -21,6 +21,11 @@ if (!$template) {
exit; exit;
} }
// Verifica i mapping
$stmt = $pdo->prepare("SELECT id FROM template_mapping WHERE template_id = ?");
$stmt->execute([$id]);
$hasMappings = $stmt->fetch(PDO::FETCH_ASSOC);
// Debug del template // Debug del template
error_log("Loaded template: " . print_r($template, true)); error_log("Loaded template: " . print_r($template, true));
?> ?>
@@ -33,6 +38,7 @@ error_log("Loaded template: " . print_r($template, true));
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" /> <link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
<?php include('cssinclude.php'); ?> <?php include('cssinclude.php'); ?>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<style> <style>
.table-container { .table-container {
overflow-x: auto; overflow-x: auto;
@@ -140,43 +146,55 @@ error_log("Loaded template: " . print_r($template, true));
</div> </div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<!-- Form per caricare il file --> <?php if (!$hasMappings): ?>
<div class="alert alert-warning" role="alert">
Nessun mapping trovato per questo template. Configura i mapping prima di procedere.
</div>
<?php endif; ?>
<form id="uploadForm" enctype="multipart/form-data" class="mb-4"> <form id="uploadForm" enctype="multipart/form-data" class="mb-4">
<div class="mb-3"> <div class="mb-3">
<label for="excel_file" class="form-label">Upload XLS File</label> <label for="excel_file" class="form-label">Upload XLS File</label>
<input type="file" class="form-control" id="excel_file" name="excel_file" accept=".xls,.xlsx" required> <input type="file" class="form-control" id="excel_file" name="excel_file" accept=".xls,.xlsx" required>
</div> </div>
<button type="submit" class="btn btn-primary">Upload</button> <button type="submit" class="btn btn-primary" <?= !$hasMappings ? 'disabled' : '' ?>>Upload</button>
<div class="loader" id="loader"></div> <div class="loader" id="loader"></div>
</form> </form>
<!-- Contenitore per messaggi di errore -->
<div id="errorContainer" class="alert alert-danger mt-3" style="display: none;"></div> <div id="errorContainer" class="alert alert-danger mt-3" style="display: none;"></div>
<!-- Contenitore per la tabella -->
<div id="tableContainer"></div> <div id="tableContainer"></div>
<div class="modal fade" id="routineConfirmModal" tabindex="-1" aria-labelledby="routineConfirmModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="routineConfirmModalLabel">Conferma Applicazione Routine</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<p><strong>Routine:</strong> <span id="routineName"></span></p>
<p><strong>Descrizione:</strong> <span id="routineDescription"></span></p>
<p>Vuoi applicare questa routine al file caricato?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="cancelRoutineBtn">Annulla</button>
<button type="button" class="btn btn-primary" id="confirmRoutineBtn">Applica</button>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--end page wrapper -->
<div class="overlay toggle-icon"></div> <div class="overlay toggle-icon"></div>
<a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a> <a href="javaScript:;" class="back-to-top"><i class='bx bxs-up-arrow-alt'></i></a>
<?php include('include/footer.php'); ?> <?php include('include/footer.php'); ?>
</div> </div>
<!--end wrapper-->
<!-- search modal --> <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
<?php //include('include/searchmodal.php'); <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.min.js"></script>
?>
<!-- end search modal -->
<!--start switcher-->
<?php //include('include/themeswitcher.php');
?>
<!--end switcher-->
<?php include('jsinclude.php'); ?> <?php include('jsinclude.php'); ?>
<script> <script>
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
@@ -184,6 +202,12 @@ error_log("Loaded template: " . print_r($template, true));
const loader = document.getElementById('loader'); const loader = document.getElementById('loader');
const errorContainer = document.getElementById('errorContainer'); const errorContainer = document.getElementById('errorContainer');
const tableContainer = document.getElementById('tableContainer'); const tableContainer = document.getElementById('tableContainer');
const routineModal = new bootstrap.Modal(document.getElementById('routineConfirmModal'));
const confirmRoutineBtn = document.getElementById('confirmRoutineBtn');
const cancelRoutineBtn = document.getElementById('cancelRoutineBtn');
let routineData = null;
let excelData = null;
let responseData = null;
form.addEventListener('submit', function(e) { form.addEventListener('submit', function(e) {
e.preventDefault(); e.preventDefault();
@@ -202,131 +226,186 @@ error_log("Loaded template: " . print_r($template, true));
method: 'POST', method: 'POST',
body: formData body: formData
}) })
.then(response => response.json()) .then(response => {
console.log('Stato risposta:', response.status);
return response.json();
})
.then(data => { .then(data => {
console.log('Risposta JSON:', data);
loader.style.display = 'none'; loader.style.display = 'none';
if (data.error) { if (data.error) {
errorContainer.textContent = data.error; errorContainer.textContent = data.error;
errorContainer.style.display = 'block'; errorContainer.style.display = 'block';
} else if (data.apply_routine) {
console.log('Routine rilevata:', data.routine_data);
routineData = data.routine_data;
excelData = data.excel_data;
responseData = data;
document.getElementById('routineName').textContent = routineData.name || 'Sconosciuta';
document.getElementById('routineDescription').textContent = routineData.instruction || 'Nessuna descrizione';
routineModal.show();
} else { } else {
let html = ` console.log('Nessuna routine, procedo con tabella');
<form id="selectRowsForm" action="import_insert.php" method="POST"> showTable(data);
<input type="hidden" name="template_id" value="${data.template_id}">
<input type="hidden" name="columns" value='${JSON.stringify(data.columns)}'>
<input type="hidden" name="rows" value='${JSON.stringify(data.rows)}'>
<input type="hidden" name="filename" value="${data.filename}">
<div class="search-container">
<input type="text" id="searchInput" class="form-control" placeholder="Cerca nelle righe...">
</div>
<div class="table-container">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th><input type="checkbox" id="selectAll"> Seleziona</th>
${data.columns.map(col => `<th>${col || 'Colonna senza nome'}<div class="resize-handle"></div></th>`).join('')}
</tr>
</thead>
<tbody>
${data.rows.map((row, index) => `
<tr>
<td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}"></td>
${row.map(cell => `<td>${cell}</td>`).join('')}
</tr>
`).join('')}
</tbody>
</table>
</div>
<button type="submit" class="btn btn-primary mt-3" id="proceedButton" disabled>Prosegui</button>
</form>
`;
tableContainer.innerHTML = html;
// Inizializza le variabili dopo aver inserito la tabella
const proceedButton = document.getElementById('proceedButton');
const selectAllCheckbox = document.getElementById('selectAll');
const checkboxes = document.querySelectorAll('.row-checkbox');
// Funzione per aggiornare lo stato del pulsante Prosegui
function updateProceedButton() {
proceedButton.disabled = !Array.from(checkboxes).some(cb => cb.checked);
}
// Event listener per il checkbox "Seleziona tutto"
selectAllCheckbox.addEventListener('change', function() {
checkboxes.forEach(checkbox => {
checkbox.checked = this.checked;
});
updateProceedButton();
});
// Event listener per i checkbox delle righe
checkboxes.forEach(checkbox => {
checkbox.addEventListener('change', function() {
console.log('Checkbox changed, checked: ', this.checked); // Debug
// Aggiorna lo stato del checkbox "Seleziona tutto"
selectAllCheckbox.checked = Array.from(checkboxes).every(cb => cb.checked);
updateProceedButton();
});
});
// Aggiungi logica per il ridimensionamento delle colonne
const thElements = document.querySelectorAll('.table th');
thElements.forEach((th, index) => {
if (index === 0) return;
const resizeHandle = th.querySelector('.resize-handle');
if (resizeHandle) {
resizeHandle.addEventListener('mousedown', (e) => {
e.preventDefault();
const startX = e.clientX;
const startWidth = th.offsetWidth;
const onMouseMove = (e) => {
const newWidth = Math.max(50, startWidth + (e.clientX - startX));
th.style.width = `${newWidth}px`;
th.style.minWidth = `${newWidth}px`;
th.style.maxWidth = `${newWidth}px`;
const cells = document.querySelectorAll(`.table td:nth-child(${index + 1})`);
cells.forEach(cell => {
cell.style.width = `${newWidth}px`;
cell.style.minWidth = `${newWidth}px`;
cell.style.maxWidth = `${newWidth}px`;
});
};
const onMouseUp = () => {
document.removeEventListener('mousemove', onMouseMove);
document.removeEventListener('mouseup', onMouseUp);
};
document.addEventListener('mousemove', onMouseMove);
document.addEventListener('mouseup', onMouseUp);
});
}
});
// Aggiungi event listener per la ricerca
const searchInput = document.getElementById('searchInput');
const rows = document.querySelectorAll('.table tbody tr');
searchInput.addEventListener('input', function() {
const searchTerm = this.value.toLowerCase();
rows.forEach(row => {
const text = Array.from(row.cells).slice(1).map(cell => cell.textContent.toLowerCase()).join(' ');
row.style.display = text.includes(searchTerm) ? '' : 'none';
});
});
// Abilita il pulsante se ci sono checkbox selezionate all'inizio
updateProceedButton();
} }
}) })
.catch(error => { .catch(error => {
console.log('Errore fetch:', error);
loader.style.display = 'none'; loader.style.display = 'none';
errorContainer.textContent = 'Errore durante il caricamento del file: ' + error.message; errorContainer.textContent = 'Errore durante il caricamento del file: ' + error.message;
errorContainer.style.display = 'block'; errorContainer.style.display = 'block';
}); });
}); });
confirmRoutineBtn.addEventListener('click', function() {
console.log('Conferma routine:', routineData);
routineModal.hide();
fetch('apply_routine.php', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
template_id: <?= $id ?>,
filename: routineData.filename,
headerrow: routineData.headerrow,
excel_data: excelData,
routine_data: routineData
})
})
.then(response => {
console.log('Stato apply_routine:', response.status);
return response.json();
})
.then(data => {
console.log('Risposta apply_routine:', data);
if (data.error) {
errorContainer.textContent = data.error;
errorContainer.style.display = 'block';
} else {
showTable(data);
}
})
.catch(error => {
console.log('Errore apply_routine:', error);
errorContainer.textContent = 'Errore durante l\'applicazione della routine: ' + error.message;
errorContainer.style.display = 'block';
});
});
cancelRoutineBtn.addEventListener('click', function() {
console.log('Routine annullata, procedo con tabella');
routineModal.hide();
showTable(responseData);
});
function showTable(data) {
console.log('Mostro tabella con dati:', data);
let html = `
<form id="selectRowsForm" action="import_insert.php" method="POST">
<input type="hidden" name="template_id" value="${data.template_id}">
<input type="hidden" name="columns" value='${JSON.stringify(data.columns)}'>
<input type="hidden" name="rows" value='${JSON.stringify(data.rows)}'>
<input type="hidden" name="excelrows" value='${JSON.stringify(data.excel_data.map(row => row.excelrow))}'>
<input type="hidden" name="filename" value="${data.filename}">
<div class="search-container">
<input type="text" id="searchInput" class="form-control" placeholder="Cerca nelle righe...">
</div>
<div class="table-container">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th><input type="checkbox" id="selectAll"> Seleziona</th>
${data.columns.map(col => `<th>${col || 'Colonna senza nome'}<div class="resize-handle"></div></th>`).join('')}
</tr>
</thead>
<tbody>
${data.excel_data.map((row, index) => `
<tr>
<td><input type="checkbox" class="row-checkbox" name="selected_rows[]" value="${index}" data-excelrow="${row.excelrow}"></td>
${row.data.map(cell => `<td>${cell}</td>`).join('')}
</tr>
`).join('')}
</tbody>
</table>
</div>
<button type="submit" class="btn btn-primary mt-3" id="proceedButton" disabled>Prosegui</button>
</form>
`;
tableContainer.innerHTML = html;
const proceedButton = document.getElementById('proceedButton');
const selectAllCheckbox = document.getElementById('selectAll');
const checkboxes = document.querySelectorAll('.row-checkbox');
function updateProceedButton() {
proceedButton.disabled = !Array.from(checkboxes).some(cb => cb.checked);
}
selectAllCheckbox.addEventListener('change', function() {
checkboxes.forEach(checkbox => {
checkbox.checked = this.checked;
});
updateProceedButton();
});
checkboxes.forEach(checkbox => {
checkbox.addEventListener('change', function() {
console.log('Checkbox changed, checked:', this.checked, 'excelrow:', this.dataset.excelrow);
selectAllCheckbox.checked = Array.from(checkboxes).every(cb => cb.checked);
updateProceedButton();
});
});
const thElements = document.querySelectorAll('.table th');
thElements.forEach((th, index) => {
if (index === 0) return;
const resizeHandle = th.querySelector('.resize-handle');
if (resizeHandle) {
resizeHandle.addEventListener('mousedown', (e) => {
e.preventDefault();
const startX = e.clientX;
const startWidth = th.offsetWidth;
const onMouseMove = (e) => {
const newWidth = Math.max(50, startWidth + (e.clientX - startX));
th.style.width = `${newWidth}px`;
th.style.minWidth = `${newWidth}px`;
th.style.maxWidth = `${newWidth}px`;
const cells = document.querySelectorAll(`.table td:nth-child(${index + 1})`);
cells.forEach(cell => {
cell.style.width = `${newWidth}px`;
cell.style.minWidth = `${newWidth}px`;
cell.style.maxWidth = `${newWidth}px`;
});
};
const onMouseUp = () => {
document.removeEventListener('mousemove', onMouseMove);
document.removeEventListener('mouseup', onMouseUp);
};
document.addEventListener('mousemove', onMouseMove);
document.addEventListener('mouseup', onMouseUp);
});
}
});
const searchInput = document.getElementById('searchInput');
const rows = document.querySelectorAll('.table tbody tr');
searchInput.addEventListener('input', function() {
const searchTerm = this.value.toLowerCase();
rows.forEach(row => {
const text = Array.from(row.cells).slice(1).map(cell => cell.textContent.toLowerCase()).join(' ');
row.style.display = text.includes(searchTerm) ? '' : 'none';
});
});
updateProceedButton();
}
}); });
</script> </script>
</body> </body>
+38 -10
View File
@@ -1,7 +1,7 @@
<?php <?php
// Sopprime eventuali output di errori (li logghiamo invece di mostrarli) // Sopprime eventuali output di errori (li logghiamo invece di mostrarli)
ob_start(); ob_start();
ini_set('display_errors', 0); // Disattiva l'output degli errori a schermo ini_set('display_errors', 0);
error_reporting(E_ALL); error_reporting(E_ALL);
// Inizia la sessione // Inizia la sessione
@@ -9,9 +9,9 @@ session_start();
// Includi PHPSpreadsheet e la classe DBHandler // Includi PHPSpreadsheet e la classe DBHandler
require_once '../../vendor/autoload.php'; require_once '../../vendor/autoload.php';
require_once __DIR__ . '/class/db-functions.php'; // Assumo che DBHandlerSelect sia qui require_once __DIR__ . '/class/db-functions.php';
$response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '']; $response = ['error' => '', 'rows' => [], 'columns' => [], 'template_id' => 0, 'filename' => '', 'apply_routine' => false];
try { try {
if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_FILES['excel_file'])) { if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_FILES['excel_file'])) {
@@ -29,7 +29,7 @@ try {
if ($fileError === UPLOAD_ERR_OK) { if ($fileError === UPLOAD_ERR_OK) {
// Recupera l'ID dell'utente loggato // Recupera l'ID dell'utente loggato
if (!isset($iduserlogin)) { if (!isset($iduserlogin)) {
$iduserlogin = 1; // Valore di default $iduserlogin = 1;
error_log("Warning: iduserlogin non definito, usando 1 come default"); error_log("Warning: iduserlogin non definito, usando 1 come default");
} }
@@ -69,7 +69,7 @@ try {
$worksheet = $spreadsheet->getActiveSheet(); $worksheet = $spreadsheet->getActiveSheet();
$highestRow = $worksheet->getHighestRow(); $highestRow = $worksheet->getHighestRow();
$highestColumn = $worksheet->getHighestColumn(); $highestColumn = $worksheet->getHighestColumn();
$highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn); // Corretto $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
$startRow = max(1, $header_row); $startRow = max(1, $header_row);
$startColumn = max(1, $start_column); $startColumn = max(1, $start_column);
@@ -93,7 +93,7 @@ try {
$headerRowData[] = htmlspecialchars($cellValue ?: ''); $headerRowData[] = htmlspecialchars($cellValue ?: '');
} }
// Estrai i dati a partire dalla riga successiva // Estrai i dati a partire dalla riga successiva, includendo excelrow
for ($row = $startRow + 1; $row <= $highestRow; $row++) { for ($row = $startRow + 1; $row <= $highestRow; $row++) {
$rowData = []; $rowData = [];
for ($col = $startColumn; $col <= $highestColumnIndex; $col++) { for ($col = $startColumn; $col <= $highestColumnIndex; $col++) {
@@ -103,18 +103,46 @@ try {
$rowData[] = htmlspecialchars($cellValue ?: ''); $rowData[] = htmlspecialchars($cellValue ?: '');
} }
if (!empty(array_filter($rowData))) { if (!empty(array_filter($rowData))) {
$excelData[] = $rowData; $excelData[] = ['data' => $rowData, 'excelrow' => $row];
} }
} }
// Recupera routine dal template
$stmt = $pdo->prepare("SELECT idroutine FROM excel_templates WHERE id = ?");
$stmt->execute([$template_id]);
$template = $stmt->fetch(PDO::FETCH_ASSOC);
if ($template && $template['idroutine']) {
$stmtRoutine = $pdo->prepare("SELECT idroutine, name, filename, headerrow, instruction FROM routine WHERE idroutine = ?");
$stmtRoutine->execute([$template['idroutine']]);
$routineData = $stmtRoutine->fetch(PDO::FETCH_ASSOC);
if ($routineData) {
$response['apply_routine'] = true;
$response['routine_data'] = [
'name' => $routineData['name'] ?? 'Routine Sconosciuta',
'instruction' => $routineData['instruction'] ?? 'Nessuna descrizione disponibile',
'filename' => $routineData['filename'] ?? '',
'headerrow' => $routineData['headerrow'] ?? $header_row
];
error_log("Routine rilevata per template {$template_id}: " . print_r($routineData, true));
} else {
error_log("Errore: Nessuna routine trovata per idroutine {$template['idroutine']}");
}
} else {
error_log("Nessuna routine associata al template {$template_id}");
}
// Salva i dati in sessione // Salva i dati in sessione
$_SESSION['excel_data'] = $excelData; $_SESSION['excel_data'] = $excelData;
$_SESSION['template_id'] = $template_id; $_SESSION['template_id'] = $template_id;
$_SESSION['headers'] = $headerRowData; $_SESSION['headers'] = $headerRowData;
$_SESSION['mappings'] = $mappings; // Salva i mapping per l'importazione $_SESSION['mappings'] = $mappings;
$response['rows'] = $excelData; // Includi excel_data nella risposta JSON in ogni caso
$response['columns'] = $headerRowData; // Usa gli header reali $response['excel_data'] = $excelData;
$response['rows'] = array_column($excelData, 'data');
$response['columns'] = $headerRowData;
$response['template_id'] = $template_id; $response['template_id'] = $template_id;
$response['filename'] = $newFilename; $response['filename'] = $newFilename;
} }
+108
View File
@@ -0,0 +1,108 @@
<?php
ini_set('log_errors', 1);
ini_set('error_log', __DIR__ . '/routine_debug.log');
function applyRoutine(&$excelData, $routineData)
{
try {
// Log iniziale
error_log("Inizio esecuzione routine Moncler: " . date('Y-m-d H:i:s'));
error_log("Dati routine: " . print_r($routineData, true));
error_log("Dati excel_data: " . print_r($excelData, true));
// Verifica se excelData è vuoto
if (empty($excelData)) {
throw new Exception("excelData è vuoto o non valido.");
}
// Estrai informazioni dalla routine con valori predefiniti
$action1 = trim($routineData['action1'] ?? 'K');
$action2 = trim($routineData['action2'] ?? 'STYLE CODE + STYLE DESCRIPTION');
$action3 = trim($routineData['action3'] ?? 'STYLE CODE');
$action4 = trim($routineData['action4'] ?? 'STYLE DESCRIPTION');
$headers = $routineData['xls_headers'] ?? [];
if (empty($headers)) {
throw new Exception("Nessun header trovato per la routine Moncler.");
}
error_log("Header ricevuti: " . print_r($headers, true));
// Normalizza gli header (solo trim)
$normalized_headers = array_map('trim', $headers);
error_log("Header normalizzati: " . print_r($normalized_headers, true));
error_log("Action values - action1: '$action1', action2: '$action2', action3: '$action3', action4: '$action4'");
// Trova gli indici delle colonne
$action1_index = array_search($action1, $normalized_headers);
$action2_index = array_search($action2, $normalized_headers);
$action3_index = array_search($action3, $normalized_headers);
$action4_index = array_search($action4, $normalized_headers);
if ($action1_index === false || $action2_index === false || $action3_index === false || $action4_index === false) {
throw new Exception("Colonne non trovate - action1: '$action1' (index: " . var_export($action1_index, true) . "), action2: '$action2' (index: " . var_export($action2_index, true) . "), action3: '$action3' (index: " . var_export($action3_index, true) . "), action4: '$action4' (index: " . var_export($action4_index, true) . ")");
}
error_log("Indici colonne - action1: $action1_index, action2: $action2_index, action3: $action3_index, action4: $action4_index");
// Raggruppa le righe per il valore in action1 (colonna K)
$grouped_data = [];
foreach ($excelData as $row) {
if (!isset($row['data']) || !is_array($row['data'])) {
error_log("Riga non valida, manca 'data' per excelrow {$row['excelrow']}");
continue;
}
$key = $row['data'][$action1_index] ?? '';
$key = empty($key) ? '_empty_' : $key;
if (!isset($grouped_data[$key])) {
$grouped_data[$key] = [
'data' => $row['data'],
'excelrow' => [$row['excelrow']],
'style_codes' => [],
'style_descriptions' => []
];
} else {
$grouped_data[$key]['excelrow'][] = $row['excelrow'];
}
// Separa il valore in action2 (STYLE CODE + STYLE DESCRIPTION)
$action2_value = $row['data'][$action2_index] ?? '';
if (!empty($action2_value)) {
$parts = explode(' - ', trim($action2_value));
$style_code = $parts[0] ?? '';
$style_description = $parts[1] ?? '';
if (!empty($style_code)) {
$grouped_data[$key]['style_codes'][] = $style_code;
}
if (!empty($style_description)) {
$grouped_data[$key]['style_descriptions'][] = $style_description;
}
} else {
error_log("Valore vuoto in action2 per excelrow {$row['excelrow']}");
}
}
// Crea il nuovo array excel_data aggregato
$new_excel_data = [];
foreach ($grouped_data as $key => $group) {
$row_data = $group['data'];
// Aggiorna action3 (STYLE CODE) e action4 (STYLE DESCRIPTION) con valori aggregati
$row_data[$action3_index] = implode(' - ', array_unique($group['style_codes']));
$row_data[$action4_index] = implode(' - ', array_unique($group['style_descriptions']));
// Concatena gli excelrow con '+' per le righe aggregate
$excelrow_value = count($group['excelrow']) > 1 ? implode('+', $group['excelrow']) : $group['excelrow'][0];
$new_excel_data[] = [
'data' => $row_data,
'excelrow' => $excelrow_value
];
}
// Modifica excelData in-place
$excelData = $new_excel_data;
error_log("Routine Moncler completata - Righe aggregate: " . count($new_excel_data));
error_log("Excelrow aggregati: " . print_r(array_column($new_excel_data, 'excelrow'), true));
} catch (Exception $e) {
error_log("Eccezione nella routine Moncler: " . $e->getMessage());
throw $e;
}
}