extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix timespan in tooltip was wrong if event had seconds in start or end time

Browse Source
This commit is contained in:
nathangray 2021-02-01 10:08:14 -07:00
parent 7cd5562a8b
commit 929e862559
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_daycol.js
View File

@ -22,6 +22,7 @@ var __extends = (this && this.__extends) || (function () {
}; };
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.et2_calendar_daycol = void 0;
/*egw:uses /*egw:uses
et2_core_valueWidget; et2_core_valueWidget;
/calendar/js/et2_widget_event.js; /calendar/js/et2_widget_event.js;
@ -165,7 +166,7 @@ var et2_calendar_daycol = /** @class */ (function (_super) {
get: function () { get: function () {
return this._date_helper; return this._date_helper;
}, },
enumerable: true, enumerable: false,
configurable: true configurable: true
}); });
/** /**
@ -744,12 +745,12 @@ var et2_calendar_daycol = /** @class */ (function (_super) {
if (typeof event_3.end !== 'object') { if (typeof event_3.end !== 'object') {
event_3.end = new Date(event_3.end); event_3.end = new Date(event_3.end);
} }
event_3['start_m'] = (event_3.start.valueOf() / 1000 - day_start) / 60; event_3['start_m'] = parseInt(String((event_3.start.valueOf() / 1000 - day_start) / 60), 10);
if (event_3['start_m'] < 0) { if (event_3['start_m'] < 0) {
event_3['start_m'] = 0; event_3['start_m'] = 0;
event_3['multiday'] = true; event_3['multiday'] = true;
} }
event_3['end_m'] = (event_3.end.valueOf() / 1000 - day_start) / 60; event_3['end_m'] = parseInt(String((event_3.end.valueOf() / 1000 - day_start) / 60), 10);
if (event_3['end_m'] >= 24 * 60) { if (event_3['end_m'] >= 24 * 60) {
event_3['end_m'] = 24 * 60 - 1; event_3['end_m'] = 24 * 60 - 1;
event_3['multiday'] = true; event_3['multiday'] = true;

4
calendar/js/et2_widget_daycol.ts
View File

@ -943,13 +943,13 @@ export class et2_calendar_daycol extends et2_valueWidget implements et2_IDetache
{ {
event.end = new Date(event.end); event.end = new Date(event.end);
} }
event['start_m'] = (event.start.valueOf()/1000 - day_start) / 60; event['start_m'] = parseInt(String((event.start.valueOf() / 1000 - day_start) / 60), 10);
if (event['start_m'] < 0) if (event['start_m'] < 0)
{ {
event['start_m'] = 0; event['start_m'] = 0;
event['multiday'] = true; event['multiday'] = true;
} }
event['end_m'] = (event.end.valueOf()/1000 - day_start) / 60; event['end_m'] = parseInt(String((event.end.valueOf() / 1000 - day_start) / 60), 10);
if (event['end_m'] >= 24*60) if (event['end_m'] >= 24*60)
{ {
event['end_m'] = 24*60-1; event['end_m'] = 24*60-1;