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

44
app/Http/Controllers/ExternalEngagementController.php
View File

@@ -31,6 +31,10 @@ class ExternalEngagementController 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
@@ -94,7 +98,7 @@ class ExternalEngagementController extends Controller
return response()->json(['success' => 'External Engagement record deleted successfully']);
}
public function getExternalEngagementResponses()
public function getExternalEngagementResponses(Request $request)
{
$user = auth()->user();
$isAdmin = $user->role->name === 'Admin';
@@ -116,6 +120,24 @@ class ExternalEngagementController extends Controller
->where('faculty_id', $user->id);
}
// Apply filters
if ($request->has('department') && !empty($request->department)) {
$externalEngagements->whereHas('department', function ($query) use ($request) {
$query->where('id', $request->department);
});
}
if ($request->has('activity') && !empty($request->activity)) {
$externalEngagements->where('activity', $request->activity);
}
if ($request->has('dateFrom') && !empty($request->dateFrom)) {
$externalEngagements->where('start_date', '>=', $request->dateFrom);
}
if ($request->has('dateTo') && !empty($request->dateTo)) {
$externalEngagements->where('end_date', '<=', $request->dateTo);
}
return DataTables::of($externalEngagements)
->addColumn('user_name', function ($externalEngagement) {
@@ -142,6 +164,20 @@ class ExternalEngagementController extends Controller
->addColumn('num_days', function ($externalEngagement) {
return $externalEngagement->num_days ?? 'Unknown';
})
->filterColumn('user_name', function($query, $keyword) {
$query->whereHas('user', function($q) use ($keyword) {
$q->where('name', 'like', "%{$keyword}%");
});
})
->filterColumn('activity_description', function($query, $keyword) {
$query->where('activity_description', 'like', "%{$keyword}%");
})
->filterColumn('inviting_organization', function($query, $keyword) {
$query->where('inviting_organization', 'like', "%{$keyword}%");
})
->filterColumn('num_days', function($query, $keyword) {
$query->where('num_days', 'like', "%{$keyword}%");
})
->addColumn('action', function ($externalEngagement) {
$actions = [];
@@ -149,7 +185,7 @@ class ExternalEngagementController extends Controller
if ($externalEngagement->proof) {
$actions[] = '<a href="' . asset('storage/' . $externalEngagement->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
@@ -163,10 +199,10 @@ class ExternalEngagementController extends Controller
$editRoute = route('faculty.ExternalEngagement.edit', $externalEngagement->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('externalEngagement.destroy', $externalEngagement->id);
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $externalEngagement->id . '" data-url="' . $deleteRoute . '">Delete</button>';
$actions[] = '<button type="button" class="btn btn-sm btn-danger delete-btn" data-id="' . $externalEngagement->id . '" data-url="' . $deleteRoute . '"><i class="fas fa-trash"></i></button>';
return implode(' ', $actions);
})