fix the country amount
This commit is contained in:
@@ -23,6 +23,20 @@ class CountryReport implements FromView, ShouldAutoSize, WithEvents, WithDrawing
|
||||
{
|
||||
$data = $this->data;
|
||||
|
||||
$country = array_search(-1, array_column($data['data'], 'province_id'));
|
||||
|
||||
$activities[] = [
|
||||
'name' => 'کل کشور',
|
||||
'tedade' => $data['data'][$country]->tedade,
|
||||
'police_rah' => $data['data'][$country]->police_rah,
|
||||
'gozaresh_gasht' => $data['data'][$country]->gozaresh_gasht,
|
||||
'kol_sabt_shode' => $data['data'][$country]->kol_sabt_shode,
|
||||
'vasel_shode' => $data['data'][$country]->vasel_shode ?? 0,
|
||||
'vasel_shode_bimeh' => $data['data'][$country]->vasel_shode_bimeh ?? 0,
|
||||
'vasel_shode_daghi' => $data['data'][$country]->vasel_shode_daghi ?? 0,
|
||||
'vasel_shode_final' => $data['data'][$country]->vasel_shode_final ?? 0,
|
||||
];
|
||||
|
||||
foreach (Province::all() as $province) {
|
||||
|
||||
$existingProvince = array_search($province->id, array_column($data['data'], 'province_id'));
|
||||
@@ -54,18 +68,6 @@ class CountryReport implements FromView, ShouldAutoSize, WithEvents, WithDrawing
|
||||
}
|
||||
}
|
||||
|
||||
$activities[] = [
|
||||
'name' => 'کشوری',
|
||||
'tedade' => $data['data'][-1]->tedade,
|
||||
'police_rah' => $data['data'][-1]->police_rah,
|
||||
'gozaresh_gasht' => $data['data'][-1]->gozaresh_gasht,
|
||||
'kol_sabt_shode' => $data['data'][-1]->kol_sabt_shode,
|
||||
'vasel_shode' => $data['data'][-1]->vasel_shode ?? 0,
|
||||
'vasel_shode_bimeh' => $data['data'][-1]->vasel_shode_bimeh ?? 0,
|
||||
'vasel_shode_daghi' => $data['data'][-1]->vasel_shode_daghi ?? 0,
|
||||
'vasel_shode_final' => $data['data'][-1]->vasel_shode_final ?? 0,
|
||||
];
|
||||
|
||||
return view('v3.Reports.AccidentReceipt.CountryReport', [
|
||||
'data' => $activities,
|
||||
'fromDate' => $data['fromDate'],
|
||||
|
||||
Reference in New Issue
Block a user