Merge branch 'develop' into 'feature/TransportationUnit'

Develop

See merge request witelgroup/rms_v2!115
This commit is contained in:
2025-05-19 11:53:42 +00:00
6 changed files with 208 additions and 65 deletions

View File

@@ -1,65 +0,0 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class CartableController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*/
public function show(string $id)
{
//
}
/**
* Show the form for editing the specified resource.
*/
public function edit(string $id)
{
//
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
{
//
}
/**
* Remove the specified resource from storage.
*/
public function destroy(string $id)
{
//
}
}

View File

@@ -0,0 +1,87 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionStates;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use App\Services\Cartables\Mission\RequestPortalService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class RequestPortalController extends Controller
{
use ApiResponse;
public function index(Request $request, RequestPortalService $requestPortalService): JsonResponse
{
return response()->json($requestPortalService->datatable($request));
}
public function store(StoreRequest $request): JsonResponse
{
DB::transaction(function () use ($request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission = Mission::query()->create([
'user_id'=> auth()->user()->id,
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->attach($request->rahdaran);
});
return $this->successResponse();
}
public function show(Mission $mission): JsonResponse
{
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission->update([
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);
});
return $this->successResponse();
}
public function destroy(Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission) {
$mission->rahdaran()->detach();
$mission->delete();
});
return $this->successResponse();
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace App\Http\Requests\V3\Mission\RequestPortal;
use Illuminate\Foundation\Http\FormRequest;
class StoreRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'rahdaran' => 'required|array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machine_type' => 'required|string|max:255',
'requested_machine_numbers'=> 'required|integer|max:255',
'type' => 'required|string|max:50',
'start_date' => 'required|date',
'end_date' => 'required|date',
'request_date' => 'required|date',
'description' => 'string',
'start_point' => 'required|string',
'end_point' => 'required|string',
];
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace App\Http\Requests\V3\Mission\RequestPortal;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return ($this->route('mission'))->user_id === auth()->id();
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'rahdaran' => 'required|array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machine_type' => 'required|string|max:255',
'requested_machine_numbers'=> 'required|integer|max:255',
'type' => 'required|string|max:50',
'start_date' => 'required|date',
'end_date' => 'required|date',
'request_date' => 'required|date',
'description' => 'string',
'start_point' => 'required|string',
'end_point' => 'required|string',
];
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Services\Cartables\Mission;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use Illuminate\Http\Request;
class RequestPortalService
{
use ApiResponse;
public function datatable(Request $request)
{
$user = auth()->user();
$query = Mission::query();
if ($user->hasPermissionTo('mission-manage-city')) {
$query->where('edarate_shahri_id', '=', $user->edarate_shahri_id);
}
elseif ($user->hasPermissionTo('mission-manage-province')) {
$query->where('province_id', '=', $user->province_id);
}
return DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*']
);
}
}

View File

@@ -7,6 +7,7 @@ use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshController;
use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshSampleController;
use App\Http\Controllers\V3\Dashboard\Azmayesh\AzmayeshTypeController;
use App\Http\Controllers\V3\Dashboard\ItemsManagementController;
use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController;
use App\Http\Controllers\V3\Dashboard\ObservedItemController;
use App\Http\Controllers\V3\Dashboard\AccidentReceiptController;
use App\Http\Controllers\V3\Dashboard\OtpManagementController;
@@ -424,3 +425,13 @@ Route::prefix('road_maintenance_station')
Route::post('/{rahdariPoint}', 'update')->name('update')->middleware('permission:edit-tollhouse|edit-tollhouse-province');
Route::delete('/{rahdariPoint}', 'destroy')->name('destroy')->middleware('permission:delete-tollhouse|delete-tollhouse-province');
});
Route::prefix('missions')
->name('missions.')
->controller(RequestPortalController::class)
->group(function () {
Route::get('/', 'index')->name('index');
Route::post('/', 'store')->name('store');
Route::get('/{mission}', 'show')->name('show');
Route::post('/{mission}', 'update')->name('update');
Route::delete('/{mission}', 'destroy')->name('destroy');
});