Update: 2026-06-16 01:17:28

backend/serviceapp/getRidesStatic.php

@@ -18,24 +18,23 @@ 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, 
-    -- حساب الرحلات المنتهية في هذا اليوم
     COALESCE(SUM(ride.status = 'Finished'), 0) AS totalRides,
     
-    -- حساب الإجمالي للفترة المحددة كاملة (وليس للشهر فقط)
     (SELECT COUNT(*) FROM ride 
-     WHERE ride.created_at >= '$start_date' 
-     AND ride.created_at <= '$end_date 23:59:59'
+     WHERE ride.created_at >= :start_date_total 
+     AND ride.created_at <= :end_date_total
      AND ride.status = 'Finished') AS totalMonthly
 
 FROM 
@@ -44,16 +43,22 @@ LEFT JOIN
     ride ON DATE(ride.created_at) = date_series.date 
     AND ride.status = 'Finished'
 WHERE 
-    date_series.date >= '$start_date' 
-    AND date_series.date <= '$end_date'
+    date_series.date >= :start_date_where 
+    AND date_series.date <= :end_date_where
 GROUP BY 
     date_series.date
 ORDER BY 
-    date_series.date ASC;
-";
+    date_series.date ASC";
 
 $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,
+    ':start_date_where' => $start_date,
+    ':end_date_where' => $end_date
+]);
 $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
 if ($data) {