diff --git a/verdigado_attendance/data/base_ical.xml b/verdigado_attendance/data/base_ical.xml index 977e99d..3f8639e 100644 --- a/verdigado_attendance/data/base_ical.xml +++ b/verdigado_attendance/data/base_ical.xml @@ -5,14 +5,10 @@ [('user_id', '=', user.id)] str(record.id) - - (record.request_unit_half or record.request_unit_hours) and record.date_from - or record.date_from.date() - - - (record.request_unit_half or record.request_unit_hours) and record.date_to - or (record.date_to.date() + timedelta(days=1)) - + + (record.request_unit_half or record.request_unit_hours) and record.date_from or record.date_from.date() + (record.request_unit_half or record.request_unit_hours) and record.date_to or (record.date_to.date() + timedelta(days=1)) + record.name @@ -25,14 +21,10 @@ user.employee_id.department_id.id), ('user_id', '!=', user.id)] str(record.id) - - (record.request_unit_half or record.request_unit_hours) and record.date_from - or record.date_from.date() - - - (record.request_unit_half or record.request_unit_hours) and record.date_to - or (record.date_to.date() + timedelta(days=1)) - + + (record.request_unit_half or record.request_unit_hours) and record.date_from or record.date_from.date() + (record.request_unit_half or record.request_unit_hours) and record.date_to or (record.date_to.date() + timedelta(days=1)) + record.name diff --git a/verdigado_attendance/static/src/js/time_off_calendar.js b/verdigado_attendance/static/src/js/time_off_calendar.js index 38c5195..0690726 100644 --- a/verdigado_attendance/static/src/js/time_off_calendar.js +++ b/verdigado_attendance/static/src/js/time_off_calendar.js @@ -24,6 +24,8 @@ odoo.define("verdigado_attendance.time_off_calendar", function (require) { if (ical_calendars.length === 0) { $links.hide(); } else { + $links.children("a").remove(); + $links.children("br").remove(); _.chain(ical_calendars) .filter("user_active") .each(function (ical) {