change item in report mission

resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php

@@ -68,6 +68,10 @@
             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;">
+            کیلومتر GPS
+        </th>
     </tr>
     </thead>
 
@@ -80,6 +84,7 @@
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_herasat'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['mil_gps'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>

resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php

@@ -50,7 +50,7 @@
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            کل تخلفات        </th>
+            کل تخلفات</th>
 
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
@@ -68,6 +68,10 @@
             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;">
+            مسافت ثبت شده GPS
+        </th>
     </tr>
     </thead>
 
@@ -80,6 +84,7 @@
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_herasat'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['mil_gps'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>

resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php

@@ -50,8 +50,14 @@
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-کل تردد        </th>
-
+            کل ماموریت </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            جمع ساعات GPS
+        </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;">
             تردد خارج از محدوده
@@ -72,6 +78,13 @@
             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>
 
@@ -79,12 +92,16 @@
     @foreach ($rows as $item)
         <tr>
             <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['total_missions'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['taradod_khareg_mahdode'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_rozaneh'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['item'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['patrol'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>

resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php

@@ -50,8 +50,14 @@
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            کل تردد        </th>
-
+            کل ماموریت </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            جمع ساعات GPS
+        </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;">
             تردد خارج از محدوده
@@ -72,8 +78,13 @@
             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>
 
@@ -81,12 +92,16 @@
     @foreach ($rows as $item)
         <tr>
             <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['total_missions'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['taradod_khareg_mahdode'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_rozaneh'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['item'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['patrol'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>