extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change timespan formatting to always show start & end time for single day events, similar to multi-day events

Browse Source
This commit is contained in:
nathangray 2016-07-28 16:39:26 -06:00
parent 14fbd7fcd5
commit e3dd5ad4c4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/et2_widget_event.js
View File

@ -655,7 +655,18 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
{"ampm": (egw.preference("timeformat") === "12")} {"ampm": (egw.preference("timeformat") === "12")}
).trim(); ).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; return timespan;
}, },