|
|
|
@ -104,10 +104,6 @@ Messages.calendar_allDay = "All day";
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
var newEvent = function (data, cb) {
|
|
|
|
|
var start = data.start;
|
|
|
|
|
var end = data.end;
|
|
|
|
|
data.start = +new Date(start._date);
|
|
|
|
|
data.end = +new Date(end._date);
|
|
|
|
|
APP.module.execCommand('CREATE_EVENT', data, function (obj) {
|
|
|
|
|
if (obj && obj.error) { return void cb(obj.error); }
|
|
|
|
|
cb(null, obj);
|
|
|
|
@ -173,6 +169,14 @@ Messages.calendar_allDay = "All day";
|
|
|
|
|
var obj = data.content[uid];
|
|
|
|
|
obj.title = obj.title || "";
|
|
|
|
|
obj.location = obj.location || "";
|
|
|
|
|
if (obj.isAllDay && obj.startDay) { obj.start = +new Date(obj.startDay); }
|
|
|
|
|
if (obj.isAllDay && obj.endDay) {
|
|
|
|
|
var endDate = new Date(obj.endDay);
|
|
|
|
|
endDate.setHours(23);
|
|
|
|
|
endDate.setMinutes(59);
|
|
|
|
|
endDate.setSeconds(59);
|
|
|
|
|
obj.end = +endDate;
|
|
|
|
|
}
|
|
|
|
|
if (c.readOnly) {
|
|
|
|
|
obj.isReadOnly = true;
|
|
|
|
|
}
|
|
|
|
@ -678,17 +682,28 @@ Messages.calendar_allDay = "All day";
|
|
|
|
|
// Use template to hide "recurrenceRule" from the detailPopup or at least to use
|
|
|
|
|
// a non technical value
|
|
|
|
|
|
|
|
|
|
var startDate = event.start._date;
|
|
|
|
|
var endDate = event.end._date;
|
|
|
|
|
var startDay, endDay;
|
|
|
|
|
if (event.isAllDay) {
|
|
|
|
|
startDay = startDate.getFullYear() + '-' + (startDate.getMonth()+1) + '-' + startDate.getDate();
|
|
|
|
|
endDay = endDate.getFullYear() + '-' + (endDate.getMonth()+1) + '-' + endDate.getDate();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var schedule = {
|
|
|
|
|
id: Util.uid(),
|
|
|
|
|
calendarId: event.calendarId,
|
|
|
|
|
title: Util.fixHTML(event.title),
|
|
|
|
|
category: "time",
|
|
|
|
|
location: Util.fixHTML(event.location),
|
|
|
|
|
start: event.start,
|
|
|
|
|
start: +startDate,
|
|
|
|
|
startDay: startDay,
|
|
|
|
|
isAllDay: event.isAllDay,
|
|
|
|
|
end: event.end,
|
|
|
|
|
end: +endDate,
|
|
|
|
|
endDay: endDay
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
newEvent(schedule, function (err) {
|
|
|
|
|
if (err) {
|
|
|
|
|
console.error(err);
|
|
|
|
|