diff --git a/system1-factory/api/controllers/monthlyComparisonController.js b/system1-factory/api/controllers/monthlyComparisonController.js index b61b957..49a7ec8 100644 --- a/system1-factory/api/controllers/monthlyComparisonController.js +++ b/system1-factory/api/controllers/monthlyComparisonController.js @@ -98,7 +98,10 @@ async function buildComparisonData(userId, year, month) { attendance: attend ? { total_work_hours: parseFloat(attend.total_work_hours), attendance_type: attend.attendance_type_name || '', - vacation_type: attend.vacation_type_name || null + attendance_type_id: attend.attendance_type_id || null, + vacation_type: attend.vacation_type_name || null, + vacation_type_id: attend.vacation_type_id || null, + vacation_days: attend.vacation_days ? parseFloat(attend.vacation_days) : null } : null, status, hours_diff: hoursDiff diff --git a/system1-factory/web/js/monthly-comparison.js b/system1-factory/web/js/monthly-comparison.js index f09bc69..b851f57 100644 --- a/system1-factory/web/js/monthly-comparison.js +++ b/system1-factory/web/js/monthly-comparison.js @@ -656,6 +656,7 @@ function editAttendance(date, currentHours, currentVacTypeId) { +
@@ -672,6 +673,7 @@ function onVacTypeChange(date) { if (vacType === '1') hoursInput.value = '0'; // 연차 → 0시간 else if (vacType === '2') hoursInput.value = '4'; // 반차 → 4시간 else if (vacType === '3') hoursInput.value = '6'; // 반반차 → 6시간 + else if (vacType === '10') hoursInput.value = '2'; // 조퇴 → 2시간 } async function saveAttendance(date) { diff --git a/system1-factory/web/pages/attendance/monthly-comparison.html b/system1-factory/web/pages/attendance/monthly-comparison.html index cb5512d..c9aab78 100644 --- a/system1-factory/web/pages/attendance/monthly-comparison.html +++ b/system1-factory/web/pages/attendance/monthly-comparison.html @@ -164,7 +164,7 @@ - +