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

returned the road item object in the model

Browse Source
This commit is contained in:
amirghasempoor
2024-12-21 14:22:17 +03:30
parent 767830cf47
commit 48a966a34f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/V2/Dashboard/RoadItemsProjectController.php
View File

@@ -317,7 +317,7 @@ class RoadItemsProjectController extends Controller
$road_item = RoadItemsProject::store(Auth::user(), $attributes, $before_image, $after_image, $request->observed_item_id); $road_item = RoadItemsProject::store(Auth::user(), $attributes, $before_image, $after_image, $request->observed_item_id);
if ($road_item == -1) { if ($road_item === -1) {
return response()->json([ return response()->json([
'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.'
], 400); ], 400);

2
app/Http/Controllers/V2/Dashboard/RoadPatrolProjectController.php
View File

@@ -413,7 +413,7 @@ class RoadPatrolProjectController extends Controller
$road_item = RoadItemsProject::store(auth()->user(), $attributes, $before_image, $after_image, $observed_item->id); $road_item = RoadItemsProject::store(auth()->user(), $attributes, $before_image, $after_image, $observed_item->id);
if ($road_item == -1) { if ($road_item === -1) {
return response()->json([ return response()->json([
'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.'
], 400); ], 400);

11
app/Http/Controllers/V3/RoadItemsProjectController.php
View File

@@ -40,7 +40,7 @@ class RoadItemsProjectController extends Controller
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time',
'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' 'cmms_machine_id', 'cmms_machine_code'
); );
$allowedFilters = $columns; $allowedFilters = $columns;
@@ -148,7 +148,7 @@ class RoadItemsProjectController extends Controller
'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa', 'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time', 'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', 'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time',
'cmms_machine_id', 'cmms_machine_code', 'rahdar_id', 'rahdar_code' 'cmms_machine_id', 'cmms_machine_code'
); );
$allowedFilters = $columns; $allowedFilters = $columns;
@@ -249,13 +249,14 @@ class RoadItemsProjectController extends Controller
$road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id); $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id);
$road_item->rahdaran()->attach($request->rahdaran_id); if ($road_item === -1) {
if ($road_item == -1) {
return response()->json([ return response()->json([
'message' => 'اقدام مربوطه قبلا رسیدگی شده است.' 'message' => 'اقدام مربوطه قبلا رسیدگی شده است.'
], 400); ], 400);
} }
$road_item->rahdaran()->attach($request->rahdaran_id);
auth()->user()->addActivityComplete(1154); auth()->user()->addActivityComplete(1154);
return $this->successResponse(); return $this->successResponse();

1
app/Models/RoadItemsProject.php
View File

@@ -100,7 +100,6 @@ class RoadItemsProject extends Model
{ {
try { try {
$road_item = \DB::transaction(function () use ($user, $attributes, $before_image, $after_image, $observed_item_id) { $road_item = \DB::transaction(function () use ($user, $attributes, $before_image, $after_image, $observed_item_id) {
// dd($attributes['cmms_machine_id'],$attributes['cmms_machine_code']);
$road_item = $user->roadItemsProjects()->create([ $road_item = $user->roadItemsProjects()->create([
'start_lat' => $attributes['start_lat'], 'start_lat' => $attributes['start_lat'],
'start_lng' => $attributes['start_lng'], 'start_lng' => $attributes['start_lng'],