fix the country amount

This commit is contained in:
2025-02-24 11:55:24 +03:30
parent 918a91d52a
commit ff83fde991
6 changed files with 48 additions and 43 deletions

View File

@@ -23,6 +23,20 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithEvents, WithDrawin
$inputData = $this->data;
$reportData =$inputData['report'];
$province = array_search(-1, array_column($reportData, 'province_id'));
$activities[] = [
'name' => 'کل استان',
'tedade' => $reportData['data'][$province]->tedade,
'police_rah' => $reportData['data'][$province]->police_rah,
'gozaresh_gasht' => $reportData['data'][$province]->gozaresh_gasht,
'kol_sabt_shode' => $reportData['data'][$province]->kol_sabt_shode,
'vasel_shode' => $reportData['data'][$province]->vasel_shode ?? 0,
'vasel_shode_bimeh' => $reportData['data'][$province]->vasel_shode_bimeh ?? 0,
'vasel_shode_daghi' => $reportData['data'][$province]->vasel_shode_daghi ?? 0,
'vasel_shode_final' => $reportData['data'][$province]->vasel_shode_final ?? 0,
];
foreach ($inputData['cities'] as $city) {
$existingCity = array_search($city->id, array_column($inputData['data'], 'city_id'));
@@ -54,19 +68,6 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithEvents, WithDrawin
}
}
$activities[] = [
'name' => 'استانی',
'tedade' => $reportData['data'][-1]->tedade,
'police_rah' => $reportData['data'][-1]->police_rah,
'gozaresh_gasht' => $reportData['data'][-1]->gozaresh_gasht,
'kol_sabt_shode' => $reportData['data'][-1]->kol_sabt_shode,
'vasel_shode' => $reportData['data'][-1]->vasel_shode ?? 0,
'vasel_shode_bimeh' => $reportData['data'][-1]->vasel_shode_bimeh ?? 0,
'vasel_shode_daghi' => $reportData['data'][-1]->vasel_shode_daghi ?? 0,
'vasel_shode_final' => $reportData['data'][-1]->vasel_shode_final ?? 0,
];
return view('v3.Reports.AccidentReceipt.ProvinceReport', [
'data' => $activities,
'fromDate' => $reportData['fromDate'],