modify the blades

2025-03-01 13:10:07 +03:30
parent fc747ae68b
commit 9dfcc96fc7
7 changed files with 143 additions and 103 deletions
--- a/resources/views/v3/Reports/RoadObservation/ComplaintsReport.blade.php
+++ b/resources/views/v3/Reports/RoadObservation/ComplaintsReport.blade.php
@@ -38,37 +38,16 @@
        </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>
+        <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>
@@ -76,9 +55,10 @@
    <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['fk_RegisteredEventMessage'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['province_fa'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['edarate_shahri_name_fa'] ?? '-' }}</td>
+            <td>{{ $item['province_fa'] ?? '-' }}</td>
+            <td>{{ $item['name_fa'] ?? '-' }}</td>
            <td style="border: 1px solid black;text-align: center;">{{ $item['Title'] ?? '-' }}</td>
            <td style="border: 1px solid black;text-align: center;">{{ $item['FeatureTypeTitle'] ?? '-' }}</td>
            <td style="border: 1px solid black;text-align: center;">{{ $item['Description'] ?? '-' }}</td>
--- a/resources/views/v3/Reports/RoadObservation/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadObservation/OperatorCartableReport.blade.php
@@ -40,15 +40,15 @@
    <tr>
        <th>کد یکتا</th>
        <th>کد سوانح</th>
-        <th>استان</th>
-        <th>ادارات شهری</th>
        <th>موضوع گزارش</th>
        <th>نوع گزارش</th>
+        <th>توضیح گزارش</th>
        <th>شماره تماس گیرنده</th>
-        <th>وضعیت</th>
+        <th>تاریخ ثبت</th>
        <th>تاریخ اقدام</th>
-        <th>توضیحات</th>
-        <th>توضیحات کارشناس</th>
+        <th>توضیح مامور</th>
+        <th>توضیح کارشناس</th>
+        <th>وضعیت</th>
    </tr>
    </thead>

@@ -57,15 +57,15 @@
        <tr>
            <td>{{ $item['id'] ?? '-' }}</td>
            <td>{{ $item['fk_RegisteredEventMessage'] ?? '-' }}</td>
-            <td>{{ $item['province_fa'] ?? '-' }}</td>
-            <td>{{ $item['edarate_shahri_name_fa'] ?? '-' }}</td>
            <td>{{ $item['Title'] ?? '-' }}</td>
            <td>{{ $item['FeatureTypeTitle'] ?? '-' }}</td>
+            <td>{{ $item['Description'] ?? '-' }}</td>
            <td>{{ $item['MobileForSendEventSms'] ?? '-' }}</td>
-            <td>{{ $item['status_fa'] ?? '-' }}</td>
+            <td>{{ verta($item['created_at'])->format('Y/n/j') ?? '-' }}</td>
            <td>{{ $item['rms_last_activity_fa'] ?? '-' }}</td>
            <td>{{ $item['rms_description'] ?? '-' }}</td>
            <td>{{ $item['supervisor_description'] ?? '-' }}</td>
+            <td>{{ $item['status_fa'] ?? '-' }}</td>
        </tr>
    @endforeach
    </tbody>
--- a/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadObservation/SupervisorCartableReport.blade.php
@@ -33,23 +33,24 @@
    </tr>
    <tr>
        <th colspan="11"
-            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13;">
+            style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
            گزارش کارتابل ارزیابی واکنش سریع
-
        </th>
    </tr>
    <tr>
        <th>کد یکتا</th>
-        <th>کد پیگیری</th>
+        <th>کد سوانح</th>
        <th>استان</th>
-        <th>ادارات شهری</th>
+        <th>اداره</th>
        <th>موضوع گزارش</th>
        <th>نوع گزارش</th>
+        <th>توضیح گزارش</th>
        <th>شماره تماس گیرنده</th>
-        <th>وضعیت</th>
+        <th>تاریخ ثبت</th>
        <th>تاریخ اقدام</th>
-        <th>توضیحات</th>
-        <th>توضیحات کارشناس</th>
+        <th>توضیح مامور</th>
+        <th>توضیح کارشناس</th>
+        <th>وضعیت</th>
    </tr>
    </thead>

@@ -59,14 +60,17 @@
            <td>{{ $item['id'] ?? '-' }}</td>
            <td>{{ $item['fk_RegisteredEventMessage'] ?? '-' }}</td>
            <td>{{ $item['province_fa'] ?? '-' }}</td>
-            <td>{{ $item['edarate_shahri_name_fa'] ?? '-' }}</td>
+            <td>{{ $item['name_fa'] ?? '-' }}</td>
            <td>{{ $item['Title'] ?? '-' }}</td>
            <td>{{ $item['FeatureTypeTitle'] ?? '-' }}</td>
+            <td>{{ $item['Description'] ?? '-' }}</td>
            <td>{{ $item['MobileForSendEventSms'] ?? '-' }}</td>
-            <td>{{ $item['status_fa'] ?? '-' }}</td>
+            <td>{{ verta($item['created_at'])->format('Y/n/j') ?? '-' }}</td>
            <td>{{ $item['rms_last_activity_fa'] ?? '-' }}</td>
            <td>{{ $item['rms_description'] ?? '-' }}</td>
            <td>{{ $item['supervisor_description'] ?? '-' }}</td>
+            <td>{{ $item['status_fa'] ?? '-' }}</td>
+            <td>{{ $item['rms_last_activity_fa'] ?? '-' }}</td>
        </tr>
    @endforeach
    </tbody>