Add machine report excel export

Merge pull request 'correct the excels' (#27 ) from feature/MachineExcels into develop
Reviewed-on: #27
2026-06-15 17:13:21 +03:30 · 2026-06-15 11:29:20 +00:00 · 2026-06-15 14:59:12 +03:30 · 2026-06-15 11:34:42 +03:30 · 2026-06-15 11:33:06 +03:30 · 2026-06-15 07:37:52 +00:00
15 changed files with 86 additions and 22 deletions
--- a/.env.example
+++ b/.env.example
@@ -78,7 +78,7 @@ FMS_ERROR_RATE_URL=
 FMS_ERROR_RATE_PASSWORD=
 FMS_ERROR_RATE_USERNAME=

-HARIM_NEED_ACCESS_URL='https://zamin.gov.ir/ow/api/ow/esb/response',
+HARIM_NEED_ACCESS_URL='https://zamin.gov.ir/ow/api/ow/esb/response'
 HARIM_NEED_ACCESS_PASSWORD=
 HARIM_NEED_ACCESS_USERNAME=

@@ -106,7 +106,7 @@ BACKUP_PASSWORD=1qaz
 HARIM_ENCRYPTION_KEY="TestKey"
 HARIM_ENCRYPTION_IV="1111000011110101"

-CHECKE_LIST_MACHINES_ACTIVITY_URL='fms.141.ir:7030/api/RMS/GetMovingVehicles',
+CHECKE_LIST_MACHINES_ACTIVITY_URL='fms.141.ir:7030/api/RMS/GetMovingVehicles'
 CHECKE_LIST_MACHINES_ACTIVITY_PASSWORD=
 CHECKE_LIST_MACHINES_ACTIVITY_USERNAME=

--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,10 @@ yarn-error.log
 /.idea
 /.vscode
 archive.tgz
+storage/avatar/
+storage/cities-geojson.json
+storage/compress.php
+storage/images/
+storage/provinces-cities-geojson copy.js
+storage/provinces-cities-geojson.js
+storage/provinces-geojson.json
--- a/app/Exports/V3/Mission/Report/Machine/machineDriverReport.php
+++ b/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(5);
+        $drawing2->setOffsetX(+90);
        $drawing2->setOffsetY(5);
        $drawing2->setCoordinates('D1');

--- a/app/Exports/V3/Mission/Report/Machine/machineReport.php
+++ b/app/Exports/V3/Mission/Report/Machine/machineReport.php
@@ -23,7 +23,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent

        foreach ($this->data as $r) {
            $exportRows[] = [
-                'machine_id' => $r->c_name ?? '',
+                'machine_id' => $r->machine_id ?? '',
                'machine_code' => $r->machine_code ?? '',
                'car_name' => $r->car_name ?? '',
                'missions' => $r->missions ?? 0,
@@ -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(5);
+        $drawing2->setOffsetX(+90);
        $drawing2->setOffsetY(5);
        $drawing2->setCoordinates('E1');

--- a/app/Exports/V3/Mission/Report/Machine/machineTypeReport.php
+++ b/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(5);
+        $drawing2->setOffsetX(+90);
        $drawing2->setOffsetY(5);
        $drawing2->setCoordinates('C1');

--- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
+++ b/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);
    }
--- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
@@ -126,6 +126,7 @@ class RequestPortalController extends Controller
                'finish_time' => now(),
                'state_id' => MissionStates::END_MISSION->value,
                'state_name' => MissionStates::name(MissionStates::END_MISSION->value),
+                'end_km' => $request->end_km,
            ]);

 //            if ($mission->category_id == 2) {
@@ -133,7 +134,7 @@ class RequestPortalController extends Controller
 //                $rpc->store($mission);
 //            }

-            $machine = CMMSMachine::query()->find($request->machine_id);
+            $machine = CMMSMachine::query()->find($request->machine_id, ['id', 'machine_code', 'car_type']);

            $newMission = Mission::query()->create([
                'user_id' => $user->id,
@@ -166,6 +167,8 @@ class RequestPortalController extends Controller
                'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
                'driver_id' => $request->driver,
                'driver_name' => Rahdaran::query()->find($request->driver)->name,
+                'km' => $request->end_km,
+                'requested_machines' => json_encode($machine->car_type),
            ]);

            $newMission->rahdaran()->sync($request->rahdaran);
@@ -241,7 +244,7 @@ class RequestPortalController extends Controller
            $type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
            $user = auth()->user();
            $zone = $request->zone;
-            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
+            $machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code', 'car_type']);

            $mission = Mission::query()->create([
                'user_id' => $user->id,
@@ -271,17 +274,18 @@ class RequestPortalController extends Controller
                'request_date' => now(),
                'machine_id' => $machine->id,
                'machine_code' => $machine->machine_code,
-                'requested_machines' => $machine->car_type,
+                'requested_machines' => json_encode($machine->car_type),
                'station_id' => $user->station_id,
                'station_name' => RahdariPoint::query()->find($user->station_id)->name,
                'km' => $violation->km ?? null,
+                'end_km' => $violation->end_km ?? null,
                'driver_id' => $request->driver,
                'driver_name' => Rahdaran::query()->find($request->driver)->name,
            ]);

            $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;
--- a/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
@@ -47,7 +47,7 @@ class TransportationUnitController extends Controller
                'state_name' => MissionStates::name($state),
                'machine_id' => $machine->id,
                'machine_code' => $machine->machine_code,
-                'driver_id' => $request->driver_id,
+                'driver_id' => $request->driver,
                'driver_name' => Rahdaran::query()->find($request->driver)->name,
            ]);

--- a/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
+++ b/app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php
@@ -70,6 +70,7 @@ class ViolationManagementController extends Controller
        $violation->update([
            'enter_time' => $request->enter_time,
            'status' => MissionViolationStatus::BEDON_EGHDAM->value,
+            'end_km' => $request->end_km,
        ]);

        return $this->successResponse();
--- a/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php
+++ b/app/Http/Requests/V3/Mission/RequestPortal/ContinueMissionRequest.php
@@ -38,6 +38,7 @@ class ContinueMissionRequest extends FormRequest
            'encoded_route' => 'required|string',
            'explanation' => 'required|string',
            'category_id' => 'required|in:1,2,3',
+            'end_km'=> 'required|string',
        ];
    }

@@ -56,6 +57,18 @@ class ContinueMissionRequest extends FormRequest
                        );
                    }
                }
+                if ($this->end_km < $this->mission->km) {
+                    $validator->errors()->add(
+                        'end_km',
+                        'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
+                    );
+                }
+                if (strtotime($this->end_date) < strtotime($this->mission->start_time)) {
+                    $validator->errors()->add(
+                        'time',
+                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
+                    );
+                }
            },
        ];
    }
--- a/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php
+++ b/app/Http/Requests/V3/Mission/Violation/UpdateRequest.php
@@ -27,6 +27,7 @@ class UpdateRequest extends FormRequest
    {
        return [
            'enter_time' => 'required|date',
+            'end_km'=> 'required|string',
        ];
    }

@@ -40,6 +41,12 @@ class UpdateRequest extends FormRequest
                        'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
                    );
                }
+                if ($this->end_km < $this->violation->km) {
+                    $validator->errors()->add(
+                        'end_km',
+                        'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
+                    );
+                }
            }
        ];
    }
--- a/database/migrations/2026_06_15_095947_add_column_to_mission_violations_table.php
+++ b/database/migrations/2026_06_15_095947_add_column_to_mission_violations_table.php
@@ -0,0 +1,28 @@
+<?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->string('end_km')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('mission_violations', function (Blueprint $table) {
+            $table->dropColumn('end_km');
+        });
+    }
+};
--- a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
@@ -27,18 +27,18 @@
 <table>
    <thead>
    <tr>
-        <th colspan="4"
+        <th colspan="5"
            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
        </th>
    </tr>
    <tr>
-        <th colspan="4"
+        <th colspan="5"
            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
        </th>
    </tr>
    <tr>
-        <th colspan="4"
+        <th colspan="5"
            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
            گزارش ماشین های ماموریت رفته
        </th>
--- a/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/MachineDriverReport.blade.php
@@ -46,7 +46,11 @@
    <tr>
        <th rowspan="1"
            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            car_type
+            کد یکتا
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نام راننده
        </th>
        <th rowspan="1"
            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
--- a/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php
+++ b/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,
@@ -27,20 +27,20 @@
 <table>
    <thead>
    <tr>
-        <th colspan="4"
+        <th colspan="3"
            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
        </th>
    </tr>
    <tr>
-        <th colspan="4"
+        <th colspan="3"
            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
        </th>
    </tr>
    <tr>
-        <th colspan="4"
+        <th colspan="3"
            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
-            گزارش نوع ماشین های ماموریت رفته
+            گزارش نوع ماشین هادرماموریت
        </th>
    </tr>
    <tr>
Author	SHA1	Message	Date
faezeh	80c4eeaefb	Add machine report excel export	2026-06-15 17:13:21 +03:30
amirghasempoor	c9e779d726	Merge pull request 'correct the excels' (#27 ) from feature/MachineExcels into develop Reviewed-on: #27	2026-06-15 11:29:20 +00:00
amirghasempoor	72fa9d4ea3	correct the excels	2026-06-15 14:59:12 +03:30
Amir Ghasempoor	d50749fd20	Merge pull request #132 from witelgroup/feature/PushToGithub Feature/push to GitHub	2026-06-15 11:34:42 +03:30
amirghasempoor	ad01e4718d	fix the .env.example	2026-06-15 11:33:06 +03:30
amirghasempoor	3dd49494f4	Merge pull request 'add requested machines' (#26 ) from feature/AddEndKm into develop Reviewed-on: #26	2026-06-15 07:37:52 +00:00
amirghasempoor	3045f60f1e	add requested machines	2026-06-15 11:08:03 +03:30
amirghasempoor	2a6d44885c	Merge pull request 'add end_km to violations' (#25 ) from feature/AddEndKm into develop Reviewed-on: #25	2026-06-15 07:02:21 +00:00
amirghasempoor	439f69af29	add end_km to violations	2026-06-15 10:32:04 +03:30