diff --git a/app/Exports/V3/RoadItemsProjects/CountryActivityPerSubItemReport.php b/app/Exports/V3/RoadItemsProjects/CountryActivityPerSubItemReport.php index 9d6426fa..c54e9f9e 100644 --- a/app/Exports/V3/RoadItemsProjects/CountryActivityPerSubItemReport.php +++ b/app/Exports/V3/RoadItemsProjects/CountryActivityPerSubItemReport.php @@ -24,10 +24,11 @@ class CountryActivityPerSubItemReport implements FromView, WithEvents, ShouldAut { $activities = $this->activities; - return view('', [ + return view('v3.Reports.RoadItems.CountryActivityPerSubItem', [ 'activities' => $activities->data, 'fromDate' => $activities->fromDate, - 'toDate' => $activities->toDate + 'toDate' => $activities->toDate, + 'details' => $activities->details ]); } diff --git a/app/Http/Controllers/DevelopController.php b/app/Http/Controllers/DevelopController.php index 9fa55bde..d7eaec3e 100644 --- a/app/Http/Controllers/DevelopController.php +++ b/app/Http/Controllers/DevelopController.php @@ -658,7 +658,7 @@ class DevelopController extends Controller $save = $file->move(storage_path('images'), $fileName); - \App\Helpers\Compress::resize($save); +// \App\Helpers\Compress::resize($save); return response()->json(['msg' => 'ok']); } diff --git a/app/Http/Controllers/RoadItemsProjectController.php b/app/Http/Controllers/RoadItemsProjectController.php index ff774208..502f8ad1 100644 --- a/app/Http/Controllers/RoadItemsProjectController.php +++ b/app/Http/Controllers/RoadItemsProjectController.php @@ -154,13 +154,13 @@ class RoadItemsProjectController extends Controller $after = $request->file('after_image')->store('road_items_projects_new/after', 'public'); $roadItems->files()->create(['path' => $after]); $urlAfter = "/var/www/rms/public/storage/{$after}"; - \App\Helpers\Compress::resize($urlAfter); +// \App\Helpers\Compress::resize($urlAfter); } if ($request->has('before_image')) { $before = $request->file('before_image')->store('/road_items_projects_new/before', 'public'); $roadItems->files()->create(['path' => $before]); $urlBefore = "/var/www/rms/public/storage/{$before}"; - \App\Helpers\Compress::resize($urlBefore); +// \App\Helpers\Compress::resize($urlBefore); } if (auth()->user()) { diff --git a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php index 445db4ad..e6e8e907 100644 --- a/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php +++ b/app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php @@ -372,7 +372,7 @@ class RoadItemsProjectController extends Controller ]); // $road_item->files()->create(['path' => $after]); $urlAfter = "/var/www/rms/public/storage/{$after}"; - \App\Helpers\Compress::resize($urlAfter); +// \App\Helpers\Compress::resize($urlAfter); } if ($request->has('before_image')) { Storage::delete('public/'. $road_item->files[1]->path); @@ -383,7 +383,7 @@ class RoadItemsProjectController extends Controller ]); // $road_item->files()->create(['path' => $before]); $urlBefore = "/var/www/rms/public/storage/{$before}"; - \App\Helpers\Compress::resize($urlBefore); +// \App\Helpers\Compress::resize($urlBefore); } } diff --git a/app/Services/Reports/RoadItemReportService.php b/app/Services/Reports/RoadItemReportService.php index 25ae1cdc..34da3e02 100644 --- a/app/Services/Reports/RoadItemReportService.php +++ b/app/Services/Reports/RoadItemReportService.php @@ -11,10 +11,10 @@ class RoadItemReportService { public function countryActivityPerSubItem(int $item, string $fromDate, string $toDate): Collection { - $subItems = InfoItem::query()->where('item', $item)->get(['sub_item', 'sub_item_str']); + $subItems = InfoItem::query()->where('item', $item)->get(['sub_item', 'sub_item_str', 'sub_item_unit']); $query = DB::table('road_items_projects') - ->selectRaw('province_id, province_fa'); + ->selectRaw('province_id, province_fa, sub_item'); foreach ($subItems as $subItem) { $query->selectRaw(" @@ -31,25 +31,36 @@ class RoadItemReportService $activities = $query->get(); + $totalItemCount = [ + 'province_fa' => 'کشوری' + ]; + + 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}"), + ]; + } + return collect([ - 'data' => $activities, + 'data' => $activities->push($totalItemCount), 'fromDate' => $fromDate, 'toDate' => $toDate, - 'titles' => $subItems->pluck('sub_item_str') + 'details' => $subItems, ]); } public function provinceActivityPerSubItem(int $item, string $fromDate, string $toDate, int $provinceId): Collection { - $subItems = InfoItem::subItems($item); + $subItems = InfoItem::query()->where('item', $item)->get(['sub_item', 'sub_item_str', 'sub_item_unit']); $query = DB::table('road_items_projects') ->selectRaw('province_id, province_fa, user_name as city_fa, city_id'); - foreach ($subItems as $key => $name) { + foreach ($subItems as $subItem) { $query->selectRaw(" - COUNT(CASE WHEN sub_item = {$key} THEN 1 END) as {$name}Count, - SUM(CASE WHEN sub_item = {$key} THEN sub_item_data END) as {$name}Sum + COUNT(CASE WHEN sub_item = {$subItem->sub_item} THEN 1 END) as Count_{$subItem->sub_item}, + SUM(CASE WHEN sub_item = {$subItem->sub_item} THEN sub_item_data END) as Sum_{$subItem->sub_item} "); } @@ -66,6 +77,7 @@ class RoadItemReportService 'data' => $activities, 'fromDate' => $fromDate, 'toDate' => $toDate, + 'details' => $subItems ]); } } \ No newline at end of file diff --git a/resources/views/v3/Reports/RoadItems/CountryActivityPerSubItem.blade.php b/resources/views/v3/Reports/RoadItems/CountryActivityPerSubItem.blade.php new file mode 100644 index 00000000..b1f288a5 --- /dev/null +++ b/resources/views/v3/Reports/RoadItems/CountryActivityPerSubItem.blade.php @@ -0,0 +1,70 @@ + + + + + + + کشوری + + + + + + + + + + + + + + + + > + + + + + + + @foreach($details as $detail) + + + + + + + @foreach ($activities as $activity) + + + + @if($activity->sub_item == $detail->sub_item) + + + @endif + + + @endforeach + @endforeach + +
+ تاریخ دریافت گزارش: {{verta()->now()->format('Y/m/d H:i')}} +
+ تعداد و احجام فعالیت های روزانه و جاری راهداری ثبت شده از تاریخ + {{verta($fromDate)->format('Y/n/j')}} + تا + تاریخ + {{verta($toDate)->format('Y/n/j')}} +
اداره کل
+
+ {{ $detail->sub_item_str }} +
+ تعداد + {{ $detail->unit }}مجموع +
+
+
{{ $activity->province_fa }}{{ $activity->Count_ }}{{ round($activity->Sum_, 1) }}
+ + + + \ No newline at end of file