diff --git a/src/assets/js/backend_calendar_table_view.js b/src/assets/js/backend_calendar_table_view.js
index 9131301e..bd00511f 100644
--- a/src/assets/js/backend_calendar_table_view.js
+++ b/src/assets/js/backend_calendar_table_view.js
@@ -165,8 +165,8 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$(event.target).popover('toggle');
// Fix popover position
- if ($('.popover').length > 0) {
- if ($('.popover').position().top < 200) $('.popover').css('top', '200px');
+ if ($('.popover').length > 0 && $('.popover').position().top < 200) {
+ $('.popover').css('top', '200px');
}
});
@@ -606,7 +606,8 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$event.html(
appointment.customer.last_name +
- ' ' + startDate.toString('HH:mm') + ' (' + eventDuration + '\')'
+ ' ' + startDate.toString('HH:mm') + ' '
+ + (eventDuration !== parseInt(appointment.service.duration) ? '(' + eventDuration + '\')' : '')
);
$event.data(appointment);