Fix attendance calendar to read shift from attendance record instead of employee default

2026-04-29 19:23:05 +08:00
parent 081ca2d0c4
commit c4d24427fa
417 changed files with 14544 additions and 14531 deletions
--- a/app/Http/Controllers/ShiftController.php
+++ b/app/Http/Controllers/ShiftController.php
@@ -311,8 +311,8 @@ class ShiftController extends Controller
                        'status' => $status,
                        'shift_name' => $shiftName,
                        'shift_id' => $shiftId ?? '',
-                        'start_time' => $startTime ?? null,
-                        'end_time' => $endTime ?? null
+                        'start_time' => isset($startTime) && $startTime ? \Carbon\Carbon::parse($startTime)->format('h:iA') : null,
+                        'end_time' => isset($endTime) && $endTime ? \Carbon\Carbon::parse($endTime)->format('h:iA') : null
                    ];
                }