Update: 2026-06-16 01:17:28
This commit is contained in:
@@ -18,38 +18,40 @@ if (isset($_POST['start_date']) && isset($_POST['end_date'])) {
|
||||
$end_date = date('Y-m-t', strtotime($start_date));
|
||||
}
|
||||
|
||||
// 2. جملة SQL المعدلة
|
||||
$end_date_full = $end_date . ' 23:59:59';
|
||||
|
||||
$sql = "
|
||||
WITH RECURSIVE date_series AS (
|
||||
SELECT '$start_date' AS date
|
||||
SELECT :start_date AS date
|
||||
UNION ALL
|
||||
SELECT DATE_ADD(date, INTERVAL 1 DAY)
|
||||
FROM date_series
|
||||
WHERE date < '$end_date'
|
||||
WHERE date < :end_date
|
||||
)
|
||||
SELECT
|
||||
date_series.date AS day,
|
||||
|
||||
-- (passengers) عدد الركاب اليومي
|
||||
COALESCE((SELECT COUNT(id) FROM passengers WHERE DATE(passengers.created_at) = date_series.date), 0) AS totalPassengers,
|
||||
|
||||
-- (passengers) الإجمالي للفترة المحددة
|
||||
(
|
||||
SELECT COUNT(*)
|
||||
FROM passengers
|
||||
WHERE passengers.created_at BETWEEN '$start_date' AND '$end_date 23:59:59'
|
||||
WHERE passengers.created_at BETWEEN :start_date_total AND :end_date_total
|
||||
) AS totalMonthly
|
||||
|
||||
FROM
|
||||
date_series
|
||||
GROUP BY date_series.date
|
||||
ORDER BY date_series.date ASC;
|
||||
";
|
||||
// ملاحظة: جعلت الترتيب ASC (تصاعدي) لأن الرسم البياني يحتاج الأيام من البداية للنهاية
|
||||
ORDER BY date_series.date ASC";
|
||||
|
||||
try {
|
||||
$stmt = $con->prepare($sql);
|
||||
$stmt->execute();
|
||||
$stmt->execute([
|
||||
':start_date' => $start_date,
|
||||
':end_date' => $end_date,
|
||||
':start_date_total' => $start_date,
|
||||
':end_date_total' => $end_date_full
|
||||
]);
|
||||
$passenger_data = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
if ($passenger_data) {
|
||||
|
||||
Reference in New Issue
Block a user