From 7d71d6dac52a0f9be3dd724fc7b72bbf81b6cae2 Mon Sep 17 00:00:00 2001 From: Sallu9007 Date: Thu, 17 Apr 2025 10:17:13 +0530 Subject: [PATCH] Feat: Enhance Organising Institute selection with Select2 in forms and edit views --- .../ActivitiesAttendedController.php | 7 ++++++- app/Http/Controllers/FacultyController.php | 9 +++++++-- .../views/activities-attended/edit.blade.php | 17 +++++++++++++++- .../activities-attended-form.blade.php | 20 ++++++++++++++++++- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ActivitiesAttendedController.php b/app/Http/Controllers/ActivitiesAttendedController.php index cada4f9..0033338 100644 --- a/app/Http/Controllers/ActivitiesAttendedController.php +++ b/app/Http/Controllers/ActivitiesAttendedController.php @@ -14,7 +14,12 @@ class ActivitiesAttendedController extends Controller { $response = ActivitiesAttended::findOrFail($id); - return view('activities-attended.edit', compact('response')); + // Fetch unique organising institutes + $organisingInstitutes = ActivitiesAttended::select('organising_institute') + ->distinct() + ->pluck('organising_institute'); + + return view('activities-attended.edit', compact('response', 'organisingInstitutes')); } public function update(Request $request, $id) diff --git a/app/Http/Controllers/FacultyController.php b/app/Http/Controllers/FacultyController.php index a43a194..f3819ba 100644 --- a/app/Http/Controllers/FacultyController.php +++ b/app/Http/Controllers/FacultyController.php @@ -24,8 +24,13 @@ class FacultyController extends Controller // Faculty response form public function ActivitiesAttendedForm() { - // Logic to show the response form - return view('faculty.activities-attended-form'); + // Fetch unique organising institutes + $organisingInstitutes = ActivitiesAttended::select('organising_institute') + ->distinct() + ->pluck('organising_institute'); + + // Pass the data to the view + return view('faculty.activities-attended-form', compact('organisingInstitutes')); } public function viewActivitiesAttendedResponses() diff --git a/resources/views/activities-attended/edit.blade.php b/resources/views/activities-attended/edit.blade.php index eb5bcfe..1e544eb 100644 --- a/resources/views/activities-attended/edit.blade.php +++ b/resources/views/activities-attended/edit.blade.php @@ -34,7 +34,12 @@
- +
@@ -186,4 +191,14 @@ endDateField.addEventListener('change', calculateDays); }); +@parent + @endsection \ No newline at end of file diff --git a/resources/views/faculty/activities-attended-form.blade.php b/resources/views/faculty/activities-attended-form.blade.php index fd5f444..d7c60a7 100644 --- a/resources/views/faculty/activities-attended-form.blade.php +++ b/resources/views/faculty/activities-attended-form.blade.php @@ -25,7 +25,12 @@
- +
@@ -135,4 +140,17 @@ } } +@endsection + +@section('scripts') +@parent + @endsection \ No newline at end of file