add new blade for reports

2025-02-04 13:09:27 +03:30
parent 967d0e6db8
commit cd9d8211f4
7 changed files with 228 additions and 9 deletions
--- a/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php
@@ -100,7 +100,7 @@ class RoadItemsProjectController extends Controller
    {
        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
        $data = $roadItemReportService->supervisorCartableReport($request);
-        return Excel::download(new SupervisorCartableReport($data), $name);
+        return Excel::download(new SupervisorCartableReport($data['data']), $name);
    }

    public function operatorIndex(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
@@ -268,6 +268,6 @@ class RoadItemsProjectController extends Controller
    {
        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
        $data = $roadItemReportService->operatorCartableReport($request);
-        return Excel::download(new OperatorCartableReport($data), $name);
+        return Excel::download(new OperatorCartableReport($data['data']), $name);
    }
 }
--- a/app/Services/DataTable/DataTableInput.php
+++ b/app/Services/DataTable/DataTableInput.php
@@ -15,10 +15,10 @@ class DataTableInput
     * @param array $rels
     */
    public function __construct(
-        private int   $start,
+        private ?int   $start,
        private ?int   $size,
        private array $filters,
-        private array $sorting,
+        private ?array $sorting,
        private array $rels,
        private array $allowedFilters,
        private array $allowedSortings,
@@ -74,6 +74,4 @@ class DataTableInput
    {
        return $this->rels;
    }
-
-
 }
--- a/app/Services/DataTable/DataTableService.php
+++ b/app/Services/DataTable/DataTableService.php
@@ -76,7 +76,9 @@ class DataTableService

        $this->totalRowCount = $query->count();

-        $query->offset($this->dataTableInput->getStart());
+        if (!is_null($this->dataTableInput->getStart())) {
+            $query->offset($this->dataTableInput->getStart());
+        }

        if(!is_null($this->dataTableInput->getSize())){
            $query->limit($this->dataTableInput->getSize());
--- a/app/Services/DataTable/Validators/FilterValidator.php
+++ b/app/Services/DataTable/Validators/FilterValidator.php
@@ -50,7 +50,7 @@ class FilterValidator

    protected function isAllowed(Filter $filter, array $allowedFilters): bool
    {
-        return in_array($filter->getId(), $allowedFilters);
+        return $allowedFilters == ['*'] || in_array($filter->getId(), $allowedFilters);
    }

    protected function isValidSearchFunction(Filter $filter): bool
--- a/app/Services/DataTable/Validators/SortingValidator.php
+++ b/app/Services/DataTable/Validators/SortingValidator.php
@@ -34,6 +34,6 @@ class SortingValidator

    protected function isAllowed(Sort $sorting, array $allowedSortings): bool
    {
-        return in_array($sorting->getId(), $allowedSortings);
+        return $allowedSortings == ['*'] || in_array($sorting->getId(), $allowedSortings);
    }
 }
--- a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش فعالیت های روزانه و جاری</title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+                گزارش کارتابل عملیات فعالیت های روزانه و جاری از تاریخ
+                {{ verta($fromDate)->format('Y/n/j') }}
+                تا
+                تاریخ
+                {{ verta($toDate)->format('Y/n/j') }}
+
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">کد
+            یکتا</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">آیتم
+            فعالیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            موضوع مشاهده شده</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            مقدار</th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نقطه شروع</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نقطه پایان</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تاریخ ثبت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تاریخ فعالیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            توضیحات ناظر</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($data as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['item_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['sub_item_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">
+                {{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' :  $item['sub_item_data'] . '(-)') : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">{{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' .  $item['start_lng'] : '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ isset($item['end_lat']) && isset($item['end_lng']) ? $item['end_lat'] . ' ' . $item['end_lng'] : '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['supervisor_description'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+
+</html>
--- a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>گزارش فعالیت های روزانه و جاری</title>
+
+    <style>
+        table,
+        th,
+        td {
+            border: 1px solid black;
+        }
+    </style>
+</head>
+
+<body dir="rtl" style="text-align: center;">
+
+<table>
+    <thead>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
+            تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
+        </th>
+    </tr>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
+        </th>
+    </tr>
+    <tr>
+        <th colspan="9"
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+                گزارش کارتابل ارزیابی فعالیت های روزانه و جاری از تاریخ
+                {{ verta($fromDate)->format('Y/n/j') }}
+                تا
+                تاریخ
+                {{ verta($toDate)->format('Y/n/j') }}
+        </th>
+    </tr>
+    <tr>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">کد
+            یکتا</th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            استان</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            اداره</th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">آیتم
+            فعالیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            موضوع مشاهده شده</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            مقدار</th>
+
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نقطه شروع</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            نقطه پایان</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تاریخ ثبت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            تاریخ فعالیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            وضعیت</th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            توضیحات ناظر</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    @foreach ($data as $item)
+        <tr>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['province_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['edarat_name'] ?? '-' }}</td>
+
+            <td style="border: 1px solid black;text-align: center;">{{ $item['item_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['sub_item_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">
+                {{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' : $item['sub_item_data'] . '(-)') : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">
+                {{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' . $item['start_lng'] : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">
+                {{ isset($item['end_lat']) && isset($item['end_lng']) ? $item['end_lat'] . ' ' . $item['end_lng'] : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">{{  $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['activity_date_time'] ? verta($item['activity_date_time'])->format('Y/n/j H:i:s') : '-' }}
+            </td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['status_fa'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">
+                {{ $item['supervisor_description'] ?? '-' }}</td>
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+
+</html>