change item in report mission

This commit is contained in:
2026-01-26 13:44:33 +03:30
parent 18fc3eaad5
commit 85d2dc5728
10 changed files with 367 additions and 267 deletions

View File

@@ -28,12 +28,16 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
if ($pid === -1) {
$national = [
'province_name' => $name,
'total_missions' => (int) ($r->total_missions ?? 0),
'taradod_khareg_mahdode' => (int) ($r->taradod_khareg_mahdode ?? 0),
'bafarayand_saeti' => (int) ($r->bafarayand_saeti ?? 0),
'bafarayand_rozaneh' => (int) ($r->bafarayand_rozaneh ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->bedon_bafarayand_saeti ?? 0),
'bedon_bafarayand_rozaneh' => (int) ($r->bedon_bafarayand_rozaneh ?? 0),
'total' => (int) ($r->total ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'gps' => (int) ($r->gps ?? 0),
'durations' => (int) ($r->durations ?? 0),
'bafarayand_saeti' => (int) ($r->far_h ?? 0),
'bafarayand_rozaneh' => (int) ($r->far_d ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0),
'bedon_bafarayand_rozaneh' => (int) ($r->un_far_d ?? 0),
'item' => (int) ($r->item ?? 0),
'patrol' => (int) ($r->patrol ?? 0),
];
continue;
@@ -45,12 +49,16 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
];
}
$grid[$pid]['total_missions'] = (int) ($r->total_missions ?? 0);
$grid[$pid]['taradod_khareg_mahdode'] = (int) ($r->taradod_khareg_mahdode ?? 0);
$grid[$pid]['bafarayand_saeti'] = (int) ($r->bafarayand_saeti ?? 0);
$grid[$pid]['bafarayand_rozaneh'] = (int) ($r->bafarayand_rozaneh ?? 0);
$grid[$pid]['bedon_bafarayand_saeti'] = (int) ($r->bedon_bafarayand_saeti ?? 0);
$grid[$pid]['bedon_bafarayand_rozaneh'] = (int) ($r->bedon_bafarayand_rozaneh ?? 0);
$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]['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);
$grid[$pid]['bedon_bafarayand_rozaneh'] = (int) ($r->un_far_d ?? 0);
$grid[$pid]['item'] = (int) ($r->item ?? 0);
$grid[$pid]['patrol'] = (int) ($r->patrol ?? 0);
}
$exportRows = [];
@@ -95,7 +103,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1');
$drawing2->setCoordinates('J1');
return [$drawing, $drawing2];
}

View File

@@ -29,12 +29,16 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
if ($cid === -1) {
$province = [
'city_name' => $name,
'total_missions' => (int) ($r->total_missions ?? 0),
'taradod_khareg_mahdode' => (int) ($r->taradod_khareg_mahdode ?? 0),
'bafarayand_saeti' => (int) ($r->bafarayand_saeti ?? 0),
'bafarayand_rozaneh' => (int) ($r->bafarayand_rozaneh ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->bedon_bafarayand_saeti ?? 0),
'bedon_bafarayand_rozaneh' => (int) ($r->bedon_bafarayand_rozaneh ?? 0),
'total' => (int) ($r->total ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'gps' => (int) ($r->gps ?? 0),
'durations' => (int) ($r->durations ?? 0),
'bafarayand_saeti' => (int) ($r->far_h ?? 0),
'bafarayand_rozaneh' => (int) ($r->far_d ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0),
'bedon_bafarayand_rozaneh' => (int) ($r->un_far_d ?? 0),
'item' => (int) ($r->item ?? 0),
'patrol' => (int) ($r->patrol ?? 0),
];
continue;
@@ -46,12 +50,16 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
];
}
$grid[$cid]['total_missions'] = (int) ($r->total_missions ?? 0);
$grid[$cid]['taradod_khareg_mahdode'] = (int) ($r->taradod_khareg_mahdode ?? 0);
$grid[$cid]['bafarayand_saeti'] = (int) ($r->bafarayand_saeti ?? 0);
$grid[$cid]['bafarayand_rozaneh'] = (int) ($r->bafarayand_rozaneh ?? 0);
$grid[$cid]['bedon_bafarayand_saeti'] = (int) ($r->bedon_bafarayand_saeti ?? 0);
$grid[$cid]['bedon_bafarayand_rozaneh'] = (int) ($r->bedon_bafarayand_rozaneh ?? 0);
$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]['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);
$grid[$cid]['bedon_bafarayand_rozaneh'] = (int) ($r->un_far_d ?? 0);
$grid[$cid]['item'] = (int) ($r->item ?? 0);
$grid[$cid]['patrol'] = (int) ($r->patrol ?? 0);
}
@@ -100,7 +108,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1');
$drawing2->setCoordinates('J1');
return [$drawing, $drawing2];
}

View File

@@ -28,11 +28,12 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
if ($pid === -1) {
$national = [
'province_name' => $name,
'total_violations' => (int) ($r->total_violations ?? 0),
'egdam_shode' => (int) ($r->egdam_shode ?? 0),
'bedone_egdam' => (int) ($r->bedone_egdam ?? 0),
'sabt_gps' => (int) ($r->sabt_gps ?? 0),
'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0),
];
continue;
@@ -43,13 +44,12 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
'province_name' => $name,
];
}
$grid[$pid]['total_violations'] = (int) ($r->total_violations ?? 0);
$grid[$pid]['egdam_shode'] = (int) ($r->egdam_shode ?? 0);
$grid[$pid]['bedone_egdam'] = (int) ($r->bedone_egdam ?? 0);
$grid[$pid]['sabt_gps'] = (int) ($r->sabt_gps ?? 0);
$grid[$pid]['sabt_herasat'] = (int) ($r->sabt_herasat ?? 0);
$grid[$pid]['total'] = (int) ($r->total ?? 0);
$grid[$pid]['egdam_shode'] = (int) ($r->done ?? 0);
$grid[$pid]['bedone_egdam'] = (int) ($r->undone ?? 0);
$grid[$pid]['sabt_gps'] = (int) ($r->gps ?? 0);
$grid[$pid]['sabt_herasat'] = (int) ($r->herasat ?? 0);
$grid[$pid]['mil_gps'] = (int) ($r->mil_gps ?? 0);
}
$exportRows = [];
@@ -94,7 +94,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1');
$drawing2->setCoordinates('E1');
return [$drawing, $drawing2];
}

View File

@@ -29,12 +29,12 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
if ($cid === -1) {
$province = [
'city_name' => $name,
'total_violations' => (int) ($r->total_violations ?? 0),
'egdam_shode' => (int) ($r->egdam_shode ?? 0),
'bedone_egdam' => (int) ($r->bedone_egdam ?? 0),
'sabt_gps' => (int) ($r->sabt_gps ?? 0),
'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0),
];
continue;
@@ -45,13 +45,12 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
'city_name' => $name,
];
}
$grid[$cid]['total_violations'] = (int) ($r->total_violations ?? 0);
$grid[$cid]['egdam_shode'] = (int) ($r->egdam_shode ?? 0);
$grid[$cid]['bedone_egdam'] = (int) ($r->bedone_egdam ?? 0);
$grid[$cid]['sabt_gps'] = (int) ($r->sabt_gps ?? 0);
$grid[$cid]['sabt_herasat'] = (int) ($r->sabt_herasat ?? 0);
$grid[$cid]['total'] = (int) ($r->total ?? 0);
$grid[$cid]['egdam_shode'] = (int) ($r->done ?? 0);
$grid[$cid]['bedone_egdam'] = (int) ($r->undone ?? 0);
$grid[$cid]['sabt_gps'] = (int) ($r->gps ?? 0);
$grid[$cid]['sabt_herasat'] = (int) ($r->herasat ?? 0);
$grid[$cid]['mil_gps'] = (int) ($r->mil_gps ?? 0);
}
$exportRows = [];
@@ -99,7 +98,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1');
$drawing2->setCoordinates('E1');
return [$drawing, $drawing2];
}