fixed multiple things

This commit is contained in:
2025-10-15 20:59:49 +02:00
parent 754c5f93f0
commit aff67bc496
26 changed files with 3504 additions and 1246 deletions
+157 -101
View File
@@ -1,69 +1,92 @@
<?php require_once('include/headscript.php'); ?>
<?php
// optionquery
$optionquery = new WA_MySQLi_RS("optionquery", $bkngstm, 0);
$optionquery->setQuery("SELECT * FROM option");
$optionquery->execute();
?>
// Abilita visualizzazione errori PHP (solo per debug)
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
require_once('include/headscript.php');
// Inizializza log
$logFile = 'dashboard_log.txt';
$logMessage = "Esecuzione dashboard: " . date('Y-m-d H:i:s') . "\n";
<?php
// Verifica se è stato inviato un modulo
if ($_SERVER["REQUEST_METHOD"] == "POST") {
if (isset($_FILES["fileToUpload"]) && $_FILES["fileToUpload"]["error"] === UPLOAD_ERR_OK) {
$conn = new mysqli($servername, $username, $password, $dbname);
if ($conn->connect_error) {
$logMessage .= "Connessione al database fallita: " . $conn->connect_error . "\n";
file_put_contents($logFile, $logMessage, FILE_APPEND);
die("Connessione al database fallita: " . $conn->connect_error);
}
$iduserlogin = $_POST["iduserlogin"];
$iduserlogin = filter_var($_POST["iduserlogin"], FILTER_VALIDATE_INT);
$logMessage .= "ID utente ricevuto dal form: $iduserlogin\n";
$conn->close();
} else {
$logMessage .= "Errore caricamento file o iduserlogin non valido\n";
file_put_contents($logFile, $logMessage, FILE_APPEND);
}
}
?>
<?php
// Connessione al database
$conn = new mysqli($servername, $username, $password, $dbname);
if ($conn->connect_error) {
$logMessage .= "Connessione al database fallita: " . $conn->connect_error . "\n";
file_put_contents($logFile, $logMessage, FILE_APPEND);
die("Connessione al database fallita: " . $conn->connect_error);
}
$logMessage .= "Database connesso: $dbname\n";
// Query per selezionare i dati filtrati per iduser
$query = "SELECT o.*, s.servicename, s.day, s.time
$iduserlogin = $iduserlogin; // Sostituisci con $iduserlogin in produzione
$query = "SELECT o.idorderbook, o.order_id, o.idservice, o.order_date_created, o.quantityclass, o.first_lesson_date, o.expireon, s.servicename, s.day, s.time
FROM orderbook o
LEFT JOIN service s ON o.idservice = s.idservice
WHERE o.iduser = '$iduserlogin'";
$result = $conn->query($query);
WHERE o.iduser = ?";
$stmt = $conn->prepare($query);
$stmt->bind_param("i", $iduserlogin);
$stmt->execute();
$result = $stmt->get_result();
$documents = array();
while ($row = $result->fetch_assoc()) {
// Get lesson details for each order
$order_id = $row['order_id'];
echo "<!-- Debug: order_id usato: $order_id -->";
$lesson_query = "SELECT bc.bookingstart, bc.status, bc.lostlesson, bc.expirylesson, s.servicename
$idorderbook = $row['idorderbook'];
$logMessage .= "Elaborazione ordine: idorderbook = $idorderbook, order_id = {$row['order_id']}\n";
$lesson_query = "SELECT bc.idbookingclass, bc.bookingstart, bc.status, bc.lostlesson, bc.expirylesson, bc.idservice, s.servicename
FROM bookingclass bc
LEFT JOIN service s ON bc.idservice = s.idservice
WHERE bc.idorder = '$order_id'";
$lesson_result = $conn->query($lesson_query);
WHERE bc.idorder = ?";
$lesson_stmt = $conn->prepare($lesson_query);
$lesson_stmt->bind_param("i", $idorderbook);
$lesson_stmt->execute();
$lesson_result = $lesson_stmt->get_result();
$lessons = array();
echo "<!-- Debug: Query per order_id $order_id: $lesson_query -->";
$logMessage .= "Query lezioni per idorderbook $idorderbook: $lesson_query\n";
if ($lesson_result) {
echo "<!-- Debug: Numero di righe restituite: " . $lesson_result->num_rows . " -->";
$logMessage .= "Numero di lezioni trovate per idorderbook $idorderbook: " . $lesson_result->num_rows . "\n";
while ($lesson_row = $lesson_result->fetch_assoc()) {
$lesson_row['bookingstart'] = date('c', strtotime($lesson_row['bookingstart'])); // Formato ISO 8601
$lesson_row['bookingstart'] = date('c', strtotime($lesson_row['bookingstart']));
$lessons[] = $lesson_row;
echo "<!-- Debug: Lezione aggiunta: " . json_encode($lesson_row) . " -->";
$logMessage .= "Lezione aggiunta: " . json_encode($lesson_row) . "\n";
}
} else {
echo "<!-- Debug: Errore nella query per order_id $order_id: " . $conn->error . " -->";
$logMessage .= "Errore nella query per idorderbook $idorderbook: " . $conn->error . "\n";
}
$row['lessons'] = $lessons;
$documents[] = $row;
echo "<!-- Debug: Lezioni per order_id " . $row['order_id'] . ": " . count($lessons) . " -->";
$logMessage .= "Lezioni per idorderbook $idorderbook: " . count($lessons) . "\n";
$lesson_stmt->close();
}
$stmt->close();
file_put_contents($logFile, $logMessage, FILE_APPEND);
?>
<!doctype html>
<html lang="en">
<html lang="it">
<head>
<meta charset="utf-8" />
@@ -76,7 +99,7 @@ while ($row = $result->fetch_assoc()) {
<link href="assets/css/icons.min.css" rel="stylesheet" type="text/css" />
<link href="assets/css/app.min.css" id="app-style" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
@@ -89,10 +112,11 @@ while ($row = $result->fetch_assoc()) {
// Handle order click for popup
$('.order-row').click(function() {
var lessons = $(this).data('lessons');
console.log('Lezioni ricevute:', lessons); // Debug
console.log('Lezioni ricevute:', lessons);
var total = $(this).data('total');
var orderId = $(this).data('order-id');
var isExpired = $(this).data('is-expired');
var isExpired = $(this).data('is-expired') === true; // Converti in booleano
var expireOn = $(this).data('expireon');
// Calcolo delle date
var now = new Date();
@@ -111,6 +135,12 @@ while ($row = $result->fetch_assoc()) {
}).length;
var toSchedule = total - (booked + completed + lost + expired);
// Se l'ordine è scaduto, sposta le lezioni "Da Programmare" in "Scadute"
if (isExpired) {
expired += toSchedule;
toSchedule = 0;
}
console.log({
booked: booked,
completed: completed,
@@ -120,46 +150,55 @@ while ($row = $result->fetch_assoc()) {
total: total
});
var expireOnFormatted = expireOn ? new Date(expireOn).toLocaleDateString('it-IT', {
day: '2-digit',
month: '2-digit',
year: 'numeric'
}) : 'Non specificata';
var htmlContent = `
<h4 style="margin-bottom: 20px; color: #333; font-weight: 600;">
Dettagli Ordine #${orderId}
<span class="badge ${isExpired ? 'bg-danger' : 'bg-primary'}" style="margin-left: 10px; color: white;">
${isExpired ? 'Scaduto' : 'Attivo'}
</span>
</h4>
<div style="display: flex; justify-content: space-around; margin-bottom: 30px; gap: 10px;">
<div class="stat-box" style="background-color: #d1e7dd; border: 1px solid #a3cfbb;">
<h5 style="margin: 0; color: #0f5132; font-size: 14px;">Totale</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #0f5132;">${total}</p>
</div>
<div class="stat-box" style="background-color: #d4edda; border: 1px solid #b1d4b6;">
<h5 style="margin: 0; color: #155724; font-size: 14px;">Fatte</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #155724;">${completed}</p>
</div>
<div class="stat-box" style="background-color: #f8d7da; border: 1px solid #f1aeb5;">
<h5 style="margin: 0; color: #721c24; font-size: 14px;">Perse</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #721c24;">${lost}</p>
</div>
<div class="stat-box" style="background-color: #fff3cd; border: 1px solid #ffecb5;">
<h5 style="margin: 0; color: #856404; font-size: 14px;">Scadute</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #856404;">${expired}</p>
</div>
<div class="stat-box" style="background-color: #e2d3f5; border: 1px solid #c3b2d6;">
<h5 style="margin: 0; color: #4c2c92; font-size: 14px;">Da Programmare</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #4c2c92;">${toSchedule}</p>
</div>
</div>
<div style="background-color: #f8f9fa; padding: 15px; border-radius: 8px;">
<table class="lesson-table">
<thead>
<tr>
<th>Data e Ora</th>
<th>Lezione</th>
<th>Stato</th>
</tr>
</thead>
<tbody>
`;
<h4 style="margin-bottom: 20px; color: #333; font-weight: 600;">
Dettagli Ordine #${orderId}
<span class="badge ${isExpired ? 'bg-danger' : 'bg-primary'}" style="margin-left: 10px; color: white;">
${isExpired ? 'Scaduto' : 'Attivo'}
</span>
</h4>
<div style="display: flex; justify-content: space-around; margin-bottom: 30px; gap: 10px;">
<div class="stat-box" style="background-color: #d1e7dd; border: 1px solid #a3cfbb;" title="Numero di lezioni acquistate per questo ordine">
<h5 style="margin: 0; color: #0f5132; font-size: 14px;">Totale</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #0f5132;">${total}</p>
</div>
<div class="stat-box" style="background-color: #d4edda; border: 1px solid #b1d4b6;" title="Lezioni già praticate">
<h5 style="margin: 0; color: #155724; font-size: 14px;">Praticate</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #155724;">${completed}</p>
</div>
<div class="stat-box" style="background-color: #f8d7da; border: 1px solid #f1aeb5;" title="Lezioni non praticate e non riprogrammate in tempo">
<h5 style="margin: 0; color: #721c24; font-size: 14px;">Perse</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #721c24;">${lost}</p>
</div>
<div class="stat-box" style="background-color: #fff3cd; border: 1px solid #ffecb5;" title="Lezioni non riprogrammate entro la data di scadenza dell'ordine">
<h5 style="margin: 0; color: #856404; font-size: 14px;">Scadute</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #856404;">${expired}</p>
</div>
<div class="stat-box" style="background-color: #e2d3f5; border: 1px solid #c3b2d6;" title="Lezioni da programmare entro la data di scadenza del tuo ordine (${expireOnFormatted})">
<h5 style="margin: 0; color: #4c2c92; font-size: 14px;">Da Programmare</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #4c2c92;">${toSchedule}</p>
</div>
</div>
<div style="background-color: #f8f9fa; padding: 15px; border-radius: 8px;">
<p style="margin: 0 0 15px 0; color: #333; font-size: 14px; font-weight: 500;">
Il tuo ordine scadrà il ${expireOnFormatted}
</p>
<table class="lesson-table">
<thead>
<tr>
<th>Data e Ora</th>
<th>Lezione</th>
<th>Stato</th>
</tr>
</thead>
<tbody>
`;
if (lessons.length === 0) {
htmlContent += `
@@ -234,17 +273,16 @@ while ($row = $result->fetch_assoc()) {
// Handle details button click
$('.details-btn').click(function(e) {
e.stopPropagation(); // Prevent row click event
e.stopPropagation();
var row = $(this).closest('tr');
var lessons = row.data('lessons');
var total = row.data('total');
var orderId = row.data('order-id');
var isExpired = row.data('is-expired');
var isExpired = row.data('is-expired') === true;
var expireOn = row.data('expireon');
// Calcolo delle date
var now = new Date();
// Calcolo dei conteggi
var completed = lessons.filter(l => {
var lessonDate = new Date(l.bookingstart);
return (l.status === 'completed') ||
@@ -258,6 +296,18 @@ while ($row = $result->fetch_assoc()) {
}).length;
var toSchedule = total - (booked + completed + lost + expired);
// Se l'ordine è scaduto, sposta le lezioni "Da Programmare" in "Scadute"
if (isExpired) {
expired += toSchedule;
toSchedule = 0;
}
var expireOnFormatted = expireOn ? new Date(expireOn).toLocaleDateString('it-IT', {
day: '2-digit',
month: '2-digit',
year: 'numeric'
}) : 'Non specificata';
var htmlContent = `
<h4 style="margin-bottom: 20px; color: #333; font-weight: 600;">
Dettagli Ordine #${orderId}
@@ -266,27 +316,29 @@ while ($row = $result->fetch_assoc()) {
</span>
</h4>
<div style="display: flex; justify-content: space-around; margin-bottom: 30px; gap: 10px;">
<div class="stat-box" style="background-color: #d1e7dd; border: 1px solid #a3cfbb;">
<div class="stat-box" style="background-color: #d1e7dd; border: 1px solid #a3cfbb;" title="Numero di lezioni acquistate per questo ordine">
<h5 style="margin: 0; color: #0f5132; font-size: 14px;">Totale</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #0f5132;">${total}</p>
</div>
<div class="stat-box" style="background-color: #d4edda; border: 1px solid #b1d4b6;">
<h5 style="margin: 0; color: #155724; font-size: 14px;">Fatte</h5>
<div class="stat-box" style="background-color: #d4edda; border: 1px solid #b1d4b6;" title="Lezioni già praticate">
<h5 style="margin: 0; color: #155724; font-size: 14px;">Praticate</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #155724;">${completed}</p>
</div>
<div class="stat-box" style="background-color: #f8d7da; border: 1px solid #f1aeb5;">
<div class="stat-box" style="background-color: #f8d7da; border: 1px solid #f1aeb5;" title="Lezioni non praticate e non riprogrammate in tempo">
<h5 style="margin: 0; color: #721c24; font-size: 14px;">Perse</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #721c24;">${lost}</p>
</div>
<div class="stat-box" style="background-color: #fff3cd; border: 1px solid #ffecb5;">
<div class="stat-box" style="background-color: #fff3cd; border: 1px solid #ffecb5;" title="Lezioni non riprogrammate entro la data di scadenza dell'ordine">
<h5 style="margin: 0; color: #856404; font-size: 14px;">Scadute</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #856404;">${expired}</p>
</div>
<div class="stat-box" style="background-color: #e2d3f5; border: 1px solid #c3b2d6;">
<div class="stat-box" style="background-color: #e2d3f5; border: 1px solid #c3b2d6;" title="Lezioni da programmare entro la data di scadenza del tuo ordine (${expireOnFormatted})">
<h5 style="margin: 0; color: #4c2c92; font-size: 14px;">Da Programmare</h5>
<p style="font-size: 24px; font-weight: bold; margin: 5px 0; color: #4c2c92;">${toSchedule}</p>
</div>
</div>
</div> <p style="margin: 0 0 15px 0; color: #333; font-size: 14px; font-weight: 500;">
Il tuo ordine scadrà il ${expireOnFormatted}
</p>
<div style="background-color: #f8f9fa; padding: 15px; border-radius: 8px;">
<table class="lesson-table">
<thead>
@@ -369,24 +421,24 @@ while ($row = $result->fetch_assoc()) {
}
});
});
});
function confirmDelete(id, deletePageUrl) {
Swal.fire({
title: "Sei sicuro?",
text: "Questa prenotazione verrà cancellata definitivamente! Ricordati poi di riprogrammare la tua lezione!",
icon: "warning",
showCancelButton: true,
confirmButtonColor: "#d33",
cancelButtonColor: "#3085d6",
confirmButtonText: "Sì, cancella!",
cancelButtonText: "Annulla"
}).then((result) => {
if (result.isConfirmed) {
window.location.href = `deleteclass.php?id=${id}`;
}
});
}
function confirmDelete(id, deletePageUrl) {
Swal.fire({
title: "Sei sicuro?",
text: "Questa prenotazione verrà cancellata definitivamente! Ricordati poi di riprogrammare la tua lezione!",
icon: "warning",
showCancelButton: true,
confirmButtonColor: "#d33",
cancelButtonColor: "#3085d6",
confirmButtonText: "Sì, cancella!",
cancelButtonText: "Annulla"
}).then((result) => {
if (result.isConfirmed) {
window.location.href = `deleteclass.php?id=${id}`;
}
});
}
});
</script>
<style>
.custom-card {
@@ -630,13 +682,15 @@ while ($row = $result->fetch_assoc()) {
<tbody>
<?php foreach ($documents as $document) {
$is_expired = strtotime($document['expireon']) < time();
$logMessage .= "Order ID: {$document['idorderbook']}, Lessons count: " . count($document['lessons']) . "\n";
?>
<tr class="order-row"
data-lessons='<?php echo json_encode($document['lessons']); ?>'
data-total='<?php echo $document['quantityclass']; ?>'
data-order-id='<?php echo $document['order_id']; ?>'
data-is-expired='<?php echo $is_expired ? 'true' : 'false'; ?>'>
<td><?php echo $document['order_id']; ?></td>
data-order-id='<?php echo $document['idorderbook']; ?>'
data-is-expired='<?php echo $is_expired ? 'true' : 'false'; ?>'
data-expireon='<?php echo $document['expireon']; ?>'>
<td><?php echo $document['idorderbook']; ?></td>
<td><?php echo date('d-m-Y', strtotime($document['order_date_created'])); ?></td>
<td><?php echo $document['servicename']; ?></td>
<td><?php echo $document['day'] . ' ' . $document['time']; ?></td>
@@ -647,10 +701,9 @@ while ($row = $result->fetch_assoc()) {
<span class="badge <?php echo $is_expired ? 'bg-danger' : 'bg-primary'; ?>">
<?php echo $is_expired ? 'Scaduto' : 'Attivo'; ?>
</span>
<button class="details-btn" data-order-id="<?php echo $document['order_id']; ?>" data-lessons='<?php echo json_encode($document['lessons']); ?>' data-total='<?php echo $document['quantityclass']; ?>' data-is-expired='<?php echo $is_expired ? 'true' : 'false'; ?>'>Dettagli</button>
<button class="details-btn">Dettagli</button>
</td>
</tr>
<?php echo "<!-- Total per order_id " . $document['order_id'] . ": " . $document['quantityclass'] . " -->"; ?>
<?php } ?>
</tbody>
</table>
@@ -671,4 +724,7 @@ while ($row = $result->fetch_assoc()) {
</body>
</html>
<?php $conn->close(); ?>
<?php
file_put_contents($logFile, $logMessage, FILE_APPEND);
$conn->close();
?>