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 79% rename from app/Exports/V3/Mission/Violation/ProvinceReport.php rename to app/Exports/V3/Mission/Report/ProvinceReport.php index 7b26540a..6d79b39d 100644 --- a/app/Exports/V3/Mission/Violation/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/ProvinceReport.php @@ -1,11 +1,9 @@ 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 +35,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 +53,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 +90,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'] ?? '-' }}