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

Merge pull request 'add start and finish time' (#3) from feature/ViolationProvince into develop

Browse Source 
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/3
This commit is contained in:
amirghasempoor
2026-01-26 06:21:01 +00:00
parent 44e7f6a321 1775a8e75e
commit 8f1a93b8ef
6 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/DailyMovingMachineCommand.php
View File

@@ -58,14 +58,20 @@ class DailyMovingMachineCommand extends Command
break; break;
} }
$machine = CMMSMachine::query()->firstWhere('machine_code', '=', $code);
MissionViolation::query()->create([ MissionViolation::query()->create([
'machine_code' => $code, 'machine_code' => $code,
'machine_id' => CMMSMachine::query()->firstWhere('machine_code', '=', $code)->id, 'machine_id' => $machine->id,
'type' => MissionViolationType::KHOROJ_BEDONE_MOGAVEZ->value, 'type' => MissionViolationType::KHOROJ_BEDONE_MOGAVEZ->value,
'request_date' => $date, 'request_date' => $date,
'mileage' => $cmm['mileageKM'], 'mileage' => $cmm['mileageKM'],
// 'exit_time' => $cmm['exit_time'], // 'exit_time' => $cmm['exit_time'],
// 'enter_time' => $cmm['enter_time'], // 'enter_time' => $cmm['enter_time'],
'province_id' => $machine->province_id,
// 'province_name' => $machine->province_fa,
'city_id' => $machine->city_id,
// 'city_name' => $machine->city_fa,
]); ]);
} }

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

@@ -43,7 +43,7 @@ class ControlUnitController extends Controller
$mission->update([ $mission->update([
'state_id' => $state, 'state_id' => $state,
'state_name' => MissionStates::name($state), 'state_name' => MissionStates::name($state),
'start_time' => now(), 'start_time' => $request->time,
'km' => $request->km, 'km' => $request->km,
]); ]);
}); });
@@ -56,7 +56,7 @@ class ControlUnitController extends Controller
*/ */
public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse
{ {
DB::transaction(function () use ($mission, $getErrorRateService) { DB::transaction(function () use ($mission, $getErrorRateService, $request) {
$mission->histories()->create([ $mission->histories()->create([
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id, 'previous_state_id' => $mission->state_id,
@@ -68,8 +68,8 @@ class ControlUnitController extends Controller
$mission->update([ $mission->update([
'state_id' => $state, 'state_id' => $state,
'state_name' => MissionStates::name($state), 'state_name' => MissionStates::name($state),
'finish_time' => now(), 'finish_time' => $request->time,
'mission_duration' => strtotime(now()) - strtotime($mission->start_time), 'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
]); ]);
$getErrorRateService->setInputParameters($mission); $getErrorRateService->setInputParameters($mission);

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

@@ -96,6 +96,8 @@ class ViolationManagementController extends Controller
} }
public function store(StoreRequest $request): JsonResponse public function store(StoreRequest $request): JsonResponse
{ {
$user = auth()->user();
MissionViolation::query()->create([ MissionViolation::query()->create([
'machine_id'=> CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->value('id'), 'machine_id'=> CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->value('id'),
'machine_code'=> $request->machine_code, 'machine_code'=> $request->machine_code,
@@ -104,6 +106,10 @@ class ViolationManagementController extends Controller
'request_date' => now(), 'request_date' => now(),
'km' => $request->km, 'km' => $request->km,
'gps' => 0, 'gps' => 0,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id,
'city_name' => $user->city_fa,
]); ]);
return $this->successResponse(); return $this->successResponse();

2
app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php
View File

@@ -24,7 +24,7 @@ class FinishRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
// 'time' => 'required|date',
]; ];
} }
} }

1
app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php
View File

@@ -27,6 +27,7 @@ class StartRequest extends FormRequest
return [ return [
'code' => 'required|string', 'code' => 'required|string',
'km' => 'required', 'km' => 'required',
'time' => 'required|date',
]; ];
} }

31
database/migrations/2026_01_25_153836_add_column_to_mission_violations_table.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('mission_violations', function (Blueprint $table) {
$table->unsignedTinyInteger('province_id')->nullable();
$table->string('province_name')->nullable();
$table->unsignedSmallInteger('city_id')->nullable();
$table->string('city_name')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('mission_violations', function (Blueprint $table) {
$table->dropColumn(['province_id', 'province_name', 'city_id', 'city_name']);
});
}
};