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

fix(attendance): handle rest_day status in db, seeder, and UI

Browse Source
This commit is contained in:
admin
2026-04-28 22:24:48 +08:00
parent 4a712f55f2
commit 6b6763fec9
6 changed files with 147 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AttendanceRecordController.php
View File

@@ -947,7 +947,7 @@ class AttendanceRecordController extends Controller
'clock_in' => $record->clock_in ? \Carbon\Carbon::parse($record->clock_in)->format('H:i') : null,
'clock_out' => $record->clock_out ? \Carbon\Carbon::parse($record->clock_out)->format('H:i') : null,
'notes' => $record->notes,
'status' => $record->status,
'status' => $record->is_rest_day ? 'rest_day' : $record->status,
];
$shift = $user->employee->shift ?? null;