change structure report in safty and privecy

This commit is contained in:
2025-10-07 14:58:56 +03:30
parent c3b7780cf6
commit 6d0fa61989
4 changed files with 117 additions and 28 deletions

View File

@@ -17,9 +17,10 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
class AccessRoadActivityController extends Controller
{
use ApiResponse;
public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->countryActivity(90);
$data = $operatorService->countryActivity(90, $request);
return $this->successResponse([
'activities' => $data,
@@ -31,8 +32,8 @@ class AccessRoadActivityController extends Controller
{
$data = $operatorService->provinceActivity(
info_id: 90,
province_id: $request->input('province_id')
$request,
90,
);
return $this->successResponse([
@@ -42,7 +43,7 @@ class AccessRoadActivityController extends Controller
}
public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->countryActivity(90);
$data = $operatorService->countryActivity(90, $request);
$name = 'گزارش نگهداری حریم راه برای راه دسترسی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ExcelReport($data), $name);
}
@@ -50,8 +51,8 @@ class AccessRoadActivityController extends Controller
public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->provinceActivity(
info_id: 90,
province_id: $request->input('province_id')
$request,
90,
);
$name = 'گزارش نگهداری حریم راه برای راه دسترسی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new AccessRoadReport($data, $request), $name);

View File

@@ -20,7 +20,7 @@ class ConstructionActivityController extends Controller
use ApiResponse;
public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->countryActivity(89);
$data = $operatorService->countryActivity(89, $request);
return $this->successResponse([
'activities' => $data,
@@ -30,8 +30,8 @@ class ConstructionActivityController extends Controller
public function provinceActivity(Request $request, OperatorService $operatorService,): JsonResponse
{
$data = $operatorService->provinceActivity(
info_id: 89,
province_id: $request->input('province_id')
$request,
89,
);
return $this->successResponse([
@@ -46,7 +46,7 @@ class ConstructionActivityController extends Controller
*/
public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->countryActivity(89);
$data = $operatorService->countryActivity(89, $request);
$name = ' گزارش نگهداری حریم راه برای ساخت و ساز غیر مجاز' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ExcelReport($data), $name);
@@ -59,8 +59,8 @@ class ConstructionActivityController extends Controller
public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->provinceActivity(
info_id: 89,
province_id: $request->input('province_id')
$request,
89,
);
$name = ' گزارش نگهداری حریم راه برای ساخت و ساز غیر مجاز' . verta()->now()->format('Y-m-d H-i') . '.xlsx';

View File

@@ -20,7 +20,7 @@ class UtilityPassingActivityController extends Controller
public function countryActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->countryActivity(91);
$data = $operatorService->countryActivity(91, $request);
return $this->successResponse([
'activities' => $data,
@@ -30,8 +30,8 @@ class UtilityPassingActivityController extends Controller
public function provinceActivity(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->provinceActivity(
info_id: 91,
province_id: $request->input('province_id')
$request,
91,
);
return $this->successResponse([
@@ -41,7 +41,7 @@ class UtilityPassingActivityController extends Controller
}
public function countryExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->countryActivity(91);
$data = $operatorService->countryActivity(91, $request);
$name = 'گزارش نگهداری حریم راه برای عبور تاسیسات زیربنایی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new ExcelReport($data), $name);
@@ -50,8 +50,8 @@ class UtilityPassingActivityController extends Controller
public function provinceExcelActivity(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$data = $operatorService->provinceActivity(
info_id: 91,
province_id: $request->input('province_id')
$request,
91,
);
$name = 'گزارش نگهداری حریم راه برای عبور تاسیسات زیربنایی غیر مجاز ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';