diff --git a/system1-factory/web/js/monthly-comparison.js b/system1-factory/web/js/monthly-comparison.js index b851f57..88e718f 100644 --- a/system1-factory/web/js/monthly-comparison.js +++ b/system1-factory/web/js/monthly-comparison.js @@ -265,14 +265,21 @@ function renderDailyList(records) { if (r.attendance) { const vacInfo = r.attendance.vacation_type ? ` (${r.attendance.vacation_type})` : ''; - const editBtn = currentMode === 'detail' ? `` : ''; - attendLine = `
근태관리: ${r.attendance.total_work_hours}h (${escHtml(r.attendance.attendance_type)}${vacInfo})${editBtn}
`; + // 주말+0h → 편집 불필요 + const showEdit = currentMode === 'detail' && !(r.is_holiday && r.attendance.total_work_hours === 0); + const editBtn = showEdit ? `` : ''; + // 주말+0h → 근태 행 숨김 (주말로 표시) + if (r.is_holiday && r.attendance.total_work_hours === 0) { + // 주말 표시만, 근태 행 생략 + } else { + attendLine = `
근태관리: ${r.attendance.total_work_hours}h (${escHtml(r.attendance.attendance_type)}${vacInfo})${editBtn}
`; + } } else if (r.status !== 'holiday') { const addBtn = currentMode === 'detail' ? `` : ''; attendLine = `
근태관리: 미입력${addBtn}
`; } - if (r.status === 'mismatch' && r.hours_diff) { + if (r.hours_diff && r.hours_diff !== 0) { const sign = r.hours_diff > 0 ? '+' : ''; diffLine = `
차이: ${sign}${r.hours_diff}h
`; } @@ -620,15 +627,7 @@ function escHtml(s) { return (s || '').replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); } -function showToast(msg, type) { - if (window.showToast) { window.showToast(msg, type); return; } - const c = document.getElementById('toastContainer'); - const t = document.createElement('div'); - t.className = `toast toast-${type || 'info'}`; - t.textContent = msg; - c.appendChild(t); - setTimeout(() => t.remove(), 3000); -} +// showToast — tkfb-core.js의 전역 showToast 사용 (재정의 불필요) // ===== Inline Attendance Edit (detail mode) ===== function getAttendanceTypeId(hours, vacTypeId) { diff --git a/system1-factory/web/pages/attendance/monthly-comparison.html b/system1-factory/web/pages/attendance/monthly-comparison.html index c9aab78..4cd3e81 100644 --- a/system1-factory/web/pages/attendance/monthly-comparison.html +++ b/system1-factory/web/pages/attendance/monthly-comparison.html @@ -164,7 +164,7 @@ - +