RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug operator and supervisor

Browse Source
This commit is contained in:
joddyabott
2025-06-01 09:41:27 +03:30
parent 14a611ddf7
commit 847d6cdf73
2 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php
View File

@@ -188,24 +188,26 @@ class OperatorController
{ {
$province = Province::query()->find($request->province_id); $province = Province::query()->find($request->province_id);
RoadObservationHistory::query()->create([ DB::transaction(function () use ($roadObserved, $request, $province) {
'id' => $roadObserved->id, RoadObservationHistory::query()->create([
'user_id' => auth()->user()->id, 'id' => $roadObserved->id,
'action' => 'refer', 'user_id' => auth()->user()->id,
'description' => $request->refer_description, 'action' => 'refer',
'from_edareh' => $roadObserved->edarate_shahri_id, 'description' => $request->refer_description,
'to_edareh' => $request->edarate_shahri_id, 'from_edareh' => $roadObserved->edarate_shahri_id,
'from_province' => $roadObserved->province_id, 'to_edareh' => $request->edarate_shahri_id,
'to_province' => $province->id 'from_province' => $roadObserved->province_id,
]); 'to_province' => $province->id
]);
$roadObserved->update([ $roadObserved->update([
'edarate_shahri_id' => $request->edarate_shahri_id, 'edarate_shahri_id' => $request->edarate_shahri_id,
'province_id' => $province->id, 'province_id' => $province->id,
'province_fa' => $province->name_fa, 'province_fa' => $province->name_fa,
]); ]);
auth()->user()->addActivityComplete(1037); auth()->user()->addActivityComplete(1037);
});
return $this->successResponse(); return $this->successResponse();
} }

63
app/Http/Controllers/V3/Dashboard/RoadObservation/SupervisorController.php
View File

@@ -13,6 +13,7 @@ use App\Services\Cartables\RoadObservation\SupervisorService;
use App\Services\Cartables\RoadObservationTableService; use App\Services\Cartables\RoadObservationTableService;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -29,16 +30,18 @@ class SupervisorController
{ {
$statusFa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید'; $statusFa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
$roadObserved->update([ DB::transaction(function () use ($request, $statusFa, $roadObserved) {
'status' => $request->verify, $roadObserved->update([
'status_fa' => $statusFa, 'status' => $request->verify,
'supervisor_id' => auth()->user()->id, 'status_fa' => $statusFa,
'supervisor_name' => auth()->user()->name, 'supervisor_id' => auth()->user()->id,
'supervisor_description' => $request->description, 'supervisor_name' => auth()->user()->name,
'supervising_time' => now(), 'supervisor_description' => $request->description,
]); 'supervising_time' => now(),
]);
auth()->user()->addActivityComplete(1138); auth()->user()->addActivityComplete(1138);
});
return $this->successResponse(); return $this->successResponse();
} }
@@ -54,33 +57,35 @@ class SupervisorController
public function restore(RestoreRequest $request, RoadObserved $roadObserved): JsonResponse public function restore(RestoreRequest $request, RoadObserved $roadObserved): JsonResponse
{ {
if ($roadObserved->image_before) { if ($roadObserved->image_before) {
FileFacade::delete($roadObserved->image_before); FileFacade::delete($roadObserved->image_before, true);
} }
if ($roadObserved->image_after) { if ($roadObserved->image_after) {
FileFacade::delete($roadObserved->image_after); FileFacade::delete($roadObserved->image_after, true);
} }
$roadObserved->update([ DB::transaction(function () use ($request, $roadObserved) {
'image_before' => null, $roadObserved->update([
'image_after' => null, 'image_before' => null,
'rms_last_activity' => null, 'image_after' => null,
'rms_last_activity_fa' => null, 'rms_last_activity' => null,
'updated_at_fa' => null, 'rms_last_activity_fa' => null,
'updated_at' => null, 'updated_at_fa' => null,
'rms_status' => 0, 'updated_at' => null,
'status' => null, 'rms_status' => 0,
'status_fa' => null, 'status' => null,
]); 'status_fa' => null,
]);
RoadObservationHistory::query()->create([ RoadObservationHistory::query()->create([
'id' => $roadObserved->id, 'id' => $roadObserved->id,
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'action' => 'restore', 'action' => 'restore',
'description' => $request->restore_description, 'description' => $request->restore_description,
]); ]);
auth()->user()->addActivityComplete(1141); auth()->user()->addActivityComplete(1141);
});
return $this->successResponse(); return $this->successResponse();
} }