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) { +