CSI-KJSCE/Faculty-Documentation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All pages updated with all features including filters

Browse Source
This commit is contained in:
tanmaychinchore
2025-10-08 20:08:52 +05:30
parent e07ac3f604
commit 8fe0ef8112
20 changed files with 3194 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Controllers/IvOrganisedController.php
View File

@@ -52,6 +52,7 @@ class IvOrganisedController 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;
@@ -109,12 +110,12 @@ class IvOrganisedController extends Controller
return response()->json(['success' => 'Industrial visit record deleted successfully']);
}
public function getIvOrganisedResponses()
public function getIvOrganisedResponses(Request $request)
{
$user = auth()->user();
$isAdmin = $user->role->name === 'Admin';
$isCoordinator = $user->role->name === 'Coordinator';
// Query based on role
if ($isAdmin) {
// Admin sees all records
@@ -131,6 +132,25 @@ class IvOrganisedController 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('target_audience') && !empty($request->target_audience)) {
$responses->where('target_audience', $request->target_audience);
}
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';
@@ -157,7 +177,7 @@ class IvOrganisedController extends Controller
if ($response->proof) {
$actions[] = '<a href="' . asset('storage/' . $response->proof) . '" target="_blank" class="btn btn-sm btn-primary mr-1">View</a>';
} else {
$actions[] = 'No Proof';
$actions[] = '<span class="text-muted"><i class="fas fa-times-circle"></i></span>';
}
// Edit button with role-appropriate route
@@ -171,10 +191,10 @@ class IvOrganisedController extends Controller
$editRoute = route('faculty.IvOrganised.edit', $response->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('ivOrganised.destroy', $response->id);
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $response->id . '" data-url="' . $deleteRoute . '">Delete</button>';
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $response->id . '" data-url="' . $deleteRoute . '"><i class="fas fa-trash"></i></button>';
return implode(' ', $actions);
})
@@ -201,7 +221,7 @@ class IvOrganisedController extends Controller
'end_time' => 'required|date_format:H:i',
'faculty_id' => 'required|exists:users,id',
'department_id' => 'required|exists:departments,id',
'proof' => 'required|mimes:jpg,jpeg,png,pdf,doc,docx,zip',
'proof' => 'nullable|mimes:jpg,jpeg,png,pdf,doc,docx,zip',
]);
// Combine start date and time