extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Sort similar length all day events alphabetically

Browse Source
This commit is contained in:
nathan 2021-11-09 08:52:11 -07:00
parent 5477f3d095
commit bd507ca1a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/et2_widget_daycol.js
View File

@ -728,7 +728,7 @@ var et2_calendar_daycol = /** @class */ (function (_super) {
// Longer duration comes first so we have nicer bars across the top
var duration = (new Date(b.options.value.end) - new Date(b.options.value.start)) -
(new Date(a.options.value.end) - new Date(a.options.value.start));
return duration ? duration : (a.options.value.app_id - b.options.value.app_id);
return (Math.abs(duration) > 360000) ? duration : (a.options.value.title.localeCompare(b.options.value.title));
}
else if (a.options.value.whole_day || b.options.value.whole_day) {
return a.options.value.whole_day ? -1 : 1;

2
calendar/js/et2_widget_daycol.ts
View File

@ -921,7 +921,7 @@ export class et2_calendar_daycol extends et2_valueWidget implements et2_IDetache
(new Date(b.options.value.end) - new Date(b.options.value.start)) -
(new Date(a.options.value.end) - new Date(a.options.value.start));
return duration ? duration : (a.options.value.app_id - b.options.value.app_id);
return (Math.abs(duration) > 360000) ? duration : (a.options.value.title.localeCompare(b.options.value.title));
}
else if (a.options.value.whole_day || b.options.value.whole_day)
{