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

Merge pull request 'fix machine report excel export' (#30) from feature/MachineReportExcel into develop

Browse Source 
Reviewed-on: #30
This commit was merged in pull request #30.
This commit is contained in:
amirghasempoor
2026-06-20 06:37:30 +00:00
parent c9e779d726 80c4eeaefb
commit 2aa9ae1455
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/V3/Mission/Report/Machine/machineDriverReport.php
View File

@@ -65,7 +65,7 @@ class machineDriverReport implements FromView, ShouldAutoSize, WithDrawings, Wit
$drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setPath(public_path('/dist/141icon.png'));
$drawing2->setWidth(50); $drawing2->setWidth(50);
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(+90);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('D1'); $drawing2->setCoordinates('D1');

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

@@ -66,7 +66,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setPath(public_path('/dist/141icon.png'));
$drawing2->setWidth(50); $drawing2->setWidth(50);
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(+90);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('E1'); $drawing2->setCoordinates('E1');

2
app/Exports/V3/Mission/Report/Machine/machineTypeReport.php
View File

@@ -64,7 +64,7 @@ class machineTypeReport implements FromView, ShouldAutoSize, WithDrawings, WithE
$drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setPath(public_path('/dist/141icon.png'));
$drawing2->setWidth(50); $drawing2->setWidth(50);
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(+90);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('C1'); $drawing2->setCoordinates('C1');

4
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
View File

@@ -85,7 +85,7 @@ class ReportMachineController extends Controller
public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{ {
$data = $reportMachineService->countryMachineTypesActivity($request); $data = $reportMachineService->countryMachineTypesActivity($request);
$name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx'; $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineTypeReport($data), $name); return Excel::download(new machineTypeReport($data), $name);
} }
@@ -125,7 +125,7 @@ class ReportMachineController extends Controller
public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{ {
$data = $reportMachineService->provinceMachineTypesActivity($request); $data = $reportMachineService->provinceMachineTypesActivity($request);
$name = 'گزارش نوع ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx'; $name = 'گزارش انوع ماشین'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineTypeReport($data), $name); return Excel::download(new machineTypeReport($data), $name);
} }

2
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -285,7 +285,7 @@ class RequestPortalController extends Controller
$mission->rahdaran()->sync($request->rahdaran); $mission->rahdaran()->sync($request->rahdaran);
$violation->update(['status' => 1]); $violation->update(['status' => 1, 'mission_id' => $mission->id]);
// if ($mission->category_id == 2) { // if ($mission->category_id == 2) {
// $rpc = new OperatorController; // $rpc = new OperatorController;

4
resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.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="3" <th colspan="3"
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>