RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return the correct data values

Browse Source
This commit is contained in:
amirghasempoor
2025-04-15 11:14:38 +03:30
parent 8d138b8339
commit b46bd53254
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V3/Dashboard/Reports/SafetyAndPrivacyReportController.php
View File

@@ -22,7 +22,7 @@ class SafetyAndPrivacyReportController extends Controller
{
$data = $safetyAndPrivacyTableService->countryActivity($request);
return $this->successResponse([
'activities' => $data['activities'],
'activities' => $data,
'provinces' => Province::all(['id', 'name_fa'])
]);
}
@@ -31,7 +31,7 @@ class SafetyAndPrivacyReportController extends Controller
{
$data = $safetyAndPrivacyTableService->provinceActivity($request);
return $this->successResponse([
'activities' => $data['activities'],
'activities' => $data,
'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
]);
}

10
app/Services/Cartables/SafetyAndPrivacyTableService.php
View File

@@ -72,14 +72,14 @@ class SafetyAndPrivacyTableService
'90' => ['1' => 0, '2' => 0, '3' => 0,],
'91' => ['1' => 0, '2' => 0, '3' => 0,],
];
foreach ($country as $key => $value) {
foreach ($country['data'] as $key => $value) {
$countryTotalSum += $value->qty;
$countryData[$value->info_id][$value->step] = $value->qty;
$countryData["sum"] = $countryTotalSum;
}
$activities[] = (object) $countryData;
$provinceQuery = Province::query()->selectRaw('province_id, province_fa, COUNT(*) as qty,info_id, step');
$provinceQuery = SafetyAndPrivacy::query()->selectRaw('province_id, province_fa, COUNT(*) as qty,info_id, step');
$provinces = DataTableFacade::run(
$provinceQuery,
$request,
@@ -88,7 +88,7 @@ class SafetyAndPrivacyTableService
allowedGroupBy: ['info_id', 'step', 'province_id', 'province_fa']
);
foreach ($provinces as $value)
foreach ($provinces['data'] as $value)
{
$provinceId = $value->province_id;
if (!isset($activities[$provinceId])) {
@@ -129,7 +129,7 @@ class SafetyAndPrivacyTableService
'90' => ['1' => 0, '2' => 0, '3' => 0,],
'91' => ['1' => 0, '2' => 0, '3' => 0,],
];
foreach ($province as $key => $value) {
foreach ($province['data'] as $key => $value) {
$provinceTotalSum += $value->qty;
$provinceData["sum"] = $provinceTotalSum;
$provinceData[$value->info_id][$value->step] = $value->qty;
@@ -145,7 +145,7 @@ class SafetyAndPrivacyTableService
allowedGroupBy: ['info_id', 'step', 'edare_shahri_id']
);
foreach ($cities as $value)
foreach ($cities['data'] as $value)
{
$cityId = $value->edare_shahri_id;
if (!isset($activities[$cityId])) {