Merge pull request 'develop' (#28) from develop into main

Reviewed-on: #28

app/Exports/V3/Mission/Report/Machine/machineDriverReport.php

@@ -65,7 +65,7 @@ class machineDriverReport implements FromView, ShouldAutoSize, WithDrawings, Wit
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('D1');
 

app/Exports/V3/Mission/Report/Machine/machineReport.php

@@ -66,7 +66,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('E1');
 

app/Exports/V3/Mission/Report/Machine/machineTypeReport.php

@@ -64,7 +64,7 @@ class machineTypeReport implements FromView, ShouldAutoSize, WithDrawings, WithE
         $drawing2->setPath(public_path('/dist/141icon.png'));
         $drawing2->setWidth(50);
         $drawing2->setHeight(50);
-        $drawing2->setOffsetX(+90);
+        $drawing2->setOffsetX(5);
         $drawing2->setOffsetY(5);
         $drawing2->setCoordinates('C1');
 

app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php

@@ -85,7 +85,7 @@ class ReportMachineController extends Controller
     public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
         $data = $reportMachineService->countryMachineTypesActivity($request);
-        $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
         return Excel::download(new machineTypeReport($data), $name);
     }
@@ -125,7 +125,7 @@ class ReportMachineController extends Controller
     public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
     {
         $data = $reportMachineService->provinceMachineTypesActivity($request);
-        $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
+        $name = 'گزارش  نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
 
         return Excel::download(new machineTypeReport($data), $name);
     }

app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\V3\Dashboard\Mission;
 
+use App\Enums\FMSResultCode;
 use App\Enums\MissionCategory;
 use App\Enums\MissionStates;
 use App\Enums\MissionTypes;
@@ -9,6 +10,7 @@ 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;
@@ -21,6 +23,7 @@ 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;
@@ -62,8 +65,6 @@ 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,
@@ -82,6 +83,7 @@ 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,
@@ -135,8 +137,6 @@ 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,6 +154,7 @@ 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,
@@ -184,8 +185,6 @@ 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),
@@ -195,6 +194,7 @@ 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,8 +247,6 @@ 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,
@@ -287,7 +285,7 @@ class RequestPortalController extends Controller
 
             $mission->rahdaran()->sync($request->rahdaran);
 
-            $violation->update(['status' => 1, 'mission_id' => $mission->id]);
+            $violation->update(['status' => 1]);
 
 //            if ($mission->category_id == 2) {
 //                $rpc = new OperatorController;

app/Http/Requests/V3/Mission/RequestPortal/ClarifyUnauthorizedExitRequest.php

@@ -25,8 +25,6 @@ class ClarifyUnauthorizedExitRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'item_id' => 'required|exists:info_items,item',
-            'sub_item_id' => 'required|exists:info_items,sub_item',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'driver' => 'required|integer|exists:rahdaran,id',

app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php

@@ -26,8 +26,6 @@ class ContinueMissionRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'item_id' => 'required|exists:info_items,item',
-            'sub_item_id' => 'required|exists:info_items,sub_item',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'machine_id' => 'required|integer|exists:cmms_machines,id',
@@ -35,6 +33,7 @@ class ContinueMissionRequest extends FormRequest
             'type' => 'required|in:1,2',
             'zone' => 'required|in:1,2,3',
             'end_date' => 'required|date',
+            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',

app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php

@@ -25,8 +25,6 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'item_id' => 'required|exists:info_items,item',
-            'sub_item_id' => 'required|exists:info_items,sub_item',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'requested_machines' => 'required|array',
@@ -34,6 +32,7 @@ class StoreRequest extends FormRequest
             'zone' => 'required|in:1,2,3',
             'start_date' => 'required|date',
             'end_date' => 'required|date',
+            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',

app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php

@@ -26,8 +26,6 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'item_id' => 'required|exists:info_items,item',
-            'sub_item_id' => 'required|exists:info_items,sub_item',
             'rahdaran' => 'array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'requested_machines' => 'required|array',
@@ -35,6 +33,7 @@ class UpdateRequest extends FormRequest
             'zone' => 'required|in:1,2,3',
             'start_date' => 'required|date',
             'end_date' => 'required|date',
+            'description' => 'string',
             'end_point' => 'required|string',
             'encoded_route' => 'required|string',
             'explanation' => 'required|string',

app/Http/Requests/V3/Mission/TransportaionUnit/DeallocateRequest.php

@@ -13,8 +13,8 @@ class DeallocateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return ($this->mission->station_id == auth()->user()->station_id &&
-            in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]))
+        return $this->mission->station_id == auth()->user()->station_id &&
+            in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
             || auth()->user()->username === 'witel';
     }
 

app/Models/Mission.php

@@ -14,7 +14,7 @@ class Mission extends Model
 {
     use HasFactory;
 
-    protected $guarded = ['id'];
+    protected $guarded = [];
     protected $hidden = ['pivot'];
     protected $casts = [
         'start_time' => 'datetime',

app/Models/MissionViolation.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 class MissionViolation extends Model
 {
     use HasFactory;
-    protected $guarded =['id'];
+    protected $guarded =[];
 
     public function mission(): BelongsTo
     {

database/migrations/2026_06_21_120836_add_item_and_subitems_to_missions_table.php

@@ -1,29 +0,0 @@
-<?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('missions', function (Blueprint $table) {
-            $table->unsignedInteger('item_id')->nullable();
-            $table->unsignedInteger('sub_item_id')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('missions', function (Blueprint $table) {
-            $table->dropColumn('item_id', 'sub_item_id');
-        });
-    }
-};

resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>گزارش ترددهای انواع ماشین ها</title>
+    <title>گزارش کل تردد های انواع ماشین ها </title>
 
     <style>
         table,
@@ -40,7 +40,7 @@
     <tr>
         <th colspan="3"
             style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
-            گزارش نوع ماشین هادرماموریت
+            گزارش نوع ماشین های ماموریت رفته
         </th>
     </tr>
     <tr>