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

feature/MachineTypesDetails #24

Merged
amirghasempoor merged 2 commits from feature/MachineTypesDetails into develop 2026-06-14 10:45:45 +00:00
Conversation 0 Commits 2 Files Changed 7 +20 -13
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab9838c1bc - Show all commits

10
app/Exports/V3/Mission/Report/Machine/machineReport.php
View File

@@ -18,14 +18,16 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
}
public function view(): View
{ $exportRows = [];
{
$exportRows = [];
foreach ($this->data as $r) {
$exportRows[] = [
'city_name' => $r->c_name ?? '',
'province_name' => $r->p_name ?? '',
'machine_id' => $r->c_name ?? '',
'machine_code' => $r->machine_code ?? '',
'car_name' => $r->car_name ?? '',
'missions' => $r->missions ?? 0,
'distance' => (int) ($r->distance ?? 0),
'func' => (int) ($r->func ?? 0),
];
}

23
resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
View File

@@ -46,19 +46,23 @@
<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>
</tr>
</thead>
@@ -66,10 +70,11 @@
<tbody>
@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['city_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['machine_id'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['car_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['machine_code'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['func'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['distance'] ?? '-' }}</td>
</tr>
@endforeach
</tbody>