nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

remove dtstart/dtend .type because its redundant 

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke 2017-03-18 18:11:51 +01:00
parent cf9ce01cb4
commit e50ce2449c
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
3 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/app/controllers/editorcontroller.js
View File

@ -73,7 +73,7 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
};
$uibModalInstance.rendered.then(function() {
if ($scope.properties.dtend.type === 'date') {
if ($scope.properties.allDay) {
$scope.properties.dtend.value = moment($scope.properties.dtend.value.subtract(1, 'days'));
}
@ -137,12 +137,7 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
$scope.prepareClose = function() {
if ($scope.properties.allDay) {
$scope.properties.dtstart.type = 'date';
$scope.properties.dtend.type = 'date';
$scope.properties.dtend.value.add(1, 'days');
} else {
$scope.properties.dtstart.type = 'date-time';
$scope.properties.dtend.type = 'date-time';
}
angular.forEach($scope.postEditingHooks, function(callback) {

9
js/app/models/simpleEventModel.js
View File

@ -363,7 +363,6 @@ app.factory('SimpleEvent', function () {
parameters: {
zone: dtstart.zone.toString()
},
type: dtstart.icaltype,
value: moment({
years: dtstart.year,
months: dtstart.month - 1,
@ -377,7 +376,6 @@ app.factory('SimpleEvent', function () {
parameters: {
zone: dtend.zone.toString()
},
type: dtend.icaltype,
value: moment({
years: dtend.year,
months: dtend.month - 1,
@ -478,9 +476,8 @@ app.factory('SimpleEvent', function () {
vevent.removeAllProperties('dtend');
vevent.removeAllProperties('duration');
const isNewSimpleDataAllDay = (newSimpleData.dtstart.type === 'date' && newSimpleData.dtend.type === 'date');
// remove tzid property from allday events
if (isNewSimpleDataAllDay) {
if (newSimpleData.allDay) {
newSimpleData.dtstart.parameters.zone = 'floating';
newSimpleData.dtend.parameters.zone = 'floating';
}
@ -496,9 +493,9 @@ app.factory('SimpleEvent', function () {
}
const start = ICAL.Time.fromJSDate(newSimpleData.dtstart.value.toDate(), false);
start.isDate = isNewSimpleDataAllDay;
start.isDate = newSimpleData.allDay;
const end = ICAL.Time.fromJSDate(newSimpleData.dtend.value.toDate(), false);
end.isDate = isNewSimpleDataAllDay;
end.isDate = newSimpleData.allDay;
const alreadyStoredTimezones = ['UTC'];
const vtimezones = vevent.parent.getAllSubcomponents('vtimezone');

30
tests/js/unit/models/simpleEventModelSpec.js
View File

@ -1561,14 +1561,12 @@ END:VCALENDAR`;
expect(simple.dtstart).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
expect(simple.dtend).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
});
@ -1603,14 +1601,12 @@ END:VCALENDAR`;
expect(simple.dtstart).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
expect(simple.dtend).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
});
@ -1644,14 +1640,12 @@ END:VCALENDAR`;
expect(simple.dtstart).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
expect(simple.dtend).toEqual({
parameters: {
zone: 'Europe/Berlin'
},
type: 'date-time'
}
});
});
@ -1685,14 +1679,12 @@ END:VCALENDAR`;
expect(simple.dtstart).toEqual({
parameters: {
zone: 'floating'
},
type: 'date'
}
});
expect(simple.dtend).toEqual({
parameters: {
zone: 'floating'
},
type: 'date'
}
});
});
@ -1718,11 +1710,10 @@ END:VCALENDAR`;
const simple = SimpleEvent(event);
simple.allDay = false;
simple.dtstart.parameters.zone = 'Europe/Berlin';
simple.dtstart.type = 'date-time';
simple.dtstart.value.add(15, 'hours').add(30, 'minutes');
simple.dtend.parameters.zone = 'Europe/Berlin';
simple.dtend.type = 'date-time';
simple.dtend.value.add(16, 'hours');
simple.patch();
@ -1760,8 +1751,7 @@ END:VCALENDAR`;
const event = root.getFirstSubcomponent('vevent');
const simple = SimpleEvent(event);
simple.dtstart.type = 'date';
simple.dtend.type = 'date';
simple.allDay = true;
simple.patch();