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

backend/serviceapp/getdriverstotalMonthly.php

@@ -18,36 +18,33 @@ 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,
     
-    -- [1] إجمالي السائقين (الكلي في النظام)
     (SELECT COUNT(*) FROM driver) AS totalDrivers,
 
-    -- [2] يومي: عدد السائقين المسجلين
     (
         SELECT COUNT(*)
         FROM driver
         WHERE DATE(driver.created_at) = date_series.date
     ) AS dailyTotalDrivers,
 
-    -- [3] يومي: عدد السائقين المتصل بهم (notesForDriverService)
     (
         SELECT COUNT(*)
         FROM notesForDriverService
         WHERE DATE(notesForDriverService.createdAt) = date_series.date
     ) AS dailyTotalCallingDrivers,
 
-    -- [4] يومي: Matching Notes (Join with driver on phone)
     (
         SELECT COUNT(*)
         FROM notesForDriverService n
@@ -55,26 +52,23 @@ SELECT
         WHERE DATE(n.createdAt) = date_series.date
     ) AS dailyMatchingNotes,
 
-    -- [5] إجمالي الفترة: سائقين
     (
         SELECT COUNT(*)
         FROM driver
-        WHERE driver.created_at BETWEEN '$start_date' AND '$end_date 23:59:59'
+        WHERE driver.created_at BETWEEN :start_date1 AND :end_date1
     ) AS totalMonthlyDrivers,
 
-    -- [6] إجمالي الفترة: Calling Drivers
     (
         SELECT COUNT(*)
         FROM notesForDriverService
-        WHERE notesForDriverService.createdAt BETWEEN '$start_date' AND '$end_date 23:59:59'
+        WHERE notesForDriverService.createdAt BETWEEN :start_date2 AND :end_date2
     ) AS totalMonthlyCallingDrivers,
 
-    -- [7] إجمالي الفترة: Matching Notes
     (
         SELECT COUNT(*)
         FROM notesForDriverService n
         JOIN driver d ON n.phone = d.phone
-        WHERE n.createdAt BETWEEN '$start_date' AND '$end_date 23:59:59'
+        WHERE n.createdAt BETWEEN :start_date3 AND :end_date3
     ) AS totalMonthlyMatchingNotes
 
 FROM
@@ -82,12 +76,20 @@ FROM
 GROUP BY
     date_series.date
 ORDER BY
-    date_series.date ASC;
-";
+    date_series.date ASC";
 
 try {
     $stmt = $con->prepare($sql);
-    $stmt->execute();
+    $stmt->execute([
+        ':start_date' => $start_date,
+        ':end_date' => $end_date,
+        ':start_date1' => $start_date,
+        ':end_date1' => $end_date_full,
+        ':start_date2' => $start_date,
+        ':end_date2' => $end_date_full,
+        ':start_date3' => $start_date,
+        ':end_date3' => $end_date_full
+    ]);
     $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
     if ($data) {