From e3dd5ad4c4ee3257bd29c9751babc428ab755633 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 28 Jul 2016 16:39:26 -0600 Subject: [PATCH] Change timespan formatting to always show start & end time for single day events, similar to multi-day events --- calendar/js/et2_widget_event.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js index e34072da89..38bf13bc02 100644 --- a/calendar/js/et2_widget_event.js +++ b/calendar/js/et2_widget_event.js @@ -655,7 +655,18 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten {"ampm": (egw.preference("timeformat") === "12")} ).trim(); - timespan += ' ' + duration; + timespan += ' - ' + jQuery.datepicker.formatTime( + egw.preference("timeformat") === "12" ? "h:mmtt" : "HH:mm", + { + hour: event.end_m / 60, + minute: event.end_m % 60, + seconds: 0, + timezone: 0 + }, + {"ampm": (egw.preference("timeformat") === "12")} + ).trim(); + + timespan += ': ' + duration; } return timespan; },