diff --git a/app/Services/Dashboard/Province/SystemMessages/OperatorService.php b/app/Services/Dashboard/Province/SystemMessages/OperatorService.php index 54460b8..cf5cc20 100644 --- a/app/Services/Dashboard/Province/SystemMessages/OperatorService.php +++ b/app/Services/Dashboard/Province/SystemMessages/OperatorService.php @@ -10,12 +10,8 @@ class OperatorService { public function dataTable(Request $request) { - $user = auth()->user(); - - $query = SystemMessage::query()->where('edare_shahri_id', '=', $user->edarate_shahri_id); - return DataTableFacade::run( - $query, + SystemMessage::query(), $request, allowedFilters: ['*'], allowedSortings: ['*'], diff --git a/routes/web.php b/routes/web.php index b65918b..9be70cc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -128,4 +128,52 @@ Route::prefix('server')->group(function () { ->group(function () { Route::get('/', 'index')->name('index'); }); + + Route::middleware('auth') + ->prefix('system_messages') + ->name('systemMessages.') + ->group(function () { + Route::prefix('operator') + ->name('systemMessages.') + ->controller(\App\Http\Controllers\ProvinceDashboard\SystemMessages\OperatorController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::get('/excel', 'excel')->name('excel'); + Route::get('/{systemMessage}', 'show')->name('show'); + }); + + Route::prefix('supervisor') + ->name('systemMessages.') + ->controller(\App\Http\Controllers\ProvinceDashboard\SystemMessages\SupervisorController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::get('/excel', 'excel')->name('excel'); + Route::get('/{systemMessage}', 'show')->name('show'); + Route::post('/{systemMessage}', 'rate')->name('rate'); + }); + }); + + Route::middleware('auth') + ->prefix('people_messages') + ->name('peopleMessages.') + ->group(function () { + Route::prefix('operator') + ->name('peopleMessages.') + ->controller(\App\Http\Controllers\ProvinceDashboard\PeopleMessages\OperatorController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::get('/excel', 'excel')->name('excel'); + Route::post('/{peopleMessage}', 'handle')->name('handle'); + Route::get('/{peopleMessage}', 'show')->name('show'); + }); + + Route::prefix('supervisor') + ->name('peopleMessages.') + ->controller(\App\Http\Controllers\ProvinceDashboard\PeopleMessages\SupervisorController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::get('/excel', 'excel')->name('excel'); + Route::get('/{peopleMessage}', 'show')->name('show'); + }); + }); });