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

write meaningful names

Browse Source
This commit is contained in:
amirghasempoor
2025-01-07 16:53:15 +03:30
parent 53dd73103b
commit 6b310a099a
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/V3/Reports/RoadItemsReportController.php
View File

@@ -24,13 +24,13 @@ class RoadItemsReportController extends Controller
]); ]);
} }
public function getItems(Request $request): JsonResponse public function getRoadItemsPerSubItem(Request $request): JsonResponse
{ {
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString(); $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item; $item = $request->item;
$all = RoadItemsProject::query()->selectRaw(' $provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t, sub_item AS t,
COUNT(*) AS c, 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, CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
@@ -41,7 +41,7 @@ class RoadItemsReportController extends Controller
->groupBy('province_id', 'sub_item') ->groupBy('province_id', 'sub_item')
->get(); ->get();
$country = RoadItemsProject::query()->selectRaw(' $countryRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t, sub_item AS t,
COUNT(*) AS c, 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, CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
@@ -52,29 +52,29 @@ class RoadItemsReportController extends Controller
->groupBy('sub_item') ->groupBy('sub_item')
->get(); ->get();
$itemsFa = InfoItem::query()->where('item', '=', $item)->get()->keyBy('sub_item'); $infoItems = InfoItem::query()->where('item', '=', $item)->get()->keyBy('sub_item');
$all->each(function ($value) use ($itemsFa) { $provinceRoadItemsPerSubItem->each(function ($value) use ($infoItems) {
if (isset($itemsFa[$value->t])) { if (isset($infoItems[$value->t])) {
$value->u = $itemsFa[$value->t]->sub_item_unit; $value->u = $infoItems[$value->t]->sub_item_unit;
} }
}); });
return $this->successResponse([ return $this->successResponse([
'data' => $all, 'provincesData' => $provinceRoadItemsPerSubItem,
'country' => $country, 'countryData' => $countryRoadItemsPerSubItem,
'items_fa' => $itemsFa 'items' => $infoItems
]); ]);
} }
public function getItemsCity(Request $request): JsonResponse public function getCityRoadItemsPerSubItem(Request $request): JsonResponse
{ {
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
$toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString(); $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
$item = $request->item; $item = $request->item;
$province = $request->province_id; $province = $request->province_id;
$all = RoadItemsProject::query()->selectRaw(' $cityRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
sub_item AS t, sub_item AS t,
COUNT(*) AS c, 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, CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
@@ -88,17 +88,17 @@ class RoadItemsReportController extends Controller
->groupBy('edarat_id', 'sub_item') ->groupBy('edarat_id', 'sub_item')
->get(); ->get();
$itemsFa = InfoItem::where('item', $item)->get()->keyBy('sub_item'); $items = InfoItem::where('item', $item)->get()->keyBy('sub_item');
$all->each(function ($value) use ($itemsFa) { $cityRoadItemsPerSubItem->each(function ($value) use ($items) {
if (isset($itemsFa[$value->t])) { if (isset($items[$value->t])) {
$value->u = $itemsFa[$value->t]->sub_item_unit; $value->u = $items[$value->t]->sub_item_unit;
} }
}); });
return $this->successResponse([ return $this->successResponse([
'data' => $all, 'citiesData' => $cityRoadItemsPerSubItem,
'items_fa' => $itemsFa 'items' => $items
]); ]);
} }

4
routes/v3.php
View File

@@ -195,8 +195,8 @@ 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', 'getItems')->name('getItems'); Route::get('/get_items', 'getRoadItemsPerSubItem')->name('getRoadItemsPerSubItem');
Route::get('/get_items_city', 'getItemsCity')->name('getItemsCity'); Route::get('/get_items_city', 'getCityRoadItemsPerSubItem')->name('getCityRoadItemsPerSubItem');
Route::get('/province_statistics', 'activityStatisticsPerProvince')->name('activityStatisticsPerProvince'); Route::get('/province_statistics', 'activityStatisticsPerProvince')->name('activityStatisticsPerProvince');
Route::get('/city_statistics', 'activityStatisticsPerCity')->name('activityStatisticsPerCity'); Route::get('/city_statistics', 'activityStatisticsPerCity')->name('activityStatisticsPerCity');
Route::get('/map', 'map')->name('map'); Route::get('/map', 'map')->name('map');