Chore: small fixes for the presentation

app/Http/Controllers/ActivitiesAttendedController.php

@@ -57,12 +57,13 @@ class ActivitiesAttendedController extends Controller
             // Extract year from start_date
             $year = date('Y', strtotime($validated['start_date']));
             $username = $response->user->name;
+            $userId = $response->user->id;
 
             $originalName = $request->file('proof')->getClientOriginalName();
             $fileName = $username . '_' . $originalName;
 
             // Create path structure: year/faculty_name
-            $folderPath = 'proofs/' . $year . '/' . $username;
+            $folderPath = 'proofs/' . $year . '/' . $userId . '_' . $username . '/Activities-Attended';
 
             // Store file in the specified path
             $proofPath = $request->file('proof')->storeAs($folderPath, $fileName, 'public');

app/Http/Controllers/ActivitiesOrganisedController.php

@@ -55,12 +55,13 @@ class ActivitiesOrganisedController extends Controller
             // Extract year from start_date
             $year = date('Y', strtotime($validated['start_date']));
             $username = $response->user->name;
+            $userId = $response->user->id;
 
             $originalName = $request->file('proof')->getClientOriginalName();
             $fileName = $username . '_' . $originalName;
 
             // Create path structure: year/faculty_name
-            $folderPath = 'proofs/' . $year . '/' . $username;
+            $folderPath = 'proofs/' . $year . '/' . $userId . '_' . $username . '/Activities-Organised';
 
             // Store file in the specified path
             $proofPath = $request->file('proof')->storeAs($folderPath, $fileName, 'public');

app/Http/Controllers/FacultyController.php

@@ -46,7 +46,8 @@ class FacultyController extends Controller
 
     public function viewActivitiesOrganisedResponses()
     {
-        return view('pages.activities-organised.index');
+        $departments = Department::all();
+        return view('pages.activities-organised.index', compact('departments'));
     }
 
     public function IvOrganisedForm()
@@ -57,7 +58,8 @@ class FacultyController extends Controller
 
     public function viewIvOrganisedResponses()
     {
-        return view('pages.iv-organised.index');
+        $departments = Department::all();
+        return view('pages.iv-organised.index', compact('departments'));
     }
 
     public function PublicationsForm()
@@ -71,7 +73,8 @@ class FacultyController extends Controller
 
     public function viewPublicationsResponses()
     {
-        return view('pages.publications.index');
+        $departments = Department::all();
+        return view('pages.publications.index', compact('departments'));
     }
 
     public function BooksPublishedForm()
@@ -82,7 +85,8 @@ class FacultyController extends Controller
 
     public function viewBooksPublishedResponses()
     {
-        return view('pages.booksPublished.index');
+        $departments = Department::all();
+        return view('pages.booksPublished.index', compact('departments'));
     }
 
     public function ExternalEngagementForm()
@@ -93,7 +97,8 @@ class FacultyController extends Controller
 
     public function viewExternalEngagementResponses()
     {
-        return view('pages.externalEngagement.index');
+        $departments = Department::all();
+        return view('pages.externalEngagement.index', compact('departments'));
     }
 
     public function OnlineCoursesForm()
@@ -104,7 +109,8 @@ class FacultyController extends Controller
 
     public function viewOnlineCoursesResponses()
     {
-        return view('pages.onlineCourses.index');
+        $departments = Department::all();
+        return view('pages.onlineCourses.index', compact('departments'));
     }
 
     public function PatentsForm()
@@ -115,7 +121,8 @@ class FacultyController extends Controller
 
     public function viewPatentsResponses()
     {
-        return view('pages.patents.index');
+        $departments = Department::all();
+        return view('pages.patents.index', compact('departments'));
     }
 
 

database/migrations/2025_01_25_190304_add_role_and_department_to_users_table.php

@@ -13,7 +13,7 @@ return new class extends Migration
     {
         Schema::table('users', function (Blueprint $table) {
             $table->unsignedBigInteger('role_id')->after('id')->default(3);
-            $table->unsignedBigInteger('department_id')->nullable()->after('role_id');
+            $table->unsignedBigInteger('department_id')->nullable()->after('role_id')->default(1);
             $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade');
             $table->foreign('department_id')->references('id')->on('departments')->onDelete('cascade');
         });

database/seeders/ActivitiesAttendedResponsesTableSeeder.php

@@ -38,7 +38,7 @@ class ActivitiesAttendedResponsesTableSeeder extends Seeder
                 'organising_institute' => $organizingInstitutes[array_rand($organizingInstitutes)], // Random organization
                 'address' => $addresses[array_rand($addresses)], // Random address
                 'department_id' => rand(1, 5), // Random department ID
-                'faculty_id' => rand(1, 2), // Random faculty ID
+                'faculty_id' => rand(1, 5), // Random faculty ID
                 'start_date' => $startDate->format('Y-m-d H:i:s'), // Start date and time
                 'end_date' => $endDate->format('Y-m-d H:i:s'), // End date and time
                 'num_days' => $numDays, // Number of days

resources/views/components/send-email.blade.php

@@ -1,6 +1,6 @@
 @if(auth()->user()->role->name === 'Admin')
 <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#missingProofsModal">
-    <i class="fas fa-search me-1"></i> Check Missing Proofs
+    <i class="fas fa-search me-1"></i> Send Email for Missing Proofs
 </button>
 @endif