admin/HRM-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ShiftController.php

Browse Source
This commit is contained in:
dvappnnt
2026-04-20 15:31:09 +08:00
parent 6139093af4
commit bfec5d40d9
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/ShiftController.php
View File

@@ -247,6 +247,7 @@ class ShiftController extends Controller
'attendance_records.employee_id as user_id',
'attendance_records.date',
'attendance_records.is_rest_day',
'attendance_records.shift_id',
'shifts.name as shift_name'
)
->get()
@@ -268,22 +269,31 @@ class ShiftController extends Controller
// If attendance record specifically marks it as a globally tracked Rest Day
if ($record->is_rest_day) {
$status = 'RD';
$shiftName = 'Rest Day';
$shiftId = null;
} else if ($record->shift_name) {
// Extract shift safely
$status = strtoupper(substr($record->shift_name, 0, 1));
$shiftName = $record->shift_name;
$shiftId = $record->shift_id;
} else if ($user->employee && $user->employee->shift) {
// Record exists, but shift mapping is blank. Fallback to employee profile shift.
$status = strtoupper(substr($user->employee->shift->name, 0, 1));
$shiftName = $user->employee->shift->name;
$shiftId = $user->employee->shift->id;
}
} else if ($user->employee && $user->employee->shift) {
// Completely blank record; safely map to their default assigned Employee Shift!
// Removed hardcoded Sat/Sun filters because `attendance_records` strictly dictates actual weekend behavior now!
$status = strtoupper(substr($user->employee->shift->name, 0, 1));
$shiftName = $user->employee->shift->name;
$shiftId = $user->employee->shift->id;
}
$grid[$dateKey] = [
'status' => $status,
'shift_name' => $shiftName
'shift_name' => $shiftName,
'shift_id' => $shiftId ?? ''
];
}