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

add rahdar id to road item project

Browse Source
This commit is contained in:
amirghasempoor
2024-12-15 10:08:49 +03:30
parent e7163490c9
commit 1b60739a14
12 changed files with 477 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ use App\Http\Traits\ApiResponse;
use App\Models\CMMSMachine;
use App\Models\EdarateShahri;
use App\Models\InfoItem;
use App\Models\Rahdaran;
use App\Models\RoadItemsProject;
use App\Services\NominatimService;
use Illuminate\Http\JsonResponse;
@@ -195,6 +196,7 @@ class RoadItemsProjectController extends Controller
$start_coordinates = explode(',', $request->start_point);
$end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
$cmmsMachine = CMMSMachine::query()->find($request->cmms_machine_id);
$rahdar = Rahdaran::query()->find($request->rahdar_id);
$attributes = [
'start_lat' => $start_coordinates[0],
@@ -225,6 +227,8 @@ class RoadItemsProjectController extends Controller
'activity_time' => $request->activity_time,
'cmms_machine_id' => $cmmsMachine->id,
'cmms_machine_code' => $cmmsMachine->machine_code,
'rahdar_id' => $rahdar->id,
'rahdar_code' => $rahdar->code,
];
$after_image = ($request->has('after_image') && $info_item->needs_image) ?
@@ -271,6 +275,7 @@ class RoadItemsProjectController extends Controller
}
$cmmsMachine = CMMSMachine::query()->find($request->cmms_machine_id);
$rahdar = Rahdaran::query()->find($request->rahdar_id);
if ($info_item->needs_image) {
if ($request->has('after_image')) {
@@ -308,6 +313,8 @@ class RoadItemsProjectController extends Controller
'status_fa' => 'در حال بررسی',
'cmms_machine_id' => $cmmsMachine->id,
'cmms_machine_code' => $cmmsMachine->machine_code,
'rahdar_id' => $rahdar->id,
'rahdar_code' => $rahdar->code,
]);

1
app/Http/Requests/V3/RoadItemsProject/StoreRequest.php
View File

@@ -33,6 +33,7 @@ class StoreRequest extends FormRequest
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'cmms_machine_id' => 'required|exists:cmms_machines,id',
'rahdar_id' => 'required|exists:rahdaran,id',
];
}

4
app/Http/Requests/V3/RoadItemsProject/UpdateRequest.php
View File

@@ -16,8 +16,7 @@ class UpdateRequest extends FormRequest
*/
public function authorize(): bool
{
return true;
// return !($this->road_item->user_id != auth()->user()->id || $this->road_item->status != 2);
return !($this->roadItemsProject->user_id != auth()->user()->id || $this->roadItemsProject->status != 2);
}
/**
@@ -33,6 +32,7 @@ class UpdateRequest extends FormRequest
'before_image' => 'image|max:4096',
'after_image' => 'image|max:4096',
'cmms_machine_id' => 'required|exists:cmms_machines,id',
'rahdar_id' => 'required|exists:rahdaran,id',
];
}
}