From 7d7507411d0ff2ebe49f0525de70cd29ebd98db6 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Sun, 24 May 2026 09:00:16 +0330 Subject: [PATCH 1/5] merge develop to origin --- routes/v3.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/v3.php b/routes/v3.php index 8d1e61ca..960772f9 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -666,5 +666,6 @@ Route::prefix('role') Route::get('/test', function () { $csvExporter = new \Laracsv\Export(); + $csvExporter->build(\App\Models\User::all(), ['id' => 'کد یکتا', 'username' => 'نام کاربری'])->download(); }); \ No newline at end of file From e3b49ebbb37c0d6cd7a3e7169675b55f06dcb555 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Mon, 25 May 2026 16:25:56 +0330 Subject: [PATCH 2/5] crate new repor for machin when they go to the mission and fix bugs in traddod mission --- .../Mission/Report/Tradod/CountryReport.php | 4 +- .../Mission/Report/Tradod/ProvinceReport.php | 4 +- .../Mission/Report/machine/machineReport.php | 73 +++++++++++++++++ .../Report/ReportMachineController.php | 47 +++++++++++ .../V3/Mission/ControlUnit/FinishRequest.php | 23 ++++++ .../Mission/Report/ReportMachineService.php | 43 ++++++++++ .../Report/Machine/ActivityReport.blade.php | 79 +++++++++++++++++++ .../Tradod /CountryActivityReport.blade.php | 2 +- .../Tradod /ProvinceActivityReport.blade.php | 2 +- routes/v3.php | 1 - 10 files changed, 271 insertions(+), 7 deletions(-) create mode 100644 app/Exports/V3/Mission/Report/machine/machineReport.php create mode 100644 app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php create mode 100644 app/Services/Cartables/Mission/Report/ReportMachineService.php create mode 100644 resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php diff --git a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php index 69e2b66d..b63d606a 100644 --- a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php @@ -29,9 +29,9 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $national = [ 'province_name' => $name, 'total' => (int) ($r->total ?? 0), - 'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0), 'gps' => (int) ($r->gps ?? 0), 'durations' => (int) ($r->durations ?? 0), + 'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0), 'bafarayand_saeti' => (int) ($r->far_h ?? 0), 'bafarayand_rozaneh' => (int) ($r->far_d ?? 0), 'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0), @@ -50,9 +50,9 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent } $grid[$pid]['total'] = (int) ($r->total ?? 0); - $grid[$pid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0); $grid[$pid]['gps'] = (int) ($r->gps ?? 0); $grid[$pid]['durations'] = (int) ($r->durations ?? 0); + $grid[$pid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0); $grid[$pid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0); $grid[$pid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0); $grid[$pid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0); diff --git a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php index 28e31bd0..bf59db39 100644 --- a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php @@ -30,9 +30,9 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven $province = [ 'city_name' => $name, 'total' => (int) ($r->total ?? 0), - 'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0), 'gps' => (int) ($r->gps ?? 0), 'durations' => (int) ($r->durations ?? 0), + 'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0), 'bafarayand_saeti' => (int) ($r->far_h ?? 0), 'bafarayand_rozaneh' => (int) ($r->far_d ?? 0), 'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0), @@ -51,9 +51,9 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven } $grid[$cid]['total'] = (int) ($r->total ?? 0); - $grid[$cid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0); $grid[$cid]['gps'] = (int) ($r->gps ?? 0); $grid[$cid]['durations'] = (int) ($r->durations ?? 0); + $grid[$cid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0); $grid[$cid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0); $grid[$cid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0); $grid[$cid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0); diff --git a/app/Exports/V3/Mission/Report/machine/machineReport.php b/app/Exports/V3/Mission/Report/machine/machineReport.php new file mode 100644 index 00000000..8f110c9f --- /dev/null +++ b/app/Exports/V3/Mission/Report/machine/machineReport.php @@ -0,0 +1,73 @@ +data as $r) { + $exportRows[] = [ + 'city_name' => $r->c_name ?? '', + 'province_name' => $r->p_name ?? '', + 'm_c_code' => $r->m_c_code ?? 0, + 'distance' => (int) ($r->distance ?? 0), + ]; + } + + return view('v3.Reports.Mission.Report.Machine.ActivityReport', [ + 'rows' => $exportRows, + ]); + } + + public function registerEvents(): array + { + return [ + AfterSheet::class => function (AfterSheet $event) { + $event->sheet->getDelegate()->setRightToLeft(true); + }, + ]; + } + + /** + * @throws Exception + */ + public function drawings(): array + { + $drawing = new Drawing(); + $drawing->setName('Logo'); + $drawing->setDescription('This is my logo'); + $drawing->setPath(public_path('/dist/logo.png')); + $drawing->setWidth(50); + $drawing->setHeight(50); + $drawing->setOffsetX(5); + $drawing->setOffsetY(5); + $drawing->setCoordinates('A1'); + + $drawing2 = new Drawing(); + $drawing2->setName('Logo'); + $drawing2->setDescription('This is my logo'); + $drawing2->setPath(public_path('/dist/141icon.png')); + $drawing2->setWidth(50); + $drawing2->setHeight(50); + $drawing2->setOffsetX(5); + $drawing2->setOffsetY(5); + $drawing2->setCoordinates('C1'); + + return [$drawing, $drawing2]; + } +} diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php new file mode 100644 index 00000000..34e32a34 --- /dev/null +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -0,0 +1,47 @@ +successResponse([ + 'activities' => $reportMachineService->Activity($request), + 'provinces' => Province::all(['id', 'name_fa']), + 'code' => Mission::query() + ->where('machine_code', $request->machine_code) + ->get() + ]); + } + + /** + * @throws Exception + * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception + */ + public function ExcelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse + { + $data = $reportMachineService->Activity($request); + $name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx'; + + return Excel::download(new CountryReport($data), $name); + } + +} diff --git a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php index bbc1d5b0..6fe0a2fe 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php @@ -5,6 +5,7 @@ namespace App\Http\Requests\V3\Mission\ControlUnit; use App\Enums\MissionStates; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Validator; class FinishRequest extends FormRequest { @@ -23,9 +24,31 @@ class FinishRequest extends FormRequest */ public function rules(): array { + $mission = $this->route('mission'); return [ 'time' => 'required|date', 'end_km' => 'required', ]; } + + public function after(): array + { + return [ + function (Validator $validator) { + $mission = $this->route('mission'); + if (strtotime($this->time) < strtotime($mission->start_time)) { + $validator->errors()->add( + 'time', + 'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.' + ); + } + if ($this->end_km < $mission->km) { + $validator->errors()->add( + 'end_km', + 'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.' + ); + } + } + ]; + } } diff --git a/app/Services/Cartables/Mission/Report/ReportMachineService.php b/app/Services/Cartables/Mission/Report/ReportMachineService.php new file mode 100644 index 00000000..f34ceb4a --- /dev/null +++ b/app/Services/Cartables/Mission/Report/ReportMachineService.php @@ -0,0 +1,43 @@ +machine_code; + $from = $request->from_date ?? today()->startOfDay(); + $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay(); + + $sql = " + SELECT* + m.city_name AS c.name, + m.city_id AS c_id, + m.province_name AS p_name, + m.province_id AS p_id, + COUNT(m.machine_code) As m_c_code, + SUM(m.end_km)-sum(m.km) AS distance + + FROM missions m + WHERE m.machine_code = :machineCode + AND m.created_at >= :from + AND m.created_at <= :to + GROUP BY m.city_id, m.city_name,m.province_id, m.province_name; + + + "; + + return DB::select($sql, [ + 'from' => $from, + 'to' => $to, + 'machineCode' => $code, + ]); + } +} diff --git a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php new file mode 100644 index 00000000..ef5c1de1 --- /dev/null +++ b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php @@ -0,0 +1,79 @@ + + + + + + + + گزارش کل تردد های یک ماشین + + + + + +@php + // show a dot if key missing or value is 0/empty + function cell($row, $key) { + return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0'; + } +@endphp + + + + + + + + + + + + + + + + + + + + + + + @foreach ($rows as $item) + + + + + + + + @endforeach + +
+ تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} +
+
+ گزارش ماشین های ماموریت رفته +
+ استان + + شهر + + تعداد ماموریت + جمع مسافت طی شده +
{{ $item['province_name'] ?? '-' }}{{ $item['city_name'] ?? '-' }}{{ $item['c_m_code'] ?? '-' }}{{ $item['distance'] ?? '-' }}
+ + diff --git a/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php index 15edd38a..0fae970f 100644 --- a/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php @@ -93,9 +93,9 @@ {{ $item['province_name'] ?? '-' }} {{ $item['total'] ?? '-' }} - {{ $item['khareg_mahdode'] ?? '-' }} {{ $item['gps'] ?? '-' }} {{ $item['durations'] ?? '-' }} + {{ $item['khareg_mahdode'] ?? '-' }} {{ $item['bafarayand_saeti'] ?? '-' }} {{ $item['bafarayand_rozaneh'] ?? '-' }} {{ $item['bedon_bafarayand_saeti'] ?? '-' }} diff --git a/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php index 8d46c155..04c29850 100644 --- a/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php @@ -93,9 +93,9 @@ {{ $item['city_name'] ?? '-' }} {{ $item['total'] ?? '-' }} - {{ $item['khareg_mahdode'] ?? '-' }} {{ $item['gps'] ?? '-' }} {{ $item['durations'] ?? '-' }} + {{ $item['khareg_mahdode'] ?? '-' }} {{ $item['bafarayand_saeti'] ?? '-' }} {{ $item['bafarayand_rozaneh'] ?? '-' }} {{ $item['bedon_bafarayand_saeti'] ?? '-' }} diff --git a/routes/v3.php b/routes/v3.php index 960772f9..8d1e61ca 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -666,6 +666,5 @@ Route::prefix('role') Route::get('/test', function () { $csvExporter = new \Laracsv\Export(); - $csvExporter->build(\App\Models\User::all(), ['id' => 'کد یکتا', 'username' => 'نام کاربری'])->download(); }); \ No newline at end of file From 23dd62550d6ba3750e133decde42d58790f551f9 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Tue, 26 May 2026 13:22:42 +0330 Subject: [PATCH 3/5] prefix code and write route --- .../Report/{machine => Machine}/machineReport.php | 4 ++-- .../Mission/Report/ReportMachineController.php | 10 ++++------ .../Requests/V3/Mission/ControlUnit/FinishRequest.php | 3 +-- .../Cartables/Mission/Report/ReportMachineService.php | 9 +++------ .../Mission/Report/Machine/ActivityReport.blade.php | 5 ++--- routes/v3.php | 9 +++++++++ 6 files changed, 21 insertions(+), 19 deletions(-) rename app/Exports/V3/Mission/Report/{machine => Machine}/machineReport.php (95%) diff --git a/app/Exports/V3/Mission/Report/machine/machineReport.php b/app/Exports/V3/Mission/Report/Machine/machineReport.php similarity index 95% rename from app/Exports/V3/Mission/Report/machine/machineReport.php rename to app/Exports/V3/Mission/Report/Machine/machineReport.php index 8f110c9f..83fc99d4 100644 --- a/app/Exports/V3/Mission/Report/machine/machineReport.php +++ b/app/Exports/V3/Mission/Report/Machine/machineReport.php @@ -1,6 +1,6 @@ $r->c_name ?? '', 'province_name' => $r->p_name ?? '', - 'm_c_code' => $r->m_c_code ?? 0, + 'missions' => $r->missions ?? 0, 'distance' => (int) ($r->distance ?? 0), ]; } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php index 34e32a34..a5c43e57 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\V3\Dashboard\Mission\Report; use App\Exports\V3\Mission\Report\Tradod\CountryReport; +use App\Exports\V3\Mission\Report\Tradod\machineReport; use App\Exports\V3\Mission\Report\Tradod\ProvinceReport; use App\Http\Controllers\Controller; use App\Http\Traits\ApiResponse; @@ -21,14 +22,11 @@ class ReportMachineController extends Controller { use ApiResponse; - public function Activity(Request $request, ReportMachineService $reportMachineService): JsonResponse + public function activity(Request $request, ReportMachineService $reportMachineService): JsonResponse { return $this->successResponse([ 'activities' => $reportMachineService->Activity($request), 'provinces' => Province::all(['id', 'name_fa']), - 'code' => Mission::query() - ->where('machine_code', $request->machine_code) - ->get() ]); } @@ -36,12 +34,12 @@ class ReportMachineController extends Controller * @throws Exception * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception */ - public function ExcelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse + public function excelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse { $data = $reportMachineService->Activity($request); $name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx'; - return Excel::download(new CountryReport($data), $name); + return Excel::download(new machineReport($data), $name); } } diff --git a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php index 6fe0a2fe..b62c5124 100644 --- a/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php +++ b/app/Http/Requests/V3/Mission/ControlUnit/FinishRequest.php @@ -24,7 +24,6 @@ class FinishRequest extends FormRequest */ public function rules(): array { - $mission = $this->route('mission'); return [ 'time' => 'required|date', 'end_km' => 'required', @@ -35,7 +34,7 @@ class FinishRequest extends FormRequest { return [ function (Validator $validator) { - $mission = $this->route('mission'); + $mission = $this->mission; if (strtotime($this->time) < strtotime($mission->start_time)) { $validator->errors()->add( 'time', diff --git a/app/Services/Cartables/Mission/Report/ReportMachineService.php b/app/Services/Cartables/Mission/Report/ReportMachineService.php index f34ceb4a..b92a5f89 100644 --- a/app/Services/Cartables/Mission/Report/ReportMachineService.php +++ b/app/Services/Cartables/Mission/Report/ReportMachineService.php @@ -22,16 +22,13 @@ class ReportMachineService m.city_id AS c_id, m.province_name AS p_name, m.province_id AS p_id, - COUNT(m.machine_code) As m_c_code, - SUM(m.end_km)-sum(m.km) AS distance + COUNT(m.id) As missions, + (SUM(m.end_km)-SUM(m.km)) AS distance FROM missions m WHERE m.machine_code = :machineCode AND m.created_at >= :from - AND m.created_at <= :to - GROUP BY m.city_id, m.city_name,m.province_id, m.province_name; - - + AND m.created_at <= :to; "; return DB::select($sql, [ diff --git a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php index ef5c1de1..a3ffc93b 100644 --- a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php @@ -57,7 +57,7 @@ تعداد ماموریت - جمع مسافت طی شده + جمع کارکرد @@ -68,9 +68,8 @@ {{ $item['province_name'] ?? '-' }} {{ $item['city_name'] ?? '-' }} - {{ $item['c_m_code'] ?? '-' }} + {{ $item['missions'] ?? '-' }} {{ $item['distance'] ?? '-' }} - @endforeach diff --git a/routes/v3.php b/routes/v3.php index 8d1e61ca..61157a1b 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -15,6 +15,7 @@ use App\Http\Controllers\V3\Dashboard\Harim\TechnicalDeputyController; use App\Http\Controllers\V3\Dashboard\ItemsManagementController; use App\Http\Controllers\V3\Dashboard\Mission\ControlUnitController; use App\Http\Controllers\V3\Dashboard\Mission\DetailController; +use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportMachineController; use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportTradodController; use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportViolationController; use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController; @@ -556,6 +557,14 @@ Route::prefix('missions') Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); }); + Route::prefix('report_machine') + ->name('reportsMachine.') + ->middleware(['permission:mission-report-province|mission-report-country']) + ->controller(ReportMachineController::class) + ->group(function () { + Route::get('/activity', 'activity')->name('Activity'); + Route::get('/excel_activity', 'excelActivity')->name('ProvinceActivity'); + }); }); Route::prefix('harim') From 25e2883e9c1747a194ecabf8468e341399e1f38e Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Tue, 26 May 2026 15:59:04 +0330 Subject: [PATCH 4/5] fix controller --- .../Mission/Report/ReportMachineController.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php index a5c43e57..eb8f0b6f 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -2,16 +2,11 @@ namespace App\Http\Controllers\V3\Dashboard\Mission\Report; -use App\Exports\V3\Mission\Report\Tradod\CountryReport; -use App\Exports\V3\Mission\Report\Tradod\machineReport; -use App\Exports\V3\Mission\Report\Tradod\ProvinceReport; +use App\Exports\V3\Mission\Report\Machine\machineReport; use App\Http\Controllers\Controller; use App\Http\Traits\ApiResponse; -use App\Models\City; -use App\Models\Mission; use App\Models\Province; use App\Services\Cartables\Mission\Report\ReportMachineService; -use App\Services\Cartables\Mission\Report\ReportTradodService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Maatwebsite\Excel\Facades\Excel; @@ -25,7 +20,7 @@ class ReportMachineController extends Controller public function activity(Request $request, ReportMachineService $reportMachineService): JsonResponse { return $this->successResponse([ - 'activities' => $reportMachineService->Activity($request), + 'activities' => $reportMachineService->activity($request), 'provinces' => Province::all(['id', 'name_fa']), ]); } @@ -36,7 +31,7 @@ class ReportMachineController extends Controller */ public function excelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse { - $data = $reportMachineService->Activity($request); + $data = $reportMachineService->activity($request); $name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx'; return Excel::download(new machineReport($data), $name); From a0ee7cccd36a9ba2457aada9258ef48530f704f6 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Sat, 30 May 2026 09:15:51 +0330 Subject: [PATCH 5/5] fix situation logo in report --- app/Exports/V3/Mission/Report/Machine/machineReport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Exports/V3/Mission/Report/Machine/machineReport.php b/app/Exports/V3/Mission/Report/Machine/machineReport.php index 83fc99d4..5d11323a 100644 --- a/app/Exports/V3/Mission/Report/Machine/machineReport.php +++ b/app/Exports/V3/Mission/Report/Machine/machineReport.php @@ -66,7 +66,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('C1'); + $drawing2->setCoordinates('D1'); return [$drawing, $drawing2]; }