From d163fb335fccf5594ae1fa0065773cfecd24f3e3 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 18 May 2025 10:36:50 +0330
Subject: [PATCH] change some item for cartable

---
 .../SafetyAndPrivacy/OperatorController.php   |  4 ++
 .../OperatorCartableReport.blade.php          | 40 +++++++++++++++----
 .../SupervisorCartableReport.blade.php        | 38 ++++++++++++++----
 3 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
index 650a6a93..b6726fe4 100644
--- a/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/SafetyAndPrivacy/OperatorController.php
@@ -135,9 +135,13 @@ class OperatorController extends Controller
 
         DB::transaction(function () use ($request, $safetyAndPrivacy, $user) {
             $step = SafetyAndPrivacySteps::BARKHORD->value;
+            $status_id = SafetyAndPrivacyStatus::PENDING->value;
+
             $safetyAndPrivacy->update([
                 'step' => $step,
                 'step_fa' => SafetyAndPrivacySteps::name($step),
+                'status' => $status_id,
+                'status_fa' => SafetyAndPrivacyStatus::name($status_id),
                 'action_picture' => FileFacade::save($request->action_picture, "safety_and_privacy/{$safetyAndPrivacy->id}/action_picture"),
                 'action_picture_document_upload_date' => now(),
                 'action_date' => $request->action_date,
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/OperatorCartableReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/OperatorCartableReport.blade.php
index 043a3f4d..ed526015 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/OperatorCartableReport.blade.php
@@ -21,18 +21,18 @@
 <table>
     <thead>
     <tr>
-        <th colspan="10"
+        <th colspan="16"
             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="10"
+        <th colspan="16"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="10"
+        <th colspan="16"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
                 گزارش فعالیت های نگهداری حریم راه
         </th>
@@ -54,6 +54,26 @@
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تاریخ ثبت
         </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت گام ها
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت فرایند
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            علت خاتمه فرایند
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت نظارت
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            توضیحات ناظر
+        </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تاریخ بازدید
@@ -68,8 +88,10 @@
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            وضعیت
+           توضیحات کارشناس
         </th>
+
+
     </tr>
     </thead>
 
@@ -80,17 +102,19 @@
             <td style="border: 1px solid black;text-align: center;">{{ $item['info_fa'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['axis_type_name'] ?? '-' }}</td>
             <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 style="border: 1px solid black;text-align: center;">{{$item['step_fa'] ?? '-'}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item['is_finished'] ? 'خاتمه یافته' : 'در جریان'}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item['final_description'] ?? '-'}}</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>
             <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>
-
             <td style="border: 1px solid black;text-align: center;">
                 {{ $item['judiciary_document_upload_date'] && $item['judiciary_document_upload_date'] != '0000-00-00 00:00:00' ?  verta($item['judiciary_document_upload_date'])->format('Y/n/j H:i:s')  : '-' }}
             </td>
-
             <td style="border: 1px solid black;text-align: center;">
                 {{ $item['action_picture_document_upload_date'] ? verta($item['action_date'])->format('Y/n/j H:i:s') : '-' }}
             </td>
-
-            <td style="border: 1px solid black;text-align: center;">{{ $item['step_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item['operator_description'] ?? '-'}}</td>
         </tr>
     @endforeach
     </tbody>
diff --git a/resources/views/v3/Reports/SafetyAndPrivacy/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/SafetyAndPrivacy/SupervisorCartableReport.blade.php
index c1065678..5e372e43 100644
--- a/resources/views/v3/Reports/SafetyAndPrivacy/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/SafetyAndPrivacy/SupervisorCartableReport.blade.php
@@ -21,18 +21,18 @@
 <table>
     <thead>
     <tr>
-        <th colspan="10"
+        <th colspan="16"
             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="10"
+        <th colspan="16"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
         </th>
     </tr>
     <tr>
-        <th colspan="10"
+        <th colspan="16"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
                 گزارش فعالیت های نگهداری حریم راه
         </th>
@@ -62,6 +62,26 @@
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تاریخ ثبت
         </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت گام ها
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت فرایند
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            علت خاتمه فرایند
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت نظارت
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            توضیحات ناظر
+        </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تاریخ بازدید
@@ -76,7 +96,7 @@
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            وضعیت
+            توضیحات کارشناس
         </th>
     </tr>
     </thead>
@@ -90,17 +110,19 @@
             <td style="border: 1px solid black;text-align: center;">{{ $item['info_fa'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['axis_type_name'] ?? '-' }}</td>
             <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 style="border: 1px solid black;text-align: center;">{{$item['step_fa'] ?? '-'}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item['is_finished'] ? 'خاتمه یافته' : 'در جریان'}}</td>
+            <td style="border: 1px solid black;text-align: center;">{{$item['final_description'] ?? '-'}}</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>
             <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>
-
             <td style="border: 1px solid black;text-align: center;">
                 {{ $item['judiciary_document_upload_date'] && $item['judiciary_document_upload_date'] != '0000-00-00 00:00:00' ?  verta($item['judiciary_document_upload_date'])->format('Y/n/j H:i:s')  : '-' }}
             </td>
-
             <td style="border: 1px solid black;text-align: center;">
                 {{ $item['action_picture_document_upload_date'] ? verta($item['action_date'])->format('Y/n/j H:i:s') : '-' }}
             </td>
-
-            <td style="border: 1px solid black;text-align: center;">{{ $item['step_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['operator_description'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>