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

change structure of road patrol

Browse Source
This commit is contained in:
joddyabott
2025-06-16 12:35:04 +03:30
parent 6aa073f0ae
commit d16effc80e
9 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/RoadPatrole/OperateorController.php
View File

@@ -1,11 +0,0 @@
<?php
namespace App\Http\Controllers\RoadPatrole;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class OperateorController extends Controller
{
//
}

4
app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php
View File

@@ -7,8 +7,8 @@ use App\Exports\V3\RoadPatrols\OperatorCartableReport;
use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
use App\Facades\Sms\Sms;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\RoadPatrolProject\DeleteRequest;
use App\Http\Requests\V3\RoadPatrolProject\StoreRequest;
use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
use App\Http\Requests\V3\RoadPatrol\StoreRequest;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\InfoItem;

18
app/Http/Controllers/V3/RoadPatrole/OperateorController.php → app/Http/Controllers/V3/RoadPatrole/DetailController.php
View File

@@ -2,32 +2,16 @@
namespace App\Http\Controllers\V3\RoadPatrole;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\RoadPatrol;
use App\Services\Cartables\RoadPatrolTableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class OperateorController extends Controller
class DetailController 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 activitiesOnMap(Request $request): JsonResponse
{
$date_from = $request->from_date ? $request->from_date .' 00:00:00' : now()->startOfDay()->toDateTimeString();

20
app/Http/Controllers/V3/RoadPatrole/OperateorReportController.php → app/Http/Controllers/V3/RoadPatrole/OperatorController.php
View File

@@ -2,19 +2,35 @@
namespace App\Http\Controllers\V3\RoadPatrole;
use App\Exports\V3\RoadPatrols\OperatorCartableReport;
use App\Exports\V3\RoadPatrols\ProvinceActivity;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Services\Cartables\RoadPatrolTableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class OperateorReportController extends Controller
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);

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

@@ -2,12 +2,15 @@
namespace App\Http\Controllers\V3\RoadPatrole;
use App\Exports\V3\RoadPatrols\CountryActivity;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\Province;
use App\Services\Cartables\RoadPatrolTableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class SupervisorController extends Controller
{
@@ -23,6 +26,19 @@ class SupervisorController extends Controller
'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);
}
}

31
app/Http/Controllers/V3/RoadPatrole/SupervisorReportController.php
View File

@@ -1,31 +0,0 @@
<?php
namespace App\Http\Controllers\V3\RoadPatrole;
use App\Exports\V3\RoadPatrols\CountryActivity;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\Province;
use App\Services\Cartables\RoadPatrolTableService;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class SupervisorReportController extends Controller
{
use ApiResponse;
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);
}
}