From 8c4e18e7029d7039ce807a3635b61bdd000dce7f Mon Sep 17 00:00:00 2001 From: Sallu9007 Date: Sun, 23 Mar 2025 16:18:07 +0530 Subject: [PATCH] Refactor: responses as ActivitesAttended --- app/Http/Controllers/AdminController.php | 68 +++++++++---------- .../Controllers/CoordinatorController.php | 10 +-- app/Http/Controllers/FacultyController.php | 12 ++-- .../{Response.php => ActivitiesAttended.php} | 2 +- ...943_create_activities_attendeds_table.php} | 6 +- ...ctivitiesAttendedResponsesTableSeeder.php} | 8 +-- database/seeders/DatabaseSeeder.php | 2 +- ...> activities-attended-responses.blade.php} | 2 +- ...> activities-attended-responses.blade.php} | 2 +- resources/views/dashboard.blade.php | 6 +- ...php => activities-attended-form.blade.php} | 2 +- resources/views/layouts/navigation.blade.php | 12 ++-- routes/web.php | 12 ++-- 13 files changed, 72 insertions(+), 72 deletions(-) rename app/Models/{Response.php => ActivitiesAttended.php} (94%) rename database/migrations/{2025_01_25_201943_create_responses_table.php => 2025_01_25_201943_create_activities_attendeds_table.php} (85%) rename database/seeders/{ResponsesTableSeeder.php => ActivitiesAttendedResponsesTableSeeder.php} (91%) rename resources/views/admin/{responses.blade.php => activities-attended-responses.blade.php} (99%) rename resources/views/coordinator/{responses.blade.php => activities-attended-responses.blade.php} (98%) rename resources/views/faculty/{response-form.blade.php => activities-attended-form.blade.php} (98%) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index deda09b..bf5fc25 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -6,7 +6,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Yajra\DataTables\Facades\DataTables; -use App\Models\Response; +use App\Models\ActivitiesAttended; class AdminController extends Controller { @@ -17,41 +17,41 @@ class AdminController extends Controller } // View responses submitted by users - public function viewResponses() + public function viewActivitiesAttendedResponses() { - return view('admin.responses'); + return view('admin.activities-attended-responses'); } - public function getResponses() -{ - $responses = Response::with('user', 'department'); + public function getActivitiesAttendedResponses() + { + $responses = ActivitiesAttended::with('user', 'department'); - return DataTables::of($responses) - ->addColumn('user_name', function ($response) { - return $response->user->name ?? 'Unknown'; - }) - ->addColumn('department_name', function ($response) { - return $response->department->name ?? 'Unknown'; - }) - ->addColumn('start_date', function ($response) { - return \Carbon\Carbon::parse($response->start_date)->format('d-m-Y'); - }) - ->addColumn('start_time', function ($response) { - return \Carbon\Carbon::parse($response->start_date)->format('h:i A'); - }) - ->addColumn('end_date', function ($response) { - return \Carbon\Carbon::parse($response->end_date)->format('d-m-Y'); - }) - ->addColumn('end_time', function ($response) { - return \Carbon\Carbon::parse($response->end_date)->format('h:i A'); - }) - ->addColumn('action', function ($response) { - $viewButton = $response->proof - ? 'View' - : 'No Proof'; - return $viewButton; - }) - ->rawColumns(['action']) - ->make(true); -} + return DataTables::of($responses) + ->addColumn('user_name', function ($response) { + return $response->user->name ?? 'Unknown'; + }) + ->addColumn('department_name', function ($response) { + return $response->department->name ?? 'Unknown'; + }) + ->addColumn('start_date', function ($response) { + return \Carbon\Carbon::parse($response->start_date)->format('d-m-Y'); + }) + ->addColumn('start_time', function ($response) { + return \Carbon\Carbon::parse($response->start_date)->format('h:i A'); + }) + ->addColumn('end_date', function ($response) { + return \Carbon\Carbon::parse($response->end_date)->format('d-m-Y'); + }) + ->addColumn('end_time', function ($response) { + return \Carbon\Carbon::parse($response->end_date)->format('h:i A'); + }) + ->addColumn('action', function ($response) { + $viewButton = $response->proof + ? 'View' + : 'No Proof'; + return $viewButton; + }) + ->rawColumns(['action']) + ->make(true); + } } diff --git a/app/Http/Controllers/CoordinatorController.php b/app/Http/Controllers/CoordinatorController.php index d77ea54..f62448c 100644 --- a/app/Http/Controllers/CoordinatorController.php +++ b/app/Http/Controllers/CoordinatorController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Yajra\DataTables\Facades\DataTables; use Illuminate\Support\Facades\Auth; -use App\Models\Response; +use App\Models\ActivitiesAttended; class CoordinatorController extends Controller { @@ -16,13 +16,13 @@ class CoordinatorController extends Controller } // View responses submitted by users - public function viewResponses() + public function viewActivitiesAttendedResponses() { - return view('coordinator.responses'); + return view('coordinator.activities-attended-responses'); } -public function getResponses() +public function getActivitiesAttendedResponses() { // Get the current logged-in user $currentUser = Auth::user(); @@ -31,7 +31,7 @@ public function getResponses() $userDepartmentId = $currentUser->department->id ?? null; // Fetch the responses and filter by department_id - $responses = Response::with('user', 'department') + $responses = ActivitiesAttended::with('user', 'department') ->where('department_id', $userDepartmentId); // Filter by current user's department_id return DataTables::of($responses) diff --git a/app/Http/Controllers/FacultyController.php b/app/Http/Controllers/FacultyController.php index 20d3746..177404e 100644 --- a/app/Http/Controllers/FacultyController.php +++ b/app/Http/Controllers/FacultyController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use App\Models\Response; +use App\Models\ActivitiesAttended; class FacultyController extends Controller { @@ -14,13 +14,13 @@ class FacultyController extends Controller } // Faculty response form - public function responseForm() + public function ActivitiesAttendedForm() { // Logic to show the response form - return view('faculty.response-form'); + return view('faculty.activities-attended-form'); } - public function submitResponse(Request $request) + public function ActivitiesAttendedFormResponse(Request $request) { // dd($request->all()); try { @@ -57,7 +57,7 @@ class FacultyController extends Controller // Save the response to the database // dd($validated['organising_institute']); - Response::create([ + ActivitiesAttended::create([ 'title' => $validated['title'], 'organising_institute' => $validated['organising_institute'], 'address' => $validated['address'], @@ -76,7 +76,7 @@ class FacultyController extends Controller return redirect()->route('faculty.dashboard')->with('status', 'Response submitted successfully'); } catch (\Exception $e) { // Handle the exception and provide an error message - // dd($e); + dd($e); return back()->withErrors('An error occurred while submitting your response: ' . $e->getMessage()); } } diff --git a/app/Models/Response.php b/app/Models/ActivitiesAttended.php similarity index 94% rename from app/Models/Response.php rename to app/Models/ActivitiesAttended.php index c46fa5a..30f5d25 100644 --- a/app/Models/Response.php +++ b/app/Models/ActivitiesAttended.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class Response extends Model +class ActivitiesAttended extends Model { use HasFactory; diff --git a/database/migrations/2025_01_25_201943_create_responses_table.php b/database/migrations/2025_01_25_201943_create_activities_attendeds_table.php similarity index 85% rename from database/migrations/2025_01_25_201943_create_responses_table.php rename to database/migrations/2025_01_25_201943_create_activities_attendeds_table.php index 1c4effa..c61fba5 100644 --- a/database/migrations/2025_01_25_201943_create_responses_table.php +++ b/database/migrations/2025_01_25_201943_create_activities_attendeds_table.php @@ -4,13 +4,13 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateResponsesTable extends Migration +class CreateActivitiesAttendedsTable extends Migration { // Updated Migration public function up() { - Schema::create('responses', function (Blueprint $table) { + Schema::create('activities_attendeds', function (Blueprint $table) { $table->id(); $table->string('title'); $table->string('organising_institute'); @@ -33,6 +33,6 @@ class CreateResponsesTable extends Migration public function down() { - Schema::dropIfExists('responses'); + Schema::dropIfExists('activities_attendeds'); } } diff --git a/database/seeders/ResponsesTableSeeder.php b/database/seeders/ActivitiesAttendedResponsesTableSeeder.php similarity index 91% rename from database/seeders/ResponsesTableSeeder.php rename to database/seeders/ActivitiesAttendedResponsesTableSeeder.php index 11ece34..fa5fe6f 100644 --- a/database/seeders/ResponsesTableSeeder.php +++ b/database/seeders/ActivitiesAttendedResponsesTableSeeder.php @@ -3,10 +3,10 @@ namespace Database\Seeders; use Illuminate\Database\Seeder; -use App\Models\Response; +use App\Models\ActivitiesAttended; use Carbon\Carbon; -class ResponsesTableSeeder extends Seeder +class ActivitiesAttendedResponsesTableSeeder extends Seeder { /** * Run the database seeds. @@ -33,12 +33,12 @@ class ResponsesTableSeeder extends Seeder $numDays = $startDate->diffInDays($endDate) ?: 1; // Create the response record - Response::create([ + ActivitiesAttended::create([ 'title' => $titles[array_rand($titles)], // Random title '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, 3), // Random faculty ID + 'faculty_id' => rand(1, 2), // 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 diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index d0e6836..9f4049d 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -19,7 +19,7 @@ class DatabaseSeeder extends Seeder RoleSeeder::class, DepartmentSeeder::class, UsersTableSeeder::class, - ResponsesTableSeeder::class, + ActivitiesAttendedResponsesTableSeeder::class, ]); // User::factory()->create([ diff --git a/resources/views/admin/responses.blade.php b/resources/views/admin/activities-attended-responses.blade.php similarity index 99% rename from resources/views/admin/responses.blade.php rename to resources/views/admin/activities-attended-responses.blade.php index 43fa466..8b71715 100644 --- a/resources/views/admin/responses.blade.php +++ b/resources/views/admin/activities-attended-responses.blade.php @@ -184,7 +184,7 @@ }; } - initAjaxRoute("{{ route('admin.responses.data') }}"); + initAjaxRoute("{{ route('admin.ActivitiesAttendedResponses.data') }}"); }); diff --git a/resources/views/coordinator/responses.blade.php b/resources/views/coordinator/activities-attended-responses.blade.php similarity index 98% rename from resources/views/coordinator/responses.blade.php rename to resources/views/coordinator/activities-attended-responses.blade.php index 4f461ea..e751140 100644 --- a/resources/views/coordinator/responses.blade.php +++ b/resources/views/coordinator/activities-attended-responses.blade.php @@ -149,7 +149,7 @@ }); }; - initAjaxRoute("{{ route('coordinator.responses.data') }}"); + initAjaxRoute("{{ route('coordinator.ActivitiesAttendedResponses.data') }}"); }); diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 793a502..f432081 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -18,17 +18,17 @@ @php $role = auth()->user()->role->name; @endphp @if ($role === 'Admin') - Go to Admin Responses @elseif ($role === 'Coordinator') - Go to Coordinator Responses @elseif ($role === 'Faculty') - Go to Faculty Response Form diff --git a/resources/views/faculty/response-form.blade.php b/resources/views/faculty/activities-attended-form.blade.php similarity index 98% rename from resources/views/faculty/response-form.blade.php rename to resources/views/faculty/activities-attended-form.blade.php index 83f012c..f0058ad 100644 --- a/resources/views/faculty/response-form.blade.php +++ b/resources/views/faculty/activities-attended-form.blade.php @@ -12,7 +12,7 @@

-
+ @csrf
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index a613f2e..5e21df4 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -18,15 +18,15 @@ @if(auth()->user()->role->name === 'Admin') - + {{ __('Activities Attended') }} @elseif(auth()->user()->role->name === 'Coordinator') - + {{ __('Activities Attended') }} @elseif(auth()->user()->role->name === 'Faculty') - + {{ __('Activities Attended') }} @endif @@ -87,15 +87,15 @@ @if(auth()->user()->role->name === 'Admin') - + {{ __('Activities Attended') }} @elseif(auth()->user()->role->name === 'Coordinator') - + {{ __('Activities Attended') }} @elseif(auth()->user()->role->name === 'Faculty') - + {{ __('Activities Attended') }} @endif diff --git a/routes/web.php b/routes/web.php index 8d83887..3a3fc91 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,23 +39,23 @@ Route::middleware('auth')->group(function () { // Admin routes Route::middleware(['auth', CheckRole::class . ':Admin'])->group(function () { Route::get('/admin', [AdminController::class, 'index'])->name('admin.dashboard'); - Route::get('/admin/responses', [AdminController::class, 'viewResponses'])->name('admin.responses'); - Route::get('/admin/responses/data', [AdminController::class, 'getResponses'])->name('admin.responses.data'); + Route::get('/admin/ActivitiesAttendedResponses', [AdminController::class, 'viewActivitiesAttendedResponses'])->name('admin.ActivitiesAttendedResponses'); + Route::get('/admin/ActivitiesAttendedResponses/data', [AdminController::class, 'getActivitiesAttendedResponses'])->name('admin.ActivitiesAttendedResponses.data'); }); // Coordinator routes Route::middleware(['auth', CheckRole::class . ':Coordinator'])->group(function () { Route::get('/coordinator', [CoordinatorController::class, 'index'])->name('coordinator.dashboard'); - Route::get('/coordinator/responses', [CoordinatorController::class, 'viewResponses'])->name('coordinator.responses'); - Route::get('/coordinator/responses/data', [CoordinatorController::class, 'getResponses'])->name('coordinator.responses.data'); + Route::get('/coordinator/ActivitiesAttendedResponses', [CoordinatorController::class, 'viewActivitiesAttendedResponses'])->name('coordinator.ActivitiesAttendedResponses'); + Route::get('/coordinator/ActivitiesAttendedResponses/data', [CoordinatorController::class, 'getActivitiesAttendedResponses'])->name('coordinator.ActivitiesAttendedResponses.data'); }); // Faculty routes Route::middleware(['auth', CheckRole::class . ':Faculty'])->group(function () { Route::get('/faculty', [FacultyController::class, 'index'])->name('faculty.dashboard'); - Route::get('/faculty/response-form', [FacultyController::class, 'responseForm'])->name('faculty.responseForm'); - Route::post('/faculty/submit-response', [FacultyController::class, 'submitResponse'])->name('faculty.submitResponse'); + Route::get('/faculty/ActivitiesAttendedForm', [FacultyController::class, 'ActivitiesAttendedForm'])->name('faculty.ActivitiesAttendedForm'); + Route::post('/faculty/ActivitiesAttendedFormResponse', [FacultyController::class, 'ActivitiesAttendedFormResponse'])->name('faculty.ActivitiesAttendedFormResponse'); }); // API Resources