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

debug

Browse Source
This commit is contained in:
amirghasempoor
2025-02-25 15:58:46 +03:30
parent a47f4cac48
commit c4a50de162
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/V3/Dashboard/RoadObservationController.php
View File

@@ -33,19 +33,19 @@ class RoadObservationController extends Controller
{
use ApiResponse;
public function supervisorIndex (Request $request,RoadObservationTableService $roadObservationTableService ): JsonResponse
public function supervisorIndex(Request $request,RoadObservationTableService $roadObservationTableService ): JsonResponse
{
return response()->json($roadObservationTableService->supervisorCartableIndex($request));
}
public function verifyBySupervisor (VerifyBySupervisorRequest $request, RoadObserved $roadObserved): JsonResponse
public function verifyBySupervisor(VerifyBySupervisorRequest $request, RoadObserved $roadObserved): JsonResponse
{
$statusFa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
$roadObserved->update([
'status' => $request->verify,
'status_fa' => $statusFa,
'supervisor_id' => auth()->user()->id(),
'supervisor_id' => auth()->user()->id,
'supervisor_name' => auth()->user()->name,
'supervisor_description' => $request->description,
'supervising_time' => now(),
@@ -56,7 +56,7 @@ class RoadObservationController extends Controller
return $this->successResponse();
}
public function supervisorCartableReport (Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
public function supervisorCartableReport(Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی واکنش سریع '. verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $roadObservationTableService->supervisorCartableIndex($request, true);
@@ -171,7 +171,7 @@ class RoadObservationController extends Controller
return $this->successResponse();
}
public function referList(Request $request, RoadObserved $roadObserved): JsonResponse
public function referList(RoadObserved $roadObserved): JsonResponse
{
$referList = [];
$data = $roadObserved->problemHistories()->where('action', '=', 'refer')->get();

6
app/Services/Cartables/RoadItemTableService.php
View File

@@ -21,7 +21,7 @@ class RoadItemTableService
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()
->select(['id', 'province_fa', 'edarat_name', 'item_fa', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
->select(['id', 'province_fa', 'edarat_name', 'item_id', 'item_fa', 'sub_item_id', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
@@ -31,7 +31,7 @@ class RoadItemTableService
return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
}
$query = RoadItemsProject::query()
->select(['id', 'province_fa', 'edarat_name', 'item_fa', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
->select(['id', 'province_fa', 'edarat_name', 'item_id', 'item_fa', 'sub_item_id', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->where('province_id', auth()->user()->province_id)
@@ -53,7 +53,7 @@ class RoadItemTableService
$allowedSortings = ['*'];
$query = RoadItemsProject::query()
->select(['id', 'supervisor_description', 'item_fa', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
->select(['id', 'supervisor_description', 'item_id', 'item_fa', 'sub_item_id', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->where('user_id', auth()->user()->id)

15
app/Services/Cartables/RoadObservationTableService.php
View File

@@ -66,11 +66,7 @@ class RoadObservationTableService
->whereNotNull('road_observeds.province_id')
->whereNotNull('status')
->leftJoin('edarate_shahri', 'road_observeds.edarate_shahri_id', '=', 'edarate_shahri.id')
->select($fields)
->addSelect([
DB::raw("CONCAT('https://rms.rmto.ir/', image_before) as image_before"),
DB::raw("CONCAT('https://rms.rmto.ir/', image_after) as image_after")
]);
->select($fields);
if ($user->hasPermissionTo('show-fast-react-province')) {
if (is_null($user->province_id)) {
@@ -101,7 +97,8 @@ class RoadObservationTableService
->whereNotNull('edarate_shahri_id')
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}
elseif ($user->hasPermissionTo('show-fast-react-province')) {
@@ -115,7 +112,8 @@ class RoadObservationTableService
->where('road_observeds.province_id', '=', $user->province_id)
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}
elseif ($user->hasPermissionTo('show-fast-react-edarate-shahri')) {
@@ -130,7 +128,8 @@ class RoadObservationTableService
->where('edarate_shahri_id', '=', $user->edarate_shahri_id)
->selectRaw('fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms,
road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status,
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng');
status_fa, supervisor_description, rms_description, province_fa, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'
);
}

3
routes/v3.php
View File

@@ -295,6 +295,9 @@ Route::prefix('road_observations')
Route::post('/refer/{roadObserved}', 'refer')
->middleware('permission:show-fast-react-edarate-shahri|show-fast-react-province|show-fast-react')
->name('refer');
Route::get('/refer_list/{roadObserved}', 'referList')->name('referList');
Route::post('/restore/{roadObserved}', 'restore')
->middleware('permission:restore-fast-react')
->name('restore');