return more data in api
This commit is contained in:
@@ -62,6 +62,7 @@ class RoadItemsReportController extends Controller
|
||||
});
|
||||
|
||||
$activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem);
|
||||
$provinces = Province::all(['id', 'name_fa']);
|
||||
|
||||
$subItems = InfoItem::query()
|
||||
->where('item', $item)
|
||||
@@ -69,8 +70,8 @@ class RoadItemsReportController extends Controller
|
||||
|
||||
return $this->successResponse([
|
||||
'activities' => $activities,
|
||||
'items' => $infoItems,
|
||||
'sub_items' => $subItems,
|
||||
'provinces' => $provinces,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -110,6 +111,7 @@ class RoadItemsReportController extends Controller
|
||||
->get();
|
||||
|
||||
$items = InfoItem::query()->where('item', $item)->get()->keyBy('sub_item');
|
||||
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $province)->get(['id', 'name_fa']);
|
||||
|
||||
$cityRoadItemsPerSubItem->each(function ($value) use ($items) {
|
||||
if (isset($items[$value->t])) {
|
||||
@@ -118,10 +120,14 @@ class RoadItemsReportController extends Controller
|
||||
});
|
||||
|
||||
$activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem);
|
||||
$subItems = InfoItem::query()
|
||||
->where('item', $item)
|
||||
->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
|
||||
|
||||
return $this->successResponse([
|
||||
'activities' => $activities,
|
||||
'items' => $items
|
||||
'edarateShahri' => $edarateShahri,
|
||||
'sub_items' => $subItems,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user