diff --git a/app/Http/Controllers/DoublerRequestController.php b/app/Http/Controllers/DoublerRequestController.php index 3e55e2b..fba1f28 100644 --- a/app/Http/Controllers/DoublerRequestController.php +++ b/app/Http/Controllers/DoublerRequestController.php @@ -46,7 +46,12 @@ class DoublerRequestController extends Controller public function makeRequest(DoublerRequestsStoreRequest $request) { foreach ($request->getDoublerRequests() as $thisRequest) { + if (! $thisRequest['request']) { + DoublerRequest::where('event_id', $thisRequest['event_id']) + ->where('student_id', $thisRequest['student_id'])->delete(); + continue; + } DoublerRequest::upsert([ 'event_id' => $thisRequest['event_id'], 'student_id' => $thisRequest['student_id'], diff --git a/app/Http/Requests/DoublerRequestsStoreRequest.php b/app/Http/Requests/DoublerRequestsStoreRequest.php index 5dd2105..a5a3afc 100644 --- a/app/Http/Requests/DoublerRequestsStoreRequest.php +++ b/app/Http/Requests/DoublerRequestsStoreRequest.php @@ -16,7 +16,7 @@ class DoublerRequestsStoreRequest extends FormRequest // Validate student IDs (second keys) and their values 'doubler_requests.*.*' => [ - 'required', + 'nullable', 'string', 'max:50', // Custom validation rule to check if the student ID exists in DB @@ -53,7 +53,6 @@ class DoublerRequestsStoreRequest extends FormRequest public function getDoublerRequests(): array { $validated = $this->validated()['doubler_requests'] ?? []; - $result = []; foreach ($validated as $eventId => $students) { diff --git a/resources/views/doubler_request/index.blade.php b/resources/views/doubler_request/index.blade.php index eb0611c..695016e 100644 --- a/resources/views/doubler_request/index.blade.php +++ b/resources/views/doubler_request/index.blade.php @@ -1,6 +1,14 @@ Doubler Requests + @foreach($errors->all() as $error) + + {{ $error }} + + + @endforeach + @foreach($events as $event) {{ $event->name }} diff --git a/routes/user.php b/routes/user.php index fc48a90..83f51e8 100644 --- a/routes/user.php +++ b/routes/user.php @@ -64,5 +64,5 @@ Route::middleware([ 'auth', 'verified', ])->controller(DoublerRequestController::class)->prefix('doubler_request')->group(function () { Route::get('/', 'index')->name('doubler_request.index'); - Route::post('/', 'makeRequest')->name('doubler_request.make_request'); + Route::post('/makeRequest', 'makeRequest')->name('doubler_request.make_request'); });