From ce28ec9f930937ade3d12185c22080f77b022bb5 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Sun, 9 Feb 2025 13:34:40 +0330
Subject: [PATCH] format the blades

---
 app/Services/Reports/RoadItemReportService.php            | 8 ++++----
 .../v3/Reports/RoadItems/OperatorCartableReport.blade.php | 3 +--
 .../Reports/RoadItems/SupervisorCartableReport.blade.php  | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Services/Reports/RoadItemReportService.php b/app/Services/Reports/RoadItemReportService.php
index 4751cda3..23454c13 100644
--- a/app/Services/Reports/RoadItemReportService.php
+++ b/app/Services/Reports/RoadItemReportService.php
@@ -76,7 +76,7 @@ class RoadItemReportService
     public function countryActivityPerSubItem(Request $request): array
     {
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
+        $toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
         $item = $request->item;
 
         $provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
@@ -114,7 +114,7 @@ class RoadItemReportService
     public function provinceActivityPerSubItem(Request $request): array
     {
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
+        $toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
         $item = $request->item;
         $province = $request->province_id;
 
@@ -159,7 +159,7 @@ class RoadItemReportService
     public function countryActivityPerItem(Request $request): array
     {
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
+        $toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
         $user = auth()->user();
 //        $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']);
         $isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable");
@@ -198,7 +198,7 @@ class RoadItemReportService
     {
         $provinceId = $request->province_id;
         $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
+        $toDate = $request->to_date ? $request->to_date . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
 
         $edarehActivity = RoadItemsProject::query()
             ->selectRaw('
diff --git a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
index 558c8907..3894defd 100644
--- a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <th colspan="14"
-            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش کارتابل عملیات فعالیت های روزانه و جاری
         </th>
     </tr>
@@ -107,7 +107,6 @@
             </td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
             <td style="border: 1px solid black;text-align: center;">{{  $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
-            </td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
         </tr>
diff --git a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
index 1dd0a9c8..6203dbbc 100644
--- a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <th colspan="14"
-            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
             گزارش کارتابل ارزیابی فعالیت های روزانه و جاری
         </th>
     </tr>
@@ -107,7 +107,6 @@
             </td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
             <td style="border: 1px solid black;text-align: center;">{{  $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
-            </td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
         </tr>