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

29
app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
View File

@@ -13,9 +13,8 @@ use App\Models\City;
use App\Models\Province;
use App\Models\RahdariPoint;
use App\Models\RahdariPointHistory;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class RoadMaintenanceStationController extends Controller
{
@@ -27,7 +26,7 @@ class RoadMaintenanceStationController extends Controller
$user->addActivityComplete(1019);
$query = RahdariPoint::query()
->when($user->hasPermissionTo('show-tollhouse-province') && !$user->hasPermissionTo('show-tollhouse'),
->when($user->hasPermissionTo('show-tollhouse-province') && ! $user->hasPermissionTo('show-tollhouse'),
fn ($query) => $query->where('province_id', $user->province_id)
);
@@ -56,7 +55,7 @@ class RoadMaintenanceStationController extends Controller
'name' => $request->name,
'status' => $request->status,
'type' => $request->type,
'type_fa' =>RoadMaintenanceStationTypes::name($request->type),
'type_fa' => RoadMaintenanceStationTypes::name($request->type),
'team_num' => $request->team_num,
'staff_num' => $request->staff_num,
'phone' => $request->phone,
@@ -85,7 +84,7 @@ class RoadMaintenanceStationController extends Controller
foreach ($uploadPaths as $field => $path) {
if ($request->hasFile($field)) {
$station->files()->create([
'path' => FileFacade::save($request->$field, $path)
'path' => FileFacade::save($request->$field, $path),
]);
}
}
@@ -112,17 +111,17 @@ class RoadMaintenanceStationController extends Controller
RahdariPointHistory::query()->create([
'user_id' => $request->user()->id,
'point_id' => $rahdariPoint->id,
'point_id' => $rahdariPoint->id,
'previous_province_id' => $province->id,
'previous_province_name' => $province->name_fa,
'previous_city_id' => $city->id,
'previous_city_name' => $city->name_fa,
'previous_name' => $rahdariPoint->name,
'previous_status' => $rahdariPoint->status,
'previous_type' => $rahdariPoint->type,
'previous_name' => $rahdariPoint->name,
'previous_status' => $rahdariPoint->status,
'previous_type' => $rahdariPoint->type,
'previous_team_num' => $rahdariPoint->team_num,
'previous_staff_num' => $rahdariPoint->staff_num,
'previous_phone' => $rahdariPoint->phone,
'previous_phone' => $rahdariPoint->phone,
'previous_responsible_name' => $rahdariPoint->responsible_name,
'previous_responsible_mobile' => $rahdariPoint->responsible_mobile,
'previous_successor_name' => $rahdariPoint->successor_name,
@@ -130,21 +129,21 @@ class RoadMaintenanceStationController extends Controller
'previous_machines_light' => $rahdariPoint->machines_light,
'previous_machines_sheavy' => $rahdariPoint->machines_sheavy,
'previous_machines_heavy' => $rahdariPoint->machines_heavy,
'previous_lat' => $rahdariPoint->lat,
'previous_lng' => $rahdariPoint->lng,
'previous_lat' => $rahdariPoint->lat,
'previous_lng' => $rahdariPoint->lng,
'new_files' => json_encode($rahdariPoint->files),
'area' => json_encode($rahdariPoint->area),
]);
$rahdariPoint->update([
$rahdariPoint->update([
'province_id' => $province->id,
'province_name' => $province->name_fa,
'city_id' => $city->id,
'city_name' => $city->name_fa,
'name' => $request->input('name'),
'status' => $request->input('status'),
'type' => $request->input('type',),
'type_fa' => RoadMaintenanceStationTypes::name($request->type) ?? $rahdariPoint->type_fa,
'type' => $request->input('type'),
'type_fa' => RoadMaintenanceStationTypes::name($request->type) ?? $rahdariPoint->type_fa,
'team_num' => $request->input('team_num'),
'staff_num' => $request->input('staff_num'),
'phone' => $request->input('phone'),