Update: 2026-08-02 22:51:18

backend/Admin/dashbord.php

@@ -33,15 +33,20 @@ SELECT
     -- كانت تُنتج متوسط مدة سالباً.
     (SELECT TIME_FORMAT(SEC_TO_TIME(AVG(TIMESTAMPDIFF(SECOND, rideTimeStart, rideTimeFinish))), '%Hh %im') FROM ride WHERE rideTimeStart IS NOT NULL AND rideTimeFinish IS NOT NULL AND TIMESTAMPDIFF(SECOND, rideTimeStart, rideTimeFinish) > 0) AS driver_avg_duration,
     (SELECT MAX(SEC_TO_TIME(TIMESTAMPDIFF(SECOND, rideTimeStart, rideTimeFinish))) FROM ride WHERE rideTimeStart IS NOT NULL AND rideTimeFinish IS NOT NULL) AS longest_duration,
-    (SELECT ROUND(SUM(distance),2) FROM ride) AS total_distance,
-    (SELECT ROUND(AVG(distance),2) FROM ride) AS average_distance,
-    (SELECT ROUND(MAX(distance),2) FROM ride) AS longest_distance,
+    -- المسافات تُحسب على الرحلات المكتملة فقط. حسابها على كل الصفوف كان
+    -- يُدخل الرحلات الملغاة و timeout (مسافتها 0 أو غير مضبوطة) في المتوسط
+    -- فيهبط average_distance بشكل مضلّل.
+    (SELECT ROUND(SUM(distance),2) FROM ride WHERE LOWER(status) IN ('finished','completed')) AS total_distance,
+    (SELECT ROUND(AVG(distance),2) FROM ride WHERE LOWER(status) IN ('finished','completed') AND distance > 0) AS average_distance,
+    (SELECT ROUND(MAX(distance),2) FROM ride WHERE LOWER(status) IN ('finished','completed')) AS longest_distance,
 
     -- أرباح السائق والشركة
     -- ملاحظة: خط الرحلات الحالي يكتب 'completed' بينما القديم يكتب 'Finished'،
     -- والاكتفاء بالقديم كان يُرجع NULL للأرباح وصفراً للرحلات المكتملة/الملغاة.
     (SELECT SUM(price_for_driver) FROM ride WHERE LOWER(status) IN ('finished','completed')) AS total_driver_earnings,
-    (SELECT ROUND(AVG(price_for_passenger),2) FROM ride) AS avg_passenger_price,
+    -- متوسط سعر الراكب على الرحلات المكتملة فقط — الرحلات الملغاة سعرها 0
+    -- وكانت تسحب المتوسط إلى أسفل.
+    (SELECT ROUND(AVG(price_for_passenger),2) FROM ride WHERE LOWER(status) IN ('finished','completed') AND price_for_passenger > 0) AS avg_passenger_price,
 
     -- توزيع الرحلات حسب الوقت
     (SELECT COUNT(*) FROM ride WHERE HOUR(created_at) BETWEEN 6 AND 11) AS morning_ride_count,
@@ -59,7 +64,9 @@ SELECT
     (SELECT COUNT(*) FROM ride WHERE LOWER(status) LIKE 'cancel%' OR LOWER(status) IN ('timeout','refused')) AS cancelled_rides,
 
     -- عدد السائقين الفريدين
-    (SELECT COUNT(*) FROM (SELECT driver_id FROM ride GROUP BY driver_id) AS sub) AS num_Driver,
+    -- cancel_ride_by_driver.php يضبط driver_id = 0 عند الإلغاء، وكان هذا
+    -- الصفر يُحتسب سائقاً وهمياً إضافياً في العدد.
+    (SELECT COUNT(DISTINCT driver_id) FROM ride WHERE driver_id > 0) AS num_Driver,
 
     -- التحويلات البنكية
     0 AS transfer_from_count