diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php index 0f8df544..103e4870 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php @@ -61,9 +61,16 @@ class RoadItemsReportController extends Controller } }); + $activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem); + + $subItems = InfoItem::query() + ->where('item', $item) + ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']); + return $this->successResponse([ - 'activities' => [$provinceRoadItemsPerSubItem, $countryRoadItemsPerSubItem], - 'items' => $infoItems + 'activities' => $activities, + 'items' => $infoItems, + 'sub_items' => $subItems, ]); } @@ -110,8 +117,10 @@ class RoadItemsReportController extends Controller } }); + $activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem); + return $this->successResponse([ - 'activities' => [$cityRoadItemsPerSubItem, $provinceRoadItemsPerSubItem], + 'activities' => $activities, 'items' => $items ]); }