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

fix conflict

Browse Source
This commit is contained in:
faezeh
2026-06-27 10:53:31 +03:30
parent 6fc073c7e8 0291ee6716
commit aa468b592b
16 changed files with 151 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
View File

@@ -21,7 +21,87 @@ class ReportMachineController extends Controller
{
use ApiResponse;
public function machineDetailsReport(Request $request, int $machine_id): array
public function countryMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachinesActivity($request),
// 'provinces' => Province::all(['id', 'name_fa']),
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function countryMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->countryMachinesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
public function provinceMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->provinceMachinesActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
// $query->where('type_id', 1)
// ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
// })
// ->get(['id', 'name_fa'])
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function provinceMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->provinceMachinesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
public function countryMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachineTypesActivity($request),
// 'provinces' => Province::all(['id', 'name_fa']),
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->countryMachineTypesActivity($request);
$name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineTypeReport($data), $name);
}
public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->provinceMachineTypesActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
// $query->where('type_id', 1)
// ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
// })
// ->get(['id', 'name_fa'])
]);
}
public function machineDetailsReport(Request $request, int $machine_id)
{
return DataTableFacade::run(
Mission::query()->where('machine_id', '=', $machine_id),
@@ -34,7 +114,20 @@ class ReportMachineController extends Controller
]
);
}
public function machinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->provinceMachineTypesActivity($request);
$name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineTypeReport($data), $name);
}
public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
{
return $this->successResponse([
'activities' => $reportMachineService->machinesActivity($request),

16
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\FMSResultCode;
use App\Enums\MissionCategory;
use App\Enums\MissionStates;
use App\Enums\MissionTypes;
@@ -10,7 +9,6 @@ use App\Enums\MissionViolationStatus;
use App\Enums\MissionZones;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
use App\Http\Requests\V3\Mission\RequestPortal\ChangeStateRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ClarifyUnauthorizedExitRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
@@ -23,7 +21,6 @@ use App\Models\Mission;
use App\Models\MissionViolation;
use App\Models\Rahdaran;
use App\Models\RahdariPoint;
use App\Models\RoadObserved;
use App\Services\Cartables\Mission\RequestPortalService;
use App\Services\FMS\GetErrorRateService;
use Carbon\Carbon;
@@ -65,6 +62,8 @@ class RequestPortalController extends Controller
$user = auth()->user();
$mission = Mission::query()->create([
'item_id' => $request->item_id,
'sub_item_id' => $request->sub_item_id,
'user_id' => $user->id,
'username' => $user->username,
'province_id' => $user->province_id,
@@ -83,7 +82,6 @@ class RequestPortalController extends Controller
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
@@ -137,6 +135,8 @@ class RequestPortalController extends Controller
$machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);
$newMission = Mission::query()->create([
'item_id' => $request->item_id,
'sub_item_id' => $request->sub_item_id,
'user_id' => $user->id,
'username' => $user->username,
'province_id' => $user->province_id,
@@ -154,7 +154,6 @@ class RequestPortalController extends Controller
'start_date' => now(),
'end_date' => $request->end_date,
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
@@ -185,6 +184,8 @@ class RequestPortalController extends Controller
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission->update([
'item_id' => $request->item_id,
'sub_item_id' => $request->sub_item_id,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'requested_machines' => json_encode($request->requested_machines),
@@ -194,7 +195,6 @@ class RequestPortalController extends Controller
'zone_fa' => MissionZones::name($request->zone),
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'description' => $request->description,
'end_point' => $request->end_point,
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
@@ -247,6 +247,8 @@ class RequestPortalController extends Controller
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);
$mission = Mission::query()->create([
'item_id' => $request->item_id,
'sub_item_id' => $request->sub_item_id,
'user_id' => $user->id,
'username' => $user->username,
'province_id' => $user->province_id,
@@ -285,7 +287,7 @@ class RequestPortalController extends Controller
$mission->rahdaran()->sync($request->rahdaran);
$violation->update(['status' => 1]);
$violation->update(['status' => 1, 'mission_id' => $mission->id]);
// if ($mission->category_id == 2) {
// $rpc = new OperatorController;