diff --git a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php index 425879b5..69e2b66d 100644 --- a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php @@ -69,7 +69,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $exportRows[] = $row; } - return view('v3.Reports.Mission.Report.CountryActivityReport', [ + return view('v3.Reports.Mission.Report.Tradod .CountryActivityReport', [ 'rows' => $exportRows, ]); } diff --git a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php index e56d6cef..28e31bd0 100644 --- a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php @@ -71,7 +71,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven $exportRows[] = $row; } - return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ + return view('v3.Reports.Mission.Report.Tradod .ProvinceActivityReport', [ 'rows' => $exportRows, ]); } diff --git a/app/Exports/V3/Mission/Report/Violation/CountryReport.php b/app/Exports/V3/Mission/Report/Violation/CountryReport.php index 7862ec52..b38b65a4 100644 --- a/app/Exports/V3/Mission/Report/Violation/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Violation/CountryReport.php @@ -30,7 +30,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent 'province_name' => $name, 'total' => (int) ($r->total ?? 0), 'egdam_shode' => (int) ($r->done ?? 0), - 'bedone_egdam' => (int) ($r->undon ?? 0), + 'bedone_egdam' => (int) ($r->undone ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0), diff --git a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php index 17adae78..29a52806 100644 --- a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php @@ -31,7 +31,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven 'city_name' => $name, 'total' => (int) ($r->total ?? 0), 'egdam_shode' => (int) ($r->done ?? 0), - 'bedone_egdam' => (int) ($r->undon ?? 0), + 'bedone_egdam' => (int) ($r->undone ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0), diff --git a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php index a70cc052..2f929a97 100644 --- a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php @@ -5,7 +5,7 @@ -