add sub item to api
This commit is contained in:
@@ -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([
|
return $this->successResponse([
|
||||||
'activities' => [$provinceRoadItemsPerSubItem, $countryRoadItemsPerSubItem],
|
'activities' => $activities,
|
||||||
'items' => $infoItems
|
'items' => $infoItems,
|
||||||
|
'sub_items' => $subItems,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,8 +117,10 @@ class RoadItemsReportController extends Controller
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem);
|
||||||
|
|
||||||
return $this->successResponse([
|
return $this->successResponse([
|
||||||
'activities' => [$cityRoadItemsPerSubItem, $provinceRoadItemsPerSubItem],
|
'activities' => $activities,
|
||||||
'items' => $items
|
'items' => $items
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user