diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php index 45b18fc7..be92abb6 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php @@ -252,7 +252,7 @@ class RoadItemsReportController extends Controller $request->toDate, ); - $name = "گزارش کشوری از فعالیت روزانه و جاری({}) - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx'; + $name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx'; return Excel::download(new CountryActivityPerSubItemReport($activities), $name); } @@ -268,7 +268,7 @@ class RoadItemsReportController extends Controller $request->province_id ); - $name = "گزارش استانی از فعالیت روزانه و جاری({}) - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx'; + $name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx'; return Excel::download(new ProvinceActivityPerSubItemReport($activities), $name); } diff --git a/app/Services/Reports/RoadItemReportService.php b/app/Services/Reports/RoadItemReportService.php index ae052bfe..c487d526 100644 --- a/app/Services/Reports/RoadItemReportService.php +++ b/app/Services/Reports/RoadItemReportService.php @@ -37,14 +37,12 @@ class RoadItemReportService ]; foreach ($subItems as $subItem) { - $totalItemCount[] = [ - "total_count_{$subItem->sub_item}" => $activities->sum("Count_{$subItem->sub_item}"), - "total_sum_{$subItem->sub_item}" => $activities->sum("Sum_{$subItem->sub_item}"), - ]; + $totalItemCount["Count_{$subItem->sub_item}"] = $activities->sum("Count_{$subItem->sub_item}"); + $totalItemCount["Sum_{$subItem->sub_item}"] = $activities->sum("Sum_{$subItem->sub_item}"); } return [ - 'data' => $activities->push($totalItemCount), + 'data' => $activities->push((object)$totalItemCount), 'fromDate' => $fromDate, 'toDate' => $toDate, 'details' => $subItems->keyBy('sub_item'), @@ -81,14 +79,12 @@ class RoadItemReportService ]; foreach ($subItems as $subItem) { - $totalItemCount[] = [ - "total_count_{$subItem->sub_item}" => $activities->sum("Count_{$subItem->sub_item}"), - "total_sum_{$subItem->sub_item}" => $activities->sum("Sum_{$subItem->sub_item}"), - ]; + $totalItemCount["Count_{$subItem->sub_item}"] = $activities->sum("Count_{$subItem->sub_item}"); + $totalItemCount["Sum_{$subItem->sub_item}"] = $activities->sum("Sum_{$subItem->sub_item}"); } return collect([ - 'data' => $activities->push($totalItemCount), + 'data' => $activities->push((object)$totalItemCount), 'fromDate' => $fromDate, 'toDate' => $toDate, 'details' => $subItems->keyBy('sub_item')