RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'debug the excels' (#6) from feature/MissionReportExcel into develop

Browse Source 
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/6
This commit is contained in:
amirghasempoor
2026-01-27 08:25:27 +00:00
parent 8db5650c4c f1c560928e
commit fe8c71fe16
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/V3/Mission/Report/Tradod/CountryReport.php
View File

@@ -69,7 +69,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$exportRows[] = $row; $exportRows[] = $row;
} }
return view('v3.Reports.Mission.Report.CountryActivityReport', [ return view('v3.Reports.Mission.Report.Tradod .CountryActivityReport', [
'rows' => $exportRows, 'rows' => $exportRows,
]); ]);
} }

2
app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php
View File

@@ -71,7 +71,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$exportRows[] = $row; $exportRows[] = $row;
} }
return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ return view('v3.Reports.Mission.Report.Tradod .ProvinceActivityReport', [
'rows' => $exportRows, 'rows' => $exportRows,
]); ]);
} }

2
app/Exports/V3/Mission/Report/Violation/CountryReport.php
View File

@@ -30,7 +30,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
'province_name' => $name, 'province_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0), 'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0), 'bedone_egdam' => (int) ($r->undone ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0),

2
app/Exports/V3/Mission/Report/Violation/ProvinceReport.php
View File

@@ -31,7 +31,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
'city_name' => $name, 'city_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0), 'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0), 'bedone_egdam' => (int) ($r->undone ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0),

4
resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php
View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش کل کشور </title> <title>گزارش کل کشور </title>
<style> <style>
table, table,
@@ -79,7 +79,7 @@
@foreach ($rows as $item) @foreach ($rows as $item)
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total_violations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td> <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_gps'] ?? '-' }}</td>

4
resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php
View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش ادارات شهرستان </title> <title>گزارش ادارات شهرستان </title>
<style> <style>
table, table,
@@ -79,7 +79,7 @@
@foreach ($rows as $item) @foreach ($rows as $item)
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total_violations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td> <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_gps'] ?? '-' }}</td>

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

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش کل کشور </title> <title>گزارش کل کشور </title>
<style> <style>
table, table,
@@ -40,7 +40,7 @@
<tr> <tr>
<th colspan="11" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش ماموریت های انجام شده
</th> </th>
</tr> </tr>
<tr> <tr>

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

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش ادارات شهرستان </title> <title>گزارش ادارات شهرستان </title>
<style> <style>
table, table,
@@ -40,7 +40,7 @@
<tr> <tr>
<th colspan="11" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش ماموریت های انجام شده
</th> </th>
</tr> </tr>
<tr> <tr>