merge the response data to one array

This commit is contained in:
2025-01-09 11:25:51 +03:30
parent c79caa2193
commit a246108aca

View File

@@ -62,8 +62,7 @@ class RoadItemsReportController extends Controller
}); });
return $this->successResponse([ return $this->successResponse([
'provincesData' => $provinceRoadItemsPerSubItem, 'activities' => [$provinceRoadItemsPerSubItem, $countryRoadItemsPerSubItem],
'countryData' => $countryRoadItemsPerSubItem,
'items' => $infoItems 'items' => $infoItems
]); ]);
} }
@@ -89,6 +88,20 @@ class RoadItemsReportController extends Controller
->groupBy('edarat_id', 'sub_item') ->groupBy('edarat_id', 'sub_item')
->get(); ->get();
$provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t,
COUNT(*) AS c,
CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
province_id AS p,
-1 AS ci
')
->where('item', '=', $item)
->where('province_id', '=', $province)
->whereBetween('activity_date_time', [$fromDate, $toDate])
->where('status', '=', 1)
->groupBy('sub_item')
->get();
$items = InfoItem::query()->where('item', $item)->get()->keyBy('sub_item'); $items = InfoItem::query()->where('item', $item)->get()->keyBy('sub_item');
$cityRoadItemsPerSubItem->each(function ($value) use ($items) { $cityRoadItemsPerSubItem->each(function ($value) use ($items) {
@@ -98,7 +111,7 @@ class RoadItemsReportController extends Controller
}); });
return $this->successResponse([ return $this->successResponse([
'citiesData' => $cityRoadItemsPerSubItem, 'activities' => [$cityRoadItemsPerSubItem, $provinceRoadItemsPerSubItem],
'items' => $items 'items' => $items
]); ]);
} }