From d990b0b6da15f49d8c7505a41681458f1e62e058 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Wed, 28 May 2025 15:02:29 +0330
Subject: [PATCH] add some tittle for table

---
 .../Cartables/AccidentReceiptTableService.php | 16 +++++++++++--
 .../AccidentReceipt/CountryReport.blade.php   | 23 +++++++++++++++----
 .../AccidentReceipt/ProvinceReport.blade.php  | 23 +++++++++++++++----
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/app/Services/Cartables/AccidentReceiptTableService.php b/app/Services/Cartables/AccidentReceiptTableService.php
index 4f251709..69ab80d3 100644
--- a/app/Services/Cartables/AccidentReceiptTableService.php
+++ b/app/Services/Cartables/AccidentReceiptTableService.php
@@ -46,6 +46,9 @@ class AccidentReceiptTableService
             "کشوری" as province_fa,
             -1 as province_id,
             COUNT(id) AS tedade, 
+             COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+           COUNT(CASE WHEN STATUS   IN (1,2,3,4)  THEN 1 END) AS pardakht,
+           COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
             COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
             COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht, 
             SUM(`sum`) AS kol_sabt_shode,
@@ -60,6 +63,9 @@ class AccidentReceiptTableService
             province_fa,
             province_id,
             COUNT(id) AS tedade, 
+             COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+           COUNT(CASE WHEN STATUS   IN (1,2,3,4)  THEN 1 END) AS pardakht,
+           COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
             COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
             COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht, 
             SUM(`sum`) AS kol_sabt_shode,
@@ -86,7 +92,10 @@ class AccidentReceiptTableService
             'SELECT 
             "استانی" as city_fa,
             -1 as city_id,
-            COUNT(id) AS tedade, 
+            COUNT(id) AS tedade,
+             COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+           COUNT(CASE WHEN STATUS   IN (1,2,3,4)  THEN 1 END) AS pardakht,
+           COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm,
             COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
             COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht, 
             SUM(`sum`) AS kol_sabt_shode,
@@ -100,7 +109,10 @@ class AccidentReceiptTableService
             SELECT 
             city_fa,
             city_id,
-            COUNT(id) AS tedade, 
+            COUNT(id) AS tedade,
+              COUNT(CASE WHEN STATUS =0 THEN 1 END ) AS egdam,
+           COUNT(CASE WHEN STATUS   IN (1,2,3,4)  THEN 1 END) AS pardakht,
+           COUNT(CASE WHEN STATUS =5 THEN 1 END ) AS khatm, 
             COUNT(CASE WHEN report_base = 0 THEN 1 END) AS police_rah,
             COUNT(CASE WHEN report_base = 1 THEN 1 END) AS gozaresh_gasht, 
             SUM(`sum`) AS kol_sabt_shode,
diff --git a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
index c5745eb6..f4837f48 100644
--- a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php
@@ -14,19 +14,19 @@
 <table>
     <thead>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
             تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
         </th>
 
     </tr>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
             گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ
             {{ verta($fromDate)->format('Y/n/j') }}
@@ -42,7 +42,7 @@
         <th rowspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
             اداره کل
         </th>
-        <th rowspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
+        <th colspan="3" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
             تعداد کل
         </th>
         <th colspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
@@ -59,6 +59,15 @@
         </th>
     </tr>
     <tr>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            در دست اقدام
+        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            در حال فرایند پرداخت
+        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            خاتمه یافته
+        </th>
         <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
             گزارش پلیس راه
         </th>
@@ -86,7 +95,11 @@
             <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                 {{ $road['name'] }}</td>
             <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
-                {{ $road['tedade'] }}</td>
+                {{ $road['egdam'] }}</td>
+            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                {{ $road['pardakht'] }}</td>
+            <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                {{ $road['khatm'] }}</td>
             <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                 {{ $road['police_rah'] }}</td>
             <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
diff --git a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
index 501f8ce4..be9a6556 100644
--- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
+++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php
@@ -14,19 +14,19 @@
 <table>
     <thead>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
             تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
         </th>
 
     </tr>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="9"
+        <th colspan="11"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
             گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ
             {{ verta($fromDate)->format('Y/n/j') }}
@@ -43,7 +43,7 @@
         <th rowspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
             اداره کل
         </th>
-        <th rowspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
+        <th colspan="3" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
             تعداد کل
         </th>
         <th colspan="2" style="border:1px solid black;text-align:center;background-color: #C4D79B;">
@@ -60,6 +60,15 @@
         </th>
     </tr>
     <tr>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            در دست اقدام
+        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            در حال فرایند پرداخت
+        </th>
+        <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
+            خاتمه یافته
+        </th>
         <th style="border:1px solid black;text-align:center;background-color: #EBF1DE;">
             گزارش پلیس راه
         </th>
@@ -86,8 +95,12 @@
             <tr>
                 <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                     {{ $road['name'] }}</td>
+                <<td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                    {{ $road['egdam'] }}</td>
                 <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
-                    {{ $road['tedade'] }}</td>
+                    {{ $road['pardakht'] }}</td>
+                <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
+                    {{ $road['khatm'] }}</td>
                 <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">
                     {{ $road['police_rah'] }}</td>
                 <td style="text-align: center;border:1px solid black;background-color: #DAEEF3;">