add more detail to api
This commit is contained in:
@@ -61,25 +61,61 @@ class SafetyAndPrivacyTableService
|
||||
);
|
||||
|
||||
$countryTotalSum = 0;
|
||||
$activities[]["name_fa"] = 'کشوری';
|
||||
$activities[]["province_id"] = -1;
|
||||
$countryData = [
|
||||
'name_fa' => 'کشوری',
|
||||
'province_id' => -1,
|
||||
'89' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'90' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'91' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
];
|
||||
foreach ($country as $key => $value) {
|
||||
$countryTotalSum += $value->qty;
|
||||
$activities[][$value->info_id][$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $countryTotalSum;
|
||||
$countryData[$value->info_id][$value->step] = $value->qty;
|
||||
$countryData["sum"] = $countryTotalSum;
|
||||
}
|
||||
$activities[] = $countryData;
|
||||
|
||||
$provinces = DB::select(
|
||||
"SELECT province_id, province_fa, COUNT(*) as qty,info_id, step, step_fa, info_fa FROM safety_and_privacy where created_at BETWEEN '".$fromDate."' and '".$toDate."' GROUP BY info_id,step,province_id,province_fa"
|
||||
);
|
||||
|
||||
$provinceTotalSum = 0;
|
||||
$provinceData = [
|
||||
'89' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'90' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'91' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
];
|
||||
foreach ($provinces as $key => $value) {
|
||||
$provinceTotalSum += $value->qty;
|
||||
$activities[][$value->info_id][$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $provinceTotalSum;
|
||||
$activities[]["province_fa"] = $value->province_fa;
|
||||
$activities[]["province_id"] = $value->province_id;
|
||||
$provinceData[$value->info_id][$value->step] = $value->qty;
|
||||
$provinceData["sum"] = $provinceTotalSum;
|
||||
$provinceData["province_fa"] = $value->province_fa;
|
||||
$provinceData["province_id"] = $value->province_id;
|
||||
$activities[] = $provinceData;
|
||||
}
|
||||
|
||||
return [
|
||||
@@ -101,25 +137,61 @@ class SafetyAndPrivacyTableService
|
||||
');
|
||||
|
||||
$provinceTotalSum = 0;
|
||||
$activities[]["name_fa"] = 'استانی';
|
||||
$activities[]["edare_shahri_id"] = -1;
|
||||
$provinceData = [
|
||||
'name_fa' => 'استانی',
|
||||
'edare_shahri_id' => -1,
|
||||
'89' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'90' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'91' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
];
|
||||
foreach ($province as $key => $value) {
|
||||
$provinceTotalSum += $value->qty;
|
||||
$activities[]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $provinceTotalSum;
|
||||
$provinceData["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$provinceData["sum"] = $provinceTotalSum;
|
||||
}
|
||||
$activities[] = $provinceData;
|
||||
|
||||
$cities = DB::select('
|
||||
SELECT edare_shahri_id, COUNT(*) as qty,info_id, step,step_fa, info_fa FROM safety_and_privacy where province_id ='.$provinceId.' and created_at BETWEEN "'.$fromDate.'" and "'.$toDate.'" GROUP BY info_id,step,edare_shahri_id
|
||||
');
|
||||
|
||||
$cityTotalSum = 0;
|
||||
$cityData = [
|
||||
'89' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'90' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
'91' => [
|
||||
'1' => 0,
|
||||
'2' => 0,
|
||||
'3' => 0,
|
||||
],
|
||||
];
|
||||
foreach ($cities as $key => $value) {
|
||||
$cityTotalSum += $value->qty;
|
||||
$activities[][$value->info_id][$value->step] = $value->qty;
|
||||
$activities[]["name_fa"] = \App\Models\EdarateShahri::query()->find($value->edare_shahri_id)->name_fa;
|
||||
$activities[]["edare_shahri_id"] = $value->edare_shahri_id;
|
||||
$activities[]["sum"] = $cityTotalSum;
|
||||
$cityData[$value->info_id][$value->step] = $value->qty;
|
||||
$cityData["name_fa"] = \App\Models\EdarateShahri::query()->find($value->edare_shahri_id)->name_fa;
|
||||
$cityData["edare_shahri_id"] = $value->edare_shahri_id;
|
||||
$cityData["sum"] = $cityTotalSum;
|
||||
$activities[] = $cityData;
|
||||
}
|
||||
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user