bug fixes, daily reports, holidays
This commit is contained in:
@@ -17,7 +17,6 @@ class StaffMembersController extends Controller
|
||||
{
|
||||
$query = StaffMember::query();
|
||||
|
||||
// 1. Search Filter
|
||||
if ($request->filled('search')) {
|
||||
$search = $request->search;
|
||||
$query->where(function($q) use ($search) {
|
||||
@@ -28,12 +27,11 @@ class StaffMembersController extends Controller
|
||||
});
|
||||
}
|
||||
|
||||
// 2. Department Filter
|
||||
if ($request->filled('department_id')) {
|
||||
$query->where('department_id', $request->department_id);
|
||||
}
|
||||
|
||||
// 3. Status Filter
|
||||
|
||||
if ($request->filled('status')) {
|
||||
$query->where('status', $request->status);
|
||||
}
|
||||
@@ -41,15 +39,19 @@ class StaffMembersController extends Controller
|
||||
$staffMembers = $query->orderBy('name', 'asc')->paginate(12);
|
||||
$staffMembers->appends($request->query());
|
||||
|
||||
// Fetch dynamic dropdown lists
|
||||
$departments = Department::orderBy('name', 'asc')->get();
|
||||
$countries = Country::orderBy('en_short_name', 'asc')->get();
|
||||
$allstaffMembers = StaffMember::orderBy('name')->get(['id', 'name']);
|
||||
|
||||
// dd($staffMembers);
|
||||
// dd(\Auth::user()->designation);
|
||||
$data = [
|
||||
'staffMembers' => $staffMembers,
|
||||
'departments' => $departments,
|
||||
'allstaffMembers' => $allstaffMembers,
|
||||
'countries' => $countries,
|
||||
];
|
||||
|
||||
|
||||
return view('staff.index', $data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user