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

fix(hr): automatically show RD status for rest days based on global settings even if no record exists

Browse Source
This commit is contained in:
admin
2026-04-28 18:28:06 +08:00
parent 6d75d3afc0
commit 2419abfb21
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -893,19 +893,34 @@ class AttendanceRecordController extends Controller
->get()
->groupBy('employee_id');
$users = $usersRaw->map(function($user) use ($dates, $dailyRecords, $approvedLeaves) {
// Fetch working days indices from settings [0=Sun, 1=Mon, ..., 6=Sat]
$globalSettings = settings();
$workingDaysIndices = json_decode($globalSettings['working_days'] ?? '[1,2,3,4,5]', true);
$users = $usersRaw->map(function($user) use ($dates, $dailyRecords, $approvedLeaves, $workingDaysIndices) {
$grid = [];
$userRecords = $dailyRecords->has($user->id) ? $dailyRecords[$user->id]->keyBy('date') : collect();
foreach ($dates as $d) {
$dateKey = $d['date'];
// Default matrix values based on time mechanics
$isPast = \Carbon\Carbon::parse($dateKey)->isBefore(\Carbon\Carbon::today());
// Default matrix values based on time mechanics and global settings
$dateObj = \Carbon\Carbon::parse($dateKey);
$isPast = $dateObj->isBefore(\Carbon\Carbon::today());
$dateIndex = $dateObj->dayOfWeek;
$isWeekend = ($d['day_name'] === 'Sat' || $d['day_name'] === 'Sun');
$isRestDay = !in_array($dateIndex, $workingDaysIndices);
$status = $isPast ? '--' : ($isWeekend ? 'W' : '--');
$label = 'Not Marked';
if ($isRestDay) {
$status = 'RD';
$label = 'Rest Day';
} else if ($isWeekend) {
$status = 'W';
$label = 'Weekend';
} else {
$status = '--';
$label = 'Not Marked';
}
$recordDetail = null;
if ($userRecords->has($dateKey)) {