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 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش فعالیت های نگهداری حریم راه
|
@@ -54,6 +54,26 @@
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
تاریخ ثبت
+
+ وضعیت گام ها
+ |
+
+ وضعیت فرایند
+ |
+
+ علت خاتمه فرایند
+ |
+
+ وضعیت نظارت
+ |
+
+ توضیحات ناظر
+ |
تاریخ بازدید
@@ -68,8 +88,10 @@
|
- وضعیت
+ توضیحات کارشناس
|
+
+
@@ -80,17 +102,19 @@
{{ $item['info_fa'] ?? '-' }} |
{{ $item['axis_type_name'] ?? '-' }} |
{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |
+ {{$item['step_fa'] ?? '-'}} |
+ {{$item['is_finished'] ? 'خاتمه یافته' : 'در جریان'}} |
+ {{$item['final_description'] ?? '-'}} |
+ {{$item['status_fa']?? '-'}} |
+ {{$item['supervisor_description']?? '-'}} |
{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }} |
-
{{ $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') : '-' }}
|
-
{{ $item['action_picture_document_upload_date'] ? verta($item['action_date'])->format('Y/n/j H:i:s') : '-' }}
|
-
- {{ $item['step_fa'] ?? '-' }} |
+ {{$item['operator_description'] ?? '-'}} |
@endforeach
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 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش فعالیت های نگهداری حریم راه
|
@@ -62,6 +62,26 @@
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
تاریخ ثبت
+
+ وضعیت گام ها
+ |
+
+ وضعیت فرایند
+ |
+
+ علت خاتمه فرایند
+ |
+
+ وضعیت نظارت
+ |
+
+ توضیحات ناظر
+ |
تاریخ بازدید
@@ -76,7 +96,7 @@
|
- وضعیت
+ توضیحات کارشناس
|
@@ -90,17 +110,19 @@
{{ $item['info_fa'] ?? '-' }} |
{{ $item['axis_type_name'] ?? '-' }} |
{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |
+ {{$item['step_fa'] ?? '-'}} |
+ {{$item['is_finished'] ? 'خاتمه یافته' : 'در جریان'}} |
+ {{$item['final_description'] ?? '-'}} |
+ {{$item['status_fa']?? '-'}} |
+ {{$item['supervisor_description']?? '-'}} |
{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }} |
-
{{ $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') : '-' }}
|
-
{{ $item['action_picture_document_upload_date'] ? verta($item['action_date'])->format('Y/n/j H:i:s') : '-' }}
|
-
- {{ $item['step_fa'] ?? '-' }} |
+ {{ $item['operator_description'] ?? '-' }} |
@endforeach