From b8e86dd03adbb942144a56ffe41ffabf67b1c8d8 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Mon, 22 Sep 2025 09:05:29 +0330 Subject: [PATCH] complete code for beeter form --- .../RoadObservation/ReportController.php | 9 ++-- .../RoadObservation/CountryReport.blade.php | 22 +++++----- .../RoadObservation/ProvinceReport.blade.php | 41 ++++++++----------- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php b/app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php index 3f6b42ce..bd401ecf 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\V3\Dashboard\RoadObservation; use App\Exports\V2\RoadObservation\ReportComplaintsExport; -use App\Exports\V3\SafetyAndPrivacy\Country\AccessRoadReport as ExcelReport; -use App\Exports\V3\SafetyAndPrivacy\Province\AccessRoadReport; +use App\Exports\V3\RoadObservation\CountryCartableReport; +use App\Exports\V3\RoadObservation\ProvinceCartableReport; use App\Facades\DataTable\DataTableFacade; use App\Http\Traits\ApiResponse; use App\Models\EdarateShahri; @@ -14,7 +14,6 @@ use App\Services\Cartables\SafetyAndPrivacy\OperatorService; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Maatwebsite\Excel\Facades\Excel; -use PhpOffice\PhpSpreadsheet\Exception; use Symfony\Component\HttpFoundation\BinaryFileResponse; class ReportController @@ -68,7 +67,7 @@ class ReportController { $data = $operatorService->countryActivity(); $name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - return Excel::download(new ReportComplaintsExport($data), $name); + return Excel::download(new CountryCartableReport($data), $name); } public function provinceActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse @@ -77,6 +76,6 @@ class ReportController province_id: $request->input('province_id') ); $name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; - return Excel::download(new AccessRoadReport($data, $request), $name); + return Excel::download(new ProvinceCartableReport($data, $request), $name); } } diff --git a/resources/views/v3/Reports/RoadObservation/CountryReport.blade.php b/resources/views/v3/Reports/RoadObservation/CountryReport.blade.php index d2aa8270..55ee1ea9 100644 --- a/resources/views/v3/Reports/RoadObservation/CountryReport.blade.php +++ b/resources/views/v3/Reports/RoadObservation/CountryReport.blade.php @@ -21,32 +21,31 @@ - - - + - - @@ -54,12 +53,13 @@ @foreach ($data as $item) - - - - - - + + + + + + + @endforeach diff --git a/resources/views/v3/Reports/RoadObservation/ProvinceReport.blade.php b/resources/views/v3/Reports/RoadObservation/ProvinceReport.blade.php index fb9c6b08..a8eb7e03 100644 --- a/resources/views/v3/Reports/RoadObservation/ProvinceReport.blade.php +++ b/resources/views/v3/Reports/RoadObservation/ProvinceReport.blade.php @@ -21,34 +21,31 @@
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
گزارش رسیدگی به شکایات واکنش سریع
کد یکتاجمع کل رسیدگی نشده اقدام شده اقدام نشده درحال بررسی تائید شده عدم تائید
{{ $item['id'] ?? '-' }}{{ $item['rms_status'] ?? '0' }}{{ $item['rms_status'] ?? '1' }}{{ $item['rms_status'] ?? '2' }}{{ $item['status'] ?? '0' }}{{ $item['status'] ?? '1' }}{{ $item['status'] ?? '2' }}{{ $item['total'] ?? '-' }}{{ $item['resideginaShode'] ?? '-' }}{{ $item['egdamshode'] ?? '-' }}{{ $item['egdamnashodeh'] ?? '-' }}{{ $item['darhalbarasi'] ?? '-' }}{{ $item['taayidshode'] ?? '-' }}{{ $item['adamtaayid'] ?? '-' }}
- - - - - - - - - - - - - + + + + + + + @@ -56,15 +53,13 @@ @foreach ($data as $item) - - - - - - - - - + + + + + + + @endforeach
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
- گزارش رسیدگی به شکایات واکنش سریع + گزارش رسیدگی به شکایات واکنش سریع
کد یکتاکد سوانحاستانادارهموضوع گزارشنوع گزارشتوضیح گزارشموقعیت مکانیشماره تماس گیرندهتاریخ ثبتجمع کلرسیدگی نشدهاقدام شده اقدام نشده درحال بررسیتائید شدهعدم تائید
{{ $item['id'] ?? '-' }}{{ $item['fk_RegisteredEventMessage'] ?? '-' }}{{ $item['province_fa'] ?? '-' }}{{ $item['edarate_shahri_name_fa'] ?? '-' }}{{ $item['Title'] ?? '-' }}{{ $item['FeatureTypeTitle'] ?? '-' }}{{ $item['Description'] ?? '-' }}{{ isset($item['lat']) && isset($item['lng']) ? $item['lat'] . ' ' . $item['lng'] : '-' }}{{ $item['MobileForSendEventSms'] ?? '-' }}{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}{{ $item['total'] ?? '-' }}{{ $item['resideginaShode'] ?? '-' }}{{ $item['egdamshode'] ?? '-' }}{{ $item['egdamnashodeh'] ?? '-' }}{{ $item['darhalbarasi'] ?? '-' }}{{ $item['taayidshode'] ?? '-' }}{{ $item['adamtaayid'] ?? '-' }}