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

improve code in controller and form request for V3 whit pint package

Browse Source
This commit is contained in:
faezehzafarbakhsh
2025-10-27 13:20:14 +03:30
parent 71f5001477
commit b155db758a
118 changed files with 604 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
View File

@@ -11,12 +11,10 @@ use App\Http\Requests\V3\RoadItem\Operator\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\InfoItem;
use App\Models\Mission;
use App\Models\ObservedItem;
use App\Models\RoadItemsProject;
use App\Services\Cartables\RoadItem\OperatorService;
use App\Services\NominatimService;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@@ -29,24 +27,28 @@ use Throwable;
class OperatorController extends Controller
{
use ApiResponse;
/**
* Display a listing of the resource.
*/
public function index(Request $request, OperatorService $operatorService): JsonResponse
{
$data = $operatorService->dataTable($request);
return response()->json($data);
}
public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
{
$name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$name = 'گزارش از کارتابل عملیات فعالیت روزانه '.verta()->now()->format('Y-m-d H:i').'.xlsx';
$data = $operatorService->dataTable($request, true);
return Excel::download(new OperatorCartableReport($data['data']), $name);
}
/**
* Store a newly created resource in storage.
*
* @throws Throwable
*/
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
@@ -55,13 +57,13 @@ class OperatorController extends Controller
->where('sub_item', $request->sub_item_id)
->firstOrFail();
if ($info_item->needs_end_point && !$request->end_point) {
if ($info_item->needs_end_point && ! $request->end_point) {
throw ValidationException::withMessages([
'end_point' => __('validation.required', ['attribute' => 'end_point']),
]);
}
if ((!$request->before_image || !$request->after_image) && $info_item->needs_image) {
if ((! $request->before_image || ! $request->after_image) && $info_item->needs_image) {
throw ValidationException::withMessages([
'before_image' => __('validation.required', ['attribute' => 'before_image']),
'after_image' => __('validation.required', ['attribute' => 'after_image']),
@@ -72,8 +74,7 @@ class OperatorController extends Controller
$end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
DB::transaction(function () use ($request, $nominatimService,
$start_coordinates, $end_coordinates, $info_item)
{
$start_coordinates, $end_coordinates, $info_item) {
$user = auth()->user();
$road_item = RoadItemsProject::query()->create([
'user_id' => $user->id,
@@ -103,7 +104,7 @@ class OperatorController extends Controller
'edarat_name' => $user->edarate_shahri_name,
'activity_date' => $request->activity_date,
'activity_time' => $request->activity_time,
'activity_date_time' => $request->activity_date." ".$request->activity_time,
'activity_date_time' => $request->activity_date.' '.$request->activity_time,
'is_new' => 1,
'mission_id' => $request->mission_id,
]);
@@ -111,13 +112,13 @@ class OperatorController extends Controller
if ($request->has('after_image')) {
$road_item->files()->create([
'path' => FileFacade::save($request->file('after_image'),
"/road_items_projects_new/{$road_item->id}/after")
"/road_items_projects_new/{$road_item->id}/after"),
]);
}
if ($request->has('before_image')) {
$road_item->files()->create([
'path' => FileFacade::save($request->file('before_image'),
"/road_items_projects_new/{$road_item->id}/before")
"/road_items_projects_new/{$road_item->id}/before"),
]);
}
@@ -152,7 +153,7 @@ class OperatorController extends Controller
$end_coordinates = null;
if ($info_item->needs_end_point) {
if (!$request->end_point) {
if (! $request->end_point) {
throw ValidationException::withMessages([
'end_point' => __('validation.required', ['attribute' => 'end_point']),
]);
@@ -166,14 +167,14 @@ class OperatorController extends Controller
FileFacade::delete($roadItemsProject->files[0]->path, true);
$roadItemsProject->files[0]->update([
'path' => FileFacade::save($request->file('after_image'),
"/road_items_projects_new/{$roadItemsProject->id}/after")
"/road_items_projects_new/{$roadItemsProject->id}/after"),
]);
}
if ($request->has('before_image')) {
FileFacade::delete($roadItemsProject->files[1]->path, true);
$roadItemsProject->files[1]->update([
'path' => FileFacade::save($request->file('before_image'),
"/road_items_projects_new/{$roadItemsProject->id}/before")
"/road_items_projects_new/{$roadItemsProject->id}/before"),
]);
}
}
@@ -193,7 +194,6 @@ class OperatorController extends Controller
$roadItemsProject->cmmsMachines()->sync($request->machines_id);
$roadItemsProject->missions()->sync($request->mission_id);
auth()->user()->addActivityComplete(1155);
});