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

Merge pull request 'fix list and crate update machine and change state for mission' (#12) from feature/AddThreeItemInViolation into develop

Browse Source 
Reviewed-on: #12
This commit was merged in pull request #12.
This commit is contained in:
amirghasempoor
2026-06-10 05:18:39 +00:00
parent 92cf157b29 5004b99d03
commit a8b99706d0
9 changed files with 117 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
View File

@@ -33,11 +33,11 @@ class ControlUnitController extends Controller
public function start(StartRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission, $request) {
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name,
]);
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
// 'previous_state_id' => $mission->state_id,
// 'previous_state_name' => $mission->state_name,
// ]);
$state = MissionStates::START_MISSION->value;
$mission->update([
@@ -57,11 +57,11 @@ class ControlUnitController extends Controller
public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse
{
DB::transaction(function () use ($mission, $getErrorRateService, $request) {
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name,
]);
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
// 'previous_state_id' => $mission->state_id,
// 'previous_state_name' => $mission->state_name,
// ]);
$state = MissionStates::END_MISSION->value;

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

@@ -9,6 +9,7 @@ use App\Enums\MissionTypes;
use App\Enums\MissionZones;
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\ContinueMissionRequest;
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
@@ -273,4 +274,14 @@ class RequestPortalController extends Controller
return $this->successResponse();
}
public function changeState(ChangeStateRequest $request, Mission $mission): JsonResponse
{
$mission->update([
'state' => $request->state_id,
'state_name' => MissionStates::name($request->status_id),
]);
return $this->successResponse($mission);
}
}

22
app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
View File

@@ -33,11 +33,11 @@ class TransportationUnitController extends Controller
DB::transaction(function () use ($request, $mission) {
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name,
]);
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
// 'previous_state_id' => $mission->state_id,
// 'previous_state_name' => $mission->state_name,
// ]);
$state = MissionStates::PENDING_CONFIRMATION->value;
$machine = CMMSMachine::query()->find($request->machine_id);
@@ -61,12 +61,12 @@ class TransportationUnitController extends Controller
DB::transaction(function () use ($request, $mission) {
$mission->rahdaran()->wherePivot('is_driver', '=', true)->detach();
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name,
'user_description' => $request->description,
]);
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
// 'previous_state_id' => $mission->state_id,
// 'previous_state_name' => $mission->state_name,
// 'user_description' => $request->description,
// ]);
$state = MissionStates::REJECT_BY_TRANSPORTATION->value;

12
app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
View File

@@ -63,19 +63,19 @@ class ViolationManagementController extends Controller
'zone_fa' => MissionZones::name($zone),
'type' => $type,
'type_fa' => MissionTypes::name($type),
'start_date' => $request->start_date,//
'end_date' => $request->end_date,//
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'end_point' => $request->end_point,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'start_time' => $request->start_date,//
'finish_time' => $request->end_date,//
'start_time' => $request->start_date,
'finish_time' => $request->end_date,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'explanation' => $request->explanation,
'request_date' => now(),
'machine_id' => $machine->id,//
'machine_code' => $machine->machine_code,//
'machine_id' => $machine->id,
'machine_code' => $machine->machine_code,
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
'km' => $violation->km ?? null,

2
app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
View File

@@ -42,7 +42,7 @@ class RoadMaintenanceStationController extends Controller
{
$stations = RahdariPoint::query()
->where('city_id', $request->query('city_id'))
->get();
->get(['id', 'name']);
return $this->successResponse($stations);
}