From 1981b1eab4f157f019b2511986f537748af9c3d6 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Sun, 4 Jan 2026 14:52:23 +0330 Subject: [PATCH 1/2] fix code --- .../{Violation => Report}/CountryReport.php | 6 +++--- .../{Violation => Report}/ProvinceReport.php | 18 +++++++++--------- .../V3/Dashboard/Mission/ReportController.php | 4 ++-- .../CountryActivityReport.blade.php | 6 +++--- .../ProvinceActivityReport.blade.php | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) rename app/Exports/V3/Mission/{Violation => Report}/CountryReport.php (93%) rename app/Exports/V3/Mission/{Violation => Report}/ProvinceReport.php (85%) rename resources/views/v3/Reports/Mission/{Violation => Report}/CountryActivityReport.blade.php (95%) rename resources/views/v3/Reports/Mission/{Violation => Report}/ProvinceActivityReport.blade.php (96%) diff --git a/app/Exports/V3/Mission/Violation/CountryReport.php b/app/Exports/V3/Mission/Report/CountryReport.php similarity index 93% rename from app/Exports/V3/Mission/Violation/CountryReport.php rename to app/Exports/V3/Mission/Report/CountryReport.php index 78604002..523b3080 100644 --- a/app/Exports/V3/Mission/Violation/CountryReport.php +++ b/app/Exports/V3/Mission/Report/CountryReport.php @@ -1,6 +1,6 @@ $exportRows, ]); } @@ -84,7 +84,7 @@ class CountryReport implements FromView, WithEvents, ShouldAutoSize, WithDrawing $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('E1'); + $drawing2->setCoordinates('C1'); return [$drawing, $drawing2]; } } diff --git a/app/Exports/V3/Mission/Violation/ProvinceReport.php b/app/Exports/V3/Mission/Report/ProvinceReport.php similarity index 85% rename from app/Exports/V3/Mission/Violation/ProvinceReport.php rename to app/Exports/V3/Mission/Report/ProvinceReport.php index 7b26540a..cdc77205 100644 --- a/app/Exports/V3/Mission/Violation/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/ProvinceReport.php @@ -1,6 +1,6 @@ data as $r) { - $pid = (int) $r->province_id; + $cid = (int) $r->city_id; $name = $r->city_name; - if ($pid === -1) { + if ($cid === -1) { $province = [ 'city_name' => $name, 'no_mission_count' => (int) ($r->no_mission_count ?? 0), @@ -38,14 +38,14 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin } - if (!isset($grid[$pid])) { - $grid[$pid] = [ + if (!isset($grid[$cid])) { + $grid[$cid] = [ 'city_name' => $name, ]; } - $grid[$pid]['no_mission_count'] = (int) ($r->no_mission_count ?? 0); - $grid[$pid]['out_of_area_count'] = (int) ($r->out_of_area_count ?? 0); + $grid[$cid]['no_mission_count'] = (int) ($r->no_mission_count ?? 0); + $grid[$cid]['out_of_area_count'] = (int) ($r->out_of_area_count ?? 0); } @@ -56,7 +56,7 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin } - return view('v3.Reports.Mission.Violation.ProvinceActivityReport', [ + return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ 'rows' => $exportRows, ]); } @@ -93,7 +93,7 @@ class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawin $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('E1'); + $drawing2->setCoordinates('C1'); return [$drawing, $drawing2]; } } \ No newline at end of file diff --git a/app/Http/Controllers/V3/Dashboard/Mission/ReportController.php b/app/Http/Controllers/V3/Dashboard/Mission/ReportController.php index c59f4022..f4b04424 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/ReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/ReportController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\V3\Dashboard\Mission; -use App\Exports\V3\Mission\Violation\CountryReport; -use App\Exports\V3\Mission\Violation\ProvinceReport; +use App\Exports\V3\Mission\Report\CountryReport; +use App\Exports\V3\Mission\Report\ProvinceReport; use App\Http\Controllers\Controller; use App\Http\Traits\ApiResponse; use App\Models\City; diff --git a/resources/views/v3/Reports/Mission/Violation/CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php similarity index 95% rename from resources/views/v3/Reports/Mission/Violation/CountryActivityReport.blade.php rename to resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php index 2dd88326..1abf73da 100644 --- a/resources/views/v3/Reports/Mission/Violation/CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php @@ -46,7 +46,7 @@ - کد یکتا + استان @@ -60,9 +60,9 @@ - @foreach ($data as $item) + @foreach ($rows as $item) - {{ $item['id'] ?? '-' }} + {{ $item['province_name'] ?? '-' }} {{ $item['no_mission_count'] ?? '-' }} {{ $item['out_of_area_count'] ?? '-' }} diff --git a/resources/views/v3/Reports/Mission/Violation/ProvinceActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php similarity index 96% rename from resources/views/v3/Reports/Mission/Violation/ProvinceActivityReport.blade.php rename to resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php index 398a98eb..be25c1e9 100644 --- a/resources/views/v3/Reports/Mission/Violation/ProvinceActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php @@ -46,7 +46,7 @@ - کد یکتا + شهر @@ -62,9 +62,9 @@ - @foreach ($data as $item) + @foreach ($rows as $item) - {{ $item['id'] ?? '-' }} + {{ $item['city_name'] ?? '-' }} {{ $item['no_mission_count'] ?? '-' }} {{ $item['out_of_area_count'] ?? '-' }} From 66cfb5ff096d7fe2168a4980e4e6b2a30f354322 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Sun, 4 Jan 2026 14:52:30 +0330 Subject: [PATCH 2/2] fix code --- app/Exports/V3/Mission/Report/ProvinceReport.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Exports/V3/Mission/Report/ProvinceReport.php b/app/Exports/V3/Mission/Report/ProvinceReport.php index cdc77205..6d79b39d 100644 --- a/app/Exports/V3/Mission/Report/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/ProvinceReport.php @@ -2,10 +2,8 @@ namespace App\Exports\V3\Mission\Report; -use App\Models\EdarateShahri; + use Illuminate\Contracts\View\View; -use Illuminate\Database\Eloquent\Collection; -use Illuminate\Http\Request; use Maatwebsite\Excel\Concerns\FromView; use Maatwebsite\Excel\Concerns\ShouldAutoSize; use Maatwebsite\Excel\Concerns\WithDrawings; @@ -13,7 +11,6 @@ use Maatwebsite\Excel\Concerns\WithEvents; use Maatwebsite\Excel\Events\AfterSheet; use PhpOffice\PhpSpreadsheet\Exception; use PhpOffice\PhpSpreadsheet\Worksheet\Drawing; -use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; class ProvinceReport implements FromView, WithEvents, ShouldAutoSize, WithDrawings {