Feat: Filter and improved UI

This commit is contained in:
Sallu9007
2025-04-16 15:32:59 +05:30
parent 411cc7fe03
commit 355eee4892
7 changed files with 520 additions and 161 deletions

View File

@@ -108,7 +108,7 @@ class ActivitiesAttendedController extends Controller
return response()->json(['success' => 'Record deleted successfully']);
}
public function getActivitiesAttendedResponses()
public function getActivitiesAttendedResponses(Request $request)
{
$user = auth()->user();
$isAdmin = $user->role->name === 'Admin';
@@ -130,6 +130,25 @@ class ActivitiesAttendedController extends Controller
->where('faculty_id', $user->id);
}
// Apply filters
if ($request->has('department') && !empty($request->department)) {
$responses->whereHas('department', function ($query) use ($request) {
$query->where('id', $request->department);
});
}
if ($request->has('category') && !empty($request->category)) {
$responses->where('category', $request->category);
}
if ($request->has('dateFrom') && !empty($request->dateFrom)) {
$responses->where('start_date', '>=', $request->dateFrom);
}
if ($request->has('dateTo') && !empty($request->dateTo)) {
$responses->where('end_date', '<=', $request->dateTo);
}
return DataTables::of($responses)
->addColumn('user_name', function ($response) {
return $response->user->name ?? 'Unknown';
@@ -175,7 +194,6 @@ class ActivitiesAttendedController extends Controller
$deleteRoute = route('activitiesAttended.destroy', $response->id);
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $response->id . '" data-url="' . $deleteRoute . '">Delete</button>';
return implode(' ', $actions);
})
->rawColumns(['action'])