diff --git a/app/Exports/V3/Mission/Report/Machine/machineDriverReport.php b/app/Exports/V3/Mission/Report/Machine/machineDriverReport.php index 3bb74fdc..844bc084 100644 --- a/app/Exports/V3/Mission/Report/Machine/machineDriverReport.php +++ b/app/Exports/V3/Mission/Report/Machine/machineDriverReport.php @@ -65,7 +65,7 @@ class machineDriverReport implements FromView, ShouldAutoSize, WithDrawings, Wit $drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setWidth(50); $drawing2->setHeight(50); - $drawing2->setOffsetX(5); + $drawing2->setOffsetX(+90); $drawing2->setOffsetY(5); $drawing2->setCoordinates('D1'); diff --git a/app/Exports/V3/Mission/Report/Machine/machineReport.php b/app/Exports/V3/Mission/Report/Machine/machineReport.php index 538c294f..77a09fb1 100644 --- a/app/Exports/V3/Mission/Report/Machine/machineReport.php +++ b/app/Exports/V3/Mission/Report/Machine/machineReport.php @@ -66,7 +66,7 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setWidth(50); $drawing2->setHeight(50); - $drawing2->setOffsetX(5); + $drawing2->setOffsetX(+90); $drawing2->setOffsetY(5); $drawing2->setCoordinates('E1'); diff --git a/app/Exports/V3/Mission/Report/Machine/machineTypeReport.php b/app/Exports/V3/Mission/Report/Machine/machineTypeReport.php index d376871e..6e79eca9 100644 --- a/app/Exports/V3/Mission/Report/Machine/machineTypeReport.php +++ b/app/Exports/V3/Mission/Report/Machine/machineTypeReport.php @@ -64,7 +64,7 @@ class machineTypeReport implements FromView, ShouldAutoSize, WithDrawings, WithE $drawing2->setPath(public_path('/dist/141icon.png')); $drawing2->setWidth(50); $drawing2->setHeight(50); - $drawing2->setOffsetX(5); + $drawing2->setOffsetX(+90); $drawing2->setOffsetY(5); $drawing2->setCoordinates('C1'); diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php index f39b46bf..c6ecde5e 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php @@ -85,7 +85,7 @@ class ReportMachineController extends Controller public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse { $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); } @@ -125,7 +125,7 @@ class ReportMachineController extends Controller public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse { $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); } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php index 61f539ea..4bf30f65 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php @@ -285,7 +285,7 @@ class RequestPortalController extends Controller $mission->rahdaran()->sync($request->rahdaran); - $violation->update(['status' => 1]); + $violation->update(['status' => 1, 'mission_id' => $mission->id]); // if ($mission->category_id == 2) { // $rpc = new OperatorController; diff --git a/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php index 74e25d00..fe71606a 100644 --- a/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Machine/MachineTypeReport.blade.php @@ -5,7 +5,7 @@ -