Arthur Mello has proposed merging lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1544582 into lp:ubuntu-calendar-app.
Commit message: Add support to create and import/export events with start date equals to end date Requested reviews: Ubuntu Calendar Developers (ubuntu-calendar-dev) Related bugs: Bug #1544582 in Ubuntu Calendar App: "starttime cannot be equal to endtime" https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1544582 For more details, see: https://code.launchpad.net/~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1544582/+merge/289278 Add support to create and import/export events with start date equals to end date -- Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1544582 into lp:ubuntu-calendar-app.
=== modified file 'NewEvent.qml' --- NewEvent.qml 2016-03-14 20:25:50 +0000 +++ NewEvent.qml 2016-03-16 19:14:10 +0000 @@ -172,7 +172,7 @@ //Save the new or Existing event function saveToQtPim() { internal.clearFocus() - if ( startDate >= endDate && !allDayEventCheckbox.checked) { + if ( startDate > endDate && !allDayEventCheckbox.checked) { PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")}); } else { var newCollection = calendarsOption.model[calendarsOption.selectedIndex].collectionId; === modified file 'TimeLineBase.qml' --- TimeLineBase.qml 2016-03-03 21:42:08 +0000 +++ TimeLineBase.qml 2016-03-16 19:14:10 +0000 @@ -95,8 +95,15 @@ dirty = true } if (e.endDateTime.getTime() != events[i].eventEndTime) { - console.warn("Event does not match end time") - dirty = true + if (!isNaN(e.endDateTime.getTime()) && !isNaN(events[i].eventEndTime)) { + console.warn("Event does not match end time") + dirty = true + } else { + // Sometimes when both star and end time are equals + // end time is reported as empty + e.endDateTime = e.startDateTime + events[i].eventEndTime = events[i].eventStartTime + } } if (dirty) {
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp