refactor blade files
This commit is contained in:
@@ -61,28 +61,12 @@ class SafetyAndPrivacyTableService
|
||||
);
|
||||
|
||||
$countryTotalSum = 0;
|
||||
$activities[]["name_fa"] = 'کشوری';
|
||||
$activities[]["province_id"] = -1;
|
||||
foreach ($country as $key => $value) {
|
||||
$countryTotalSum += $value->qty;
|
||||
$activities[-1]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[-1]["sum"] = $countryTotalSum;
|
||||
}
|
||||
|
||||
|
||||
foreach (Province::all() as $key => $value) {
|
||||
$activities[$value->id]["info-89"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-89"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-89"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["info-90"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-90"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-90"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["info-91"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-91"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-91"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["sum"] = 0;
|
||||
$activities[$value->id]["name_fa"] = $value->name_fa;
|
||||
$activities[][$value->info_id][$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $countryTotalSum;
|
||||
}
|
||||
|
||||
$provinces = DB::select(
|
||||
@@ -92,9 +76,10 @@ class SafetyAndPrivacyTableService
|
||||
$provinceTotalSum = 0;
|
||||
foreach ($provinces as $key => $value) {
|
||||
$provinceTotalSum += $value->qty;
|
||||
$activities[$value->province_id]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[$value->province_id]["sum"] = $provinceTotalSum;
|
||||
$activities[$value->province_id]["province_fa"] = $value->province_fa;
|
||||
$activities[][$value->info_id][$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $provinceTotalSum;
|
||||
$activities[]["province_fa"] = $value->province_fa;
|
||||
$activities[]["province_id"] = $value->province_id;
|
||||
}
|
||||
|
||||
return [
|
||||
@@ -116,30 +101,14 @@ class SafetyAndPrivacyTableService
|
||||
');
|
||||
|
||||
$provinceTotalSum = 0;
|
||||
$activities[]["name_fa"] = 'استانی';
|
||||
$activities[]["edare_shahri_id"] = -1;
|
||||
foreach ($province as $key => $value) {
|
||||
$provinceTotalSum += $value->qty;
|
||||
$activities[-1]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[-1]["sum"] = $provinceTotalSum;
|
||||
$activities[]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[]["sum"] = $provinceTotalSum;
|
||||
}
|
||||
|
||||
foreach (\App\Models\EdarateShahri::query()->where('province_id', $provinceId)->get() as $key => $value) {
|
||||
$activities[$value->id]["info-89"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-89"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-89"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["info-90"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-90"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-90"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["info-91"]["step-1"] = 0;
|
||||
$activities[$value->id]["info-91"]["step-2"] = 0;
|
||||
$activities[$value->id]["info-91"]["step-3"] = 0;
|
||||
|
||||
$activities[$value->id]["sum"] = 0;
|
||||
$activities[$value->id]["name_fa"] = $value->name_fa;
|
||||
}
|
||||
|
||||
|
||||
$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
|
||||
');
|
||||
@@ -147,9 +116,10 @@ class SafetyAndPrivacyTableService
|
||||
$cityTotalSum = 0;
|
||||
foreach ($cities as $key => $value) {
|
||||
$cityTotalSum += $value->qty;
|
||||
$activities[$value->edare_shahri_id]["info-".$value->info_id]["step-".$value->step] = $value->qty;
|
||||
$activities[$value->edare_shahri_id][""] = $value;
|
||||
$activities[$value->edare_shahri_id]["sum"] = $cityTotalSum;
|
||||
$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;
|
||||
}
|
||||
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user