diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php index 6e701d44..684115ae 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php @@ -23,6 +23,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Maatwebsite\Excel\Facades\Excel; use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Throwable; class OperatorController { @@ -40,11 +41,17 @@ class OperatorController return Excel::download(new OperatorCartableReport($data['data']), $name); } + /** + * @throws Throwable + */ public function complaintsIndex(Request $request, OperatorService $operatorService): JsonResponse { return response()->json($operatorService->complaintsIndex($request)); } + /** + * @throws Throwable + */ public function complaintsReport(Request $request, OperatorService $operatorService): BinaryFileResponse { $name = 'گزارش از رسیدگی به شکایات واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx'; diff --git a/app/Services/Cartables/RoadObservation/OperatorService.php b/app/Services/Cartables/RoadObservation/OperatorService.php index 49ceb9cb..93d689c4 100644 --- a/app/Services/Cartables/RoadObservation/OperatorService.php +++ b/app/Services/Cartables/RoadObservation/OperatorService.php @@ -6,6 +6,7 @@ use App\Exceptions\ProhibitedAction; use App\Facades\DataTable\DataTableFacade; use App\Models\RoadObserved; use Illuminate\Http\Request; +use Throwable; class OperatorService { @@ -37,15 +38,15 @@ class OperatorService } /** - * @throws \Throwable + * @throws Throwable */ public function complaintsIndex(Request $request) { $user = auth()->user(); - $fields = 'fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, StartTime_DateTime, + $fields = ['fk_RegisteredEventMessage, road_observeds.id, Title, FeatureTypeTitle, MobileForSendEventSms, StartTime_DateTime, road_observeds.created_at, rms_last_activity, rms_last_activity_fa, status, edarate_shahri_id, - status_fa, supervisor_description, rms_description, province_fa, city_id, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng'; + status_fa, supervisor_description, rms_description, province_fa, city_id, city_fa, Description, edarate_shahri.name_fa as edarate_shahri_name_fa, lat, lng']; if ($user->hasPermissionTo('show-fast-react')) { $query = RoadObserved::query()->leftjoin('edarate_shahri', 'road_observeds.edarate_shahri_id', 'edarate_shahri.id') diff --git a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php index f4837f48..6050d470 100644 --- a/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/CountryReport.blade.php @@ -27,7 +27,7 @@ + style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ {{ verta($fromDate)->format('Y/n/j') }} تا @@ -43,7 +43,7 @@ اداره کل - تعداد کل + تعداد خسارات ثبت شده نحوه شناسایی خسارت @@ -59,11 +59,14 @@ + + کل + در دست اقدام - در حال فرایند پرداخت + در حال پرداخت خاتمه یافته @@ -76,7 +79,7 @@ گزارش گشت راهداری - فیش + فاکتور بیمه @@ -94,6 +97,9 @@ {{ $road['name'] }} + + {{ $road['tedade'] }} + {{ $road['egdam'] }} diff --git a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php index 134166b1..308f8aa5 100644 --- a/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/DataTableReport.blade.php @@ -26,6 +26,7 @@ استان شهرستان نام محور + نوع ناوگان نام راننده کد ملی راننده شماره موبایل راننده @@ -48,6 +49,7 @@ {{$item->province_fa}} {{$item->city_fa}} {{$item->axis_name}} + {{$item->is_foreign ? 'داخلی' : 'خارجی'}} {{$item->driver_name}} {{$item->driver_national_code}} {{$item->driver_phone_number}} diff --git a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php index be9a6556..d48aef61 100644 --- a/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php +++ b/resources/views/v3/Reports/AccidentReceipt/ProvinceReport.blade.php @@ -27,7 +27,7 @@ + style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> گزارش خسارات وارده به ابنیه فنی و تاسیسات راه از تاریخ {{ verta($fromDate)->format('Y/n/j') }} تا @@ -44,7 +44,7 @@ اداره کل - تعداد کل + تعداد خسارات ثبت شده تعداد نحوه شناسایی خسارت @@ -60,11 +60,14 @@ + + کل + در دست اقدام - در حال فرایند پرداخت + در حال پرداخت خاتمه یافته @@ -77,7 +80,7 @@ گزارش گشت راهداری - فیش + فاکتور بیمه @@ -95,6 +98,9 @@ {{ $road['name'] }} + + {{ $road['tedade'] }} + < {{ $road['egdam'] }} diff --git a/routes/v3.php b/routes/v3.php index 6fc3ec01..6567212e 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -294,20 +294,19 @@ Route::prefix('road_observations') ->name('roadObservations.') ->group(function () { Route::name('operator.') - ->prefix('operator') ->controller(\App\Http\Controllers\V3\Dashboard\RoadObservation\OperatorController::class) ->group(function () { - Route::get('/cartable','cartableIndex')->name('cartableIndex')->middleware('permission:show-fast-react-edarate-shahri'); - Route::get('/cartable_report','cartableReport')->name('cartableReport')->middleware('permission:show-fast-react-edarate-shahri'); + Route::get('operator/cartable','cartableIndex')->name('cartableIndex')->middleware('permission:show-fast-react-edarate-shahri'); + Route::get('operator/report','cartableReport')->name('cartableReport')->middleware('permission:show-fast-react-edarate-shahri'); Route::get('/complaints_index', 'complaintsIndex') ->middleware('permission:show-fast-react-edarate-shahri|show-fast-react-province|show-fast-react') ->name('complaintsIndex'); Route::get('/complaints_report', 'complaintsReport')->name('complaintsReport') ->middleware('permission:show-fast-react-edarate-shahri|show-fast-react-province|show-fast-react'); - Route::post('/register/{roadObserved}', 'register') + Route::post('operator/register/{roadObserved}', 'register') ->middleware('permission:show-fast-react-edarate-shahri') ->name('register'); - Route::post('/modify_registration/{roadObserved}', 'modifyRegistration') + Route::post('operator/modify_registration/{roadObserved}', 'modifyRegistration') ->middleware('permission:show-fast-react-edarate-shahri') ->name('modifyRegistration'); Route::post('/refer/{roadObserved}', 'refer') @@ -316,6 +315,7 @@ Route::prefix('road_observations') Route::get('/refer_list/{roadObserved}', 'referList') ->middleware('permission:show-fast-react-edarate-shahri|show-fast-react-province|show-fast-react') ->name('referList'); + Route::get('/{roadObserved}', 'show')->name('show'); }); Route::name('supervisor.') @@ -336,7 +336,6 @@ Route::prefix('road_observations') Route::get('/excel', 'excel')->name('excel')->middleware('permission:show-fast-react-province|show-fast-react'); Route::get('/map', 'map')->name('map'); }); - Route::get('/{roadObserved}', [\App\Http\Controllers\V3\Dashboard\RoadObservation\OperatorController::class, 'show'])->name('show'); }); Route::prefix('log_list')