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
+3 -4
View File
@@ -30,7 +30,6 @@ if ($currentDate > $currentMonthStart) {
}
$currentMonthEnd = date("Y-m-t", strtotime($currentMonthStart));
echo $currentMonthEnd;
$bookedclass->setQuery("SELECT * FROM bookingclass
LEFT JOIN service ON bookingclass.idservice = service.idservice
LEFT JOIN serviceschedule ON bookingclass.idserviceschedule = serviceschedule.idserviceschedule
@@ -85,15 +84,15 @@ $iduser = $iduserlogin; // Sostituisci con l'ID utente desiderato
// Data e ora attuali
$currentDateTime = date("Y-m-d H:i:s");
// Query per contare i record con data e ora passate e future
// Query per contare i record con data e ora passate e future, escludendo status = 'cancelled'
$query = "SELECT COUNT(*) AS total,
SUM(CASE WHEN serviceschedule.dateschedule <= '$currentDateTime' AND bookingclass.status = 'booked' AND bookingclass.lostlesson = 'N' THEN 1 ELSE 0 END) AS passed,
SUM(CASE WHEN serviceschedule.dateschedule > '$currentDateTime' AND bookingclass.status = 'booked' AND bookingclass.lostlesson = 'N' THEN 1 ELSE 0 END) AS future,
SUM(CASE WHEN bookingclass.lostlesson = 'Y' THEN 1 ELSE 0 END) AS lost,
SUM(CASE WHEN bookingclass.lostlesson = 'Y' AND bookingclass.status != 'cancelled' THEN 1 ELSE 0 END) AS lost,
SUM(CASE WHEN bookingclass.status = 'pending' THEN 1 ELSE 0 END) AS pending
FROM bookingclass
LEFT JOIN serviceschedule ON bookingclass.idserviceschedule = serviceschedule.idserviceschedule
WHERE bookingclass.iduser = $iduser";
WHERE bookingclass.iduser = $iduser AND bookingclass.status != 'cancelled'";
$result = $conn->query($query);
if ($result) {