Refactor: responses as ActivitesAttended

This commit is contained in:
Sallu9007
2025-03-23 16:18:07 +05:30
parent e27937c29f
commit 8c4e18e702
13 changed files with 72 additions and 72 deletions

View File

@@ -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
? '<a href="' . asset('storage/' . $response->proof) . '" target="_blank" class="btn btn-sm btn-primary">View</a>'
: '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
? '<a href="' . asset('storage/' . $response->proof) . '" target="_blank" class="btn btn-sm btn-primary">View</a>'
: 'No Proof';
return $viewButton;
})
->rawColumns(['action'])
->make(true);
}
}

View File

@@ -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)

View File

@@ -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());
}
}

View File

@@ -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;