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

create new postision for report

Browse Source
This commit is contained in:
joddyabott
2025-06-17 13:12:30 +03:30
parent 3122ea1d2f
commit c8b66e2986
4 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/V3/RoadPatrole/OperatorController.php
View File

@@ -31,33 +31,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
class OperatorController extends Controller
{
use ApiResponse;
public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$request->validate(["province_id" => "required",]);
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'edarateShahri' => $edarateShahri,
]);
}
public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivity([
'activities' => $activities,
'edarateShahri' => $edarateShahri,
]), $name);
}
public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$data = $roadPatrolTableService->operatorCartableReport($request);
return response()->json($data);

58
app/Http/Controllers/V3/RoadPatrole/ReportController.php
View File

@@ -2,11 +2,18 @@
namespace App\Http\Controllers\V3\RoadPatrole;
use App\Exports\V3\RoadPatrols\CountryActivity;
use App\Exports\V3\RoadPatrols\ProvinceActivity;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\Province;
use App\Models\RoadPatrol;
use App\Services\Cartables\RoadPatrolTableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class ReportController extends Controller
{
@@ -63,4 +70,55 @@ class ReportController extends Controller
$data['observed_items'] = $observed_items;
return $this->successResponse($data);
}
public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'provinces' => $provinces
]);
}
public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$request->validate(["province_id" => "required",]);
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'edarateShahri' => $edarateShahri,
]);
}
public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivity([
'activities' => $activities,
'provinces' => $provinces,
]), $name);
}
public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->provinceActivity($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ProvinceActivity([
'activities' => $activities,
'edarateShahri' => $edarateShahri,
]), $name);
}
}

25
app/Http/Controllers/V3/RoadPatrole/SupervisorController.php
View File

@@ -17,30 +17,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
class SupervisorController extends Controller
{
use ApiResponse;
public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
'activities' => $activities['data'],
'provinces' => $provinces
]);
}
public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
{
$activities = $roadPatrolTableService->countryActivity($request);
$provinces = Province::all(['id', 'name_fa']);
$name = 'گزارش از گشت راهداری و ترابری ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryActivity([
'activities' => $activities,
'provinces' => $provinces,
]), $name);
}
public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
public function index(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
{
$data = $roadPatrolTableService->supervisorCartableReport($request);

13
routes/v3.php
View File

@@ -31,6 +31,7 @@ use App\Http\Controllers\V3\NotificationController;
use App\Http\Controllers\V3\PermissionManagementController;
use App\Http\Controllers\V3\ProfileController;
use App\Http\Controllers\V3\RahdaranController;
use App\Http\Controllers\V3\RoadPatrole\ReportController;
use Illuminate\Support\Facades\Route;
Route::get('admin/permissions', function () {
@@ -252,9 +253,7 @@ Route::prefix('road_patrol')
->name('operator.')
->controller(App\Http\Controllers\V3\RoadPatrole\OperatorController::class)
->group(function () {
Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
Route::get('/index', 'operatorIndex')
Route::get('/', 'index')
->middleware('permission:add-road-patrol')
->name('index');
@@ -272,6 +271,10 @@ Route::prefix('road_patrol')
->name('report.')
->controller(ReportController::class)
->group(function () {
Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
Route::get('/province_activity', 'provincePatrolActivity')->name('provincePatrolActivity');
Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
Route::get('/{roadPatrol}', 'getReport')
@@ -281,14 +284,12 @@ Route::prefix('road_patrol')
->name('supervisor.')
->controller(App\Http\Controllers\V3\RoadPatrole\SupervisorController::class)
->group(function () {
Route::get('/index', 'supervisorIndex')
Route::get('/','index')
->middleware(['permission:show-road-patrol-supervise-cartable|show-road-patrol-supervise-cartable-province'])
->name('index');
Route::get('/report', 'supervisorCartableReport')
->name('cartableReport');
Route::get('/country_activity', 'countryPatrolActivity')->name('countryPatrolActivity');
Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
});
});