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

return more data in api

Browse Source
This commit is contained in:
amirghasempoor
2025-01-09 12:31:57 +03:30
parent 8060ff2d64
commit 1b4a6da397
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
View File

@@ -62,6 +62,7 @@ class RoadItemsReportController extends Controller
}); });
$activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem); $activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem);
$provinces = Province::all(['id', 'name_fa']);
$subItems = InfoItem::query() $subItems = InfoItem::query()
->where('item', $item) ->where('item', $item)
@@ -69,8 +70,8 @@ class RoadItemsReportController extends Controller
return $this->successResponse([ return $this->successResponse([
'activities' => $activities, 'activities' => $activities,
'items' => $infoItems,
'sub_items' => $subItems, 'sub_items' => $subItems,
'provinces' => $provinces,
]); ]);
} }
@@ -110,6 +111,7 @@ class RoadItemsReportController extends Controller
->get(); ->get();
$items = InfoItem::query()->where('item', $item)->get()->keyBy('sub_item'); $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) { $cityRoadItemsPerSubItem->each(function ($value) use ($items) {
if (isset($items[$value->t])) { if (isset($items[$value->t])) {
@@ -118,10 +120,14 @@ class RoadItemsReportController extends Controller
}); });
$activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem); $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([ return $this->successResponse([
'activities' => $activities, 'activities' => $activities,
'items' => $items 'edarateShahri' => $edarateShahri,
'sub_items' => $subItems,
]); ]);
} }

8
routes/v3.php
View File

@@ -195,10 +195,10 @@ Route::prefix('road_item_reports')
->controller(RoadItemsReportController::class) ->controller(RoadItemsReportController::class)
->group(function () { ->group(function () {
Route::get('/get_sub_items', 'getSubItems')->name('getSubItems'); Route::get('/get_sub_items', 'getSubItems')->name('getSubItems');
Route::get('/get_items', 'provinceActivityPerSubItem')->name('provinceActivityPerSubItem'); Route::get('/province_activity_per_sub_item', 'provinceActivityPerSubItem')->name('provinceActivityPerSubItem');
Route::get('/get_items_city', 'cityActivityPerSubItem')->name('cityActivityPerSubItem'); Route::get('/city_activity_per_sub_item', 'cityActivityPerSubItem')->name('cityActivityPerSubItem');
Route::get('/province_statistics', 'provinceActivityPerItem')->name('provinceActivityPerItem'); Route::get('/province_activity_per_item', 'provinceActivityPerItem')->name('provinceActivityPerItem');
Route::get('/city_statistics', 'cityActivityPerItem')->name('cityActivityPerItem'); Route::get('/city_activity_per_item', 'cityActivityPerItem')->name('cityActivityPerItem');
Route::get('/map', 'map')->name('map'); Route::get('/map', 'map')->name('map');
}); });