All pages updated with all features including filters
This commit is contained in:
@@ -30,6 +30,10 @@ class OnlineCoursesController extends Controller
|
||||
'proof' => 'nullable|mimes:jpg,jpeg,png,pdf,doc,docx,zip',
|
||||
]);
|
||||
|
||||
// Combine start date and time
|
||||
$startDateTime = date('Y-m-d H:i:s', strtotime("{$validated['start_date']} {$validated['start_time']}"));
|
||||
$endDateTime = date('Y-m-d H:i:s', strtotime("{$validated['end_date']} {$validated['end_time']}"));
|
||||
|
||||
// Handle the file upload if a new file is provided
|
||||
if ($request->hasFile('proof')) {
|
||||
// Delete old file if exists
|
||||
@@ -40,6 +44,7 @@ class OnlineCoursesController extends Controller
|
||||
// Extract year from start_date
|
||||
$year = date('Y', strtotime($validated['start_date']));
|
||||
$username = $onlineCourse->user->name;
|
||||
$userId = $onlineCourse->user->id;
|
||||
|
||||
$originalName = $request->file('proof')->getClientOriginalName();
|
||||
$fileName = $username . '_' . $originalName;
|
||||
@@ -92,7 +97,7 @@ class OnlineCoursesController extends Controller
|
||||
return response()->json(['success' => 'online Course record deleted successfully']);
|
||||
}
|
||||
|
||||
public function getOnlineCoursesResponses()
|
||||
public function getOnlineCoursesResponses(Request $request)
|
||||
{
|
||||
$user = auth()->user();
|
||||
$isAdmin = $user->role->name === 'Admin';
|
||||
@@ -114,6 +119,24 @@ class OnlineCoursesController extends Controller
|
||||
->where('faculty_id', $user->id);
|
||||
}
|
||||
|
||||
// Apply filters
|
||||
if ($request->has('department') && !empty($request->department)) {
|
||||
$onlineCourses->whereHas('department', function ($query) use ($request) {
|
||||
$query->where('id', $request->department);
|
||||
});
|
||||
}
|
||||
|
||||
if ($request->has('offered_by') && !empty($request->offered_by)) {
|
||||
$onlineCourses->where('offered_by', $request->offered_by);
|
||||
}
|
||||
|
||||
if ($request->has('dateFrom') && !empty($request->dateFrom)) {
|
||||
$onlineCourses->where('start_date', '>=', $request->dateFrom);
|
||||
}
|
||||
|
||||
if ($request->has('dateTo') && !empty($request->dateTo)) {
|
||||
$onlineCourses->where('end_date', '<=', $request->dateTo);
|
||||
}
|
||||
|
||||
return DataTables::of($onlineCourses)
|
||||
->addColumn('user_name', function ($onlineCourse) {
|
||||
@@ -122,9 +145,17 @@ class OnlineCoursesController extends Controller
|
||||
->addColumn('department_name', function ($onlineCourse) {
|
||||
return $onlineCourse->department->name ?? 'Unknown';
|
||||
})
|
||||
->filterColumn('user_name', function($query, $keyword) {
|
||||
$query->whereHas('user', function($q) use ($keyword) {
|
||||
$q->where('name', 'like', "%{$keyword}%");
|
||||
});
|
||||
})
|
||||
->addColumn('course', function ($onlineCourse) {
|
||||
return $onlineCourse->course ?? 'Unknown';
|
||||
})
|
||||
->filterColumn('course', function($query, $keyword) {
|
||||
$query->where('course', 'like', "%{$keyword}%");
|
||||
})
|
||||
->addColumn('offered_by', function ($onlineCourse) {
|
||||
return $onlineCourse->offered_by ?? 'Unknown';
|
||||
})
|
||||
@@ -137,14 +168,17 @@ class OnlineCoursesController extends Controller
|
||||
->addColumn('num_days', function ($onlineCourse) {
|
||||
return $onlineCourse->num_days ?? 'Unknown';
|
||||
})
|
||||
->filterColumn('num_days', function($query, $keyword) {
|
||||
$query->where('num_days', 'like', "%{$keyword}%");
|
||||
})
|
||||
->addColumn('action', function ($onlineCourse) {
|
||||
$actions = [];
|
||||
|
||||
// View proof button for everyone
|
||||
if ($onlineCourse->proof) {
|
||||
$actions[] = '<a href="' . asset('storage/' . $onlineCourse->proof) . '" target="_blank" class="btn btn-sm btn-primary mr-1">View</a>';
|
||||
$actions[] = '<a href="' . asset('storage/' . $onlineCourse->proof) . '" target="_blank" class="btn btn-sm btn-primary mr-1"><i class="fas fa-eye"></i></a>';
|
||||
} else {
|
||||
$actions[] = 'No Proof';
|
||||
$actions[] = '<span class="text-muted"><i class="fas fa-times-circle"></i></span>';
|
||||
}
|
||||
|
||||
// Edit button with role-appropriate route
|
||||
@@ -158,10 +192,10 @@ class OnlineCoursesController extends Controller
|
||||
$editRoute = route('faculty.OnlineCourses.edit', $onlineCourse->id);
|
||||
}
|
||||
|
||||
$actions[] = '<a href="' . $editRoute . '" class="btn btn-sm btn-info mx-1">Edit</a>';
|
||||
$actions[] = '<a href="' . $editRoute . '" class="btn btn-sm btn-info mx-1"><i class="fas fa-edit"></i></a>';
|
||||
|
||||
$deleteRoute = route('onlineCourses.destroy', $onlineCourse->id);
|
||||
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $onlineCourse->id . '" data-url="' . $deleteRoute . '">Delete</button>';
|
||||
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $onlineCourse->id . '" data-url="' . $deleteRoute . '"><i class="fas fa-trash"></i></button>';
|
||||
|
||||
return implode(' ', $actions);
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user