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

add report for road item

Browse Source
This commit is contained in:
amirghasempoor
2025-06-16 13:12:39 +03:30
committed by joddyabott
parent 6df79c320e
commit d643edebee
3 changed files with 23 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php → app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Reports;
namespace App\Http\Controllers\V3\Dashboard\RoadItem;
use App\Exports\V3\RoadItemsProjects\CountryActivityPerItemReport;
use App\Exports\V3\RoadItemsProjects\CountryActivityPerSubItemReport;
@@ -12,15 +12,16 @@ use App\Models\EdarateShahri;
use App\Models\InfoItem;
use App\Models\Province;
use App\Models\RoadItemsProject;
use App\Services\Cartables\RoadItemTableService;
use App\Services\Cartables\RoadItem\ReportService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class RoadItemsReportController extends Controller
class ReportController extends Controller
{
use ApiResponse;
public function getSubItems(): JsonResponse
{
$data = InfoItem::all();
@@ -32,9 +33,9 @@ class RoadItemsReportController extends Controller
]);
}
public function countryActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
public function countryActivityPerSubItem(Request $request, ReportService $reportService): JsonResponse
{
$activities = $roadItemTableService->countryActivityPerSubItem($request);
$activities = $reportService->countryActivityPerSubItem($request);
$provinces = Province::all(['id', 'name_fa']);
$subItems = InfoItem::query()
->where('item', $request->item)
@@ -47,9 +48,9 @@ class RoadItemsReportController extends Controller
]);
}
public function provinceActivityPerSubItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
public function provinceActivityPerSubItem(Request $request, ReportService $reportService): JsonResponse
{
$activities = $roadItemTableService->provinceActivityPerSubItem($request);
$activities = $reportService->provinceActivityPerSubItem($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
@@ -64,13 +65,13 @@ class RoadItemsReportController extends Controller
]);
}
public function countryActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
public function countryActivityPerItem(Request $request, ReportService $reportService): JsonResponse
{
if (auth()->check()) {
auth()->user()->addActivityComplete(1033);
}
$activities = $roadItemTableService->countryActivityPerItem($request);
$activities = $reportService->countryActivityPerItem($request);
$provinces = Province::all(['id', 'name_fa']);
return $this->successResponse([
@@ -79,9 +80,9 @@ class RoadItemsReportController extends Controller
]);
}
public function provinceActivityPerItem(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
public function provinceActivityPerItem(Request $request, ReportService $reportService): JsonResponse
{
$activities = $roadItemTableService->provinceActivityPerItem($request);
$activities = $reportService->provinceActivityPerItem($request);
$edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
return $this->successResponse([
@@ -90,11 +91,11 @@ class RoadItemsReportController extends Controller
]);
}
public function countryActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
public function countryActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$activities = $roadItemTableService->countryActivityPerItem($request);
$activities = $reportService->countryActivityPerItem($request);
return Excel::download(new CountryActivityPerItemReport([
'activities' => $activities,
'provinces' => Province::all(['id', 'name_fa']),
@@ -102,11 +103,11 @@ class RoadItemsReportController extends Controller
]), $name);
}
public function provinceActivityExcelPerItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
public function provinceActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$activities = $roadItemTableService->provinceActivityPerItem($request);
$activities = $reportService->provinceActivityPerItem($request);
return Excel::download(new ProvinceActivityPerItemReport([
'activities' => $activities,
'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
@@ -114,11 +115,11 @@ class RoadItemsReportController extends Controller
]), $name);
}
public function countryActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
public function countryActivityExcelPerSubItem(Request $request, ReportService $reportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$activities = $roadItemTableService->countryActivityPerSubItem($request);
$activities = $reportService->countryActivityPerSubItem($request);
$subItems = InfoItem::query()
->where('item', $request->item)
->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
@@ -130,10 +131,10 @@ class RoadItemsReportController extends Controller
]), $name);
}
public function provinceActivityExcelPerSubItem(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
public function provinceActivityExcelPerSubItem(Request $request, ReportService $reportService): BinaryFileResponse
{
auth()->user()->addActivityComplete(1034);
$activities = $roadItemTableService->provinceActivityPerSubItem($request);
$activities = $reportService->provinceActivityPerSubItem($request);
$name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
$subItems = InfoItem::query()
->where('item', $request->item)

65
app/Services/Cartables/RoadItemTableService.php → app/Services/Cartables/RoadItem/ReportService.php
View File

@@ -1,73 +1,12 @@
<?php
namespace App\Services\Cartables;
namespace App\Services\Cartables\RoadItem;
use App\Facades\DataTable\DataTableFacade;
use App\Models\InfoItem;
use App\Models\RoadItemsProject;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
class RoadItemTableService
class ReportService
{
public function supervisorCartableReport(Request $request, $loadRelations = false)
{
$allowedFilters = ['*'];
$allowedSortings = ['*'];
$user = auth()->user();
$query = null;
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()
->select(['id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
}
elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
if (is_null($user->province_id)) {
return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
}
$query = RoadItemsProject::query()
->select(['id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->where('province_id', auth()->user()->province_id)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
}
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: $allowedFilters,
allowedSortings: $allowedSortings);
return $data;
}
public function operatorCartableReport(Request $request, $loadRelations = false)
{
$allowedFilters = ['*'];
$allowedSortings = ['*'];
$query = RoadItemsProject::query()
->select(['id', 'province_fa', 'edarat_name', 'supervisor_description', 'item', 'item_fa', 'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'])
->where('is_new', 1)
->where('user_id', auth()->user()->id)
->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));;
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: $allowedFilters,
allowedSortings: $allowedSortings);
return $data;
}
public function countryActivityPerSubItem(Request $request): array
{
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();

2
routes/v3.php
View File

@@ -218,7 +218,7 @@ Route::prefix('observed_items')
Route::prefix('road_item_reports')
->name('roadItemReports.')
->controller(RoadItemsReportController::class)
->controller(\App\Http\Controllers\V3\Dashboard\RoadItem\ReportController::class)
->group(function () {
Route::get('/get_sub_items', 'getSubItems')->name('getSubItems');
Route::get('/country_activity_per_sub_item', 'countryActivityPerSubItem')->name('countryActivityPerSubItem');