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

fix: resolve FormData rest_days array serialization bug in employee forms

Browse Source
This commit is contained in:
admin
2026-04-30 12:13:53 +08:00
parent 23bff0928e
commit 69c5b4ff89
523 changed files with 15314 additions and 34578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,6 +179,7 @@ class AttendanceRecordController extends Controller
'id' => $user->id,
'name' => $user->name,
'employee_id' => $user->employee->employee_id ?? '',
'rest_days' => $user->employee->rest_days ?? [],
'shift' => $user->employee->shift ? [
'start_time' => $user->employee->shift->start_time,
'end_time' => $user->employee->shift->end_time,
@@ -1010,8 +1011,13 @@ class AttendanceRecordController extends Controller
}
if ($record->is_rest_day) {
$status = 'RD';
$label = 'Rest Day';
if ($record->overtime_hours >= 1.0) {
$status = 'RD+OT';
$label = 'Rest Day + Overtime';
} else {
$status = 'RD';
$label = 'Rest Day';
}
} else if ($record->is_holiday || $record->status === 'holiday') {
$status = 'HD';
$label = 'Holiday';