Update the other scripts for all-day
This commit is contained in:
parent
a43108404d
commit
e7dd7a479a
@ -36,6 +36,11 @@ $(document).ready(function() {
|
|||||||
var format = 'dddd, MMMM Do YYYY';
|
var format = 'dddd, MMMM Do YYYY';
|
||||||
var endDate = event.end == null ? event.start : event.end;
|
var endDate = event.end == null ? event.start : event.end;
|
||||||
|
|
||||||
|
if (event.allDay) {
|
||||||
|
endDate = event.end.clone();
|
||||||
|
endDate.add(-1, 'days');
|
||||||
|
}
|
||||||
|
|
||||||
if (!event.allDay && event.type !== 'TICKET') {
|
if (!event.allDay && event.type !== 'TICKET') {
|
||||||
format += ', HH:mm';
|
format += ', HH:mm';
|
||||||
}
|
}
|
||||||
@ -118,13 +123,19 @@ function buildEvent(id, dbObject) {
|
|||||||
fontIconMarkup: getIcon(dbObject)
|
fontIconMarkup: getIcon(dbObject)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var endTime = moment(dbObject.endTime);
|
||||||
|
if (dbObject.allDay) {
|
||||||
|
endTime.add(1, 'days');
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: id,
|
id: id,
|
||||||
title: dbObject.title,
|
title: dbObject.title,
|
||||||
allDay: dbObject.allDay,
|
allDay: dbObject.allDay,
|
||||||
start: moment(dbObject.startTime),
|
start: moment(dbObject.startTime),
|
||||||
end: moment(dbObject.endTime),
|
end: endTime,
|
||||||
|
realEnd: moment(dbObject.endTime),
|
||||||
comments: dbObject.comments,
|
comments: dbObject.comments,
|
||||||
location: dbObject.location,
|
location: dbObject.location,
|
||||||
type: dbObject.type,
|
type: dbObject.type,
|
||||||
|
@ -31,7 +31,6 @@ $(document).ready(function() {
|
|||||||
},
|
},
|
||||||
eventMouseover: function(event) {
|
eventMouseover: function(event) {
|
||||||
if (event.type === 'TICKET') {
|
if (event.type === 'TICKET') {
|
||||||
// Don't build a popover for tickets
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,6 +40,11 @@ $(document).ready(function() {
|
|||||||
var format = 'dddd, MMMM Do YYYY';
|
var format = 'dddd, MMMM Do YYYY';
|
||||||
var endDate = event.end == null ? event.start : event.end;
|
var endDate = event.end == null ? event.start : event.end;
|
||||||
|
|
||||||
|
if (event.allDay) {
|
||||||
|
endDate = event.end.clone();
|
||||||
|
endDate.add(-1, 'days');
|
||||||
|
}
|
||||||
|
|
||||||
if (!event.allDay) {
|
if (!event.allDay) {
|
||||||
format += ', HH:mm';
|
format += ', HH:mm';
|
||||||
}
|
}
|
||||||
@ -54,9 +58,16 @@ $(document).ready(function() {
|
|||||||
.find('.popover-from span').text(event.start.format(format)).end()
|
.find('.popover-from span').text(event.start.format(format)).end()
|
||||||
.find('.popover-to span').text(endDate.format(format)).end()
|
.find('.popover-to span').text(endDate.format(format)).end()
|
||||||
.find('.popover-comments span').text(event.comments);
|
.find('.popover-comments span').text(event.comments);
|
||||||
|
|
||||||
var $eventMarkup = $(this);
|
var $eventMarkup = $(this);
|
||||||
|
|
||||||
|
var eventTitle = event.title;
|
||||||
|
if (event.fontIconMarkup != undefined) {
|
||||||
|
eventTitle = event.fontIconMarkup + ' ' + eventTitle;
|
||||||
|
}
|
||||||
|
|
||||||
$eventMarkup.popover({
|
$eventMarkup.popover({
|
||||||
title: event.title,
|
title: eventTitle,
|
||||||
html: true,
|
html: true,
|
||||||
content: $contents,
|
content: $contents,
|
||||||
animation: true,
|
animation: true,
|
||||||
@ -78,19 +89,9 @@ $(document).ready(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function buildEvent(id, dbObject) {
|
function buildEvent(id, dbObject) {
|
||||||
if (dbObject.type == 'TICKET') {
|
var endTime = moment(dbObject.endTime);
|
||||||
return {
|
if (dbObject.allDay) {
|
||||||
title: dbObject.title,
|
endTime.add(1, 'days');
|
||||||
trackingId: dbObject.trackingId,
|
|
||||||
start: moment(dbObject.startTime),
|
|
||||||
url: dbObject.url,
|
|
||||||
color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
|
|
||||||
allDay: true,
|
|
||||||
type: dbObject.type,
|
|
||||||
categoryId: dbObject.categoryId,
|
|
||||||
className: 'category-' + dbObject.categoryId,
|
|
||||||
textColor: calculateTextColor(dbObject.categoryColor),
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -98,7 +99,8 @@ function buildEvent(id, dbObject) {
|
|||||||
title: dbObject.title,
|
title: dbObject.title,
|
||||||
allDay: dbObject.allDay,
|
allDay: dbObject.allDay,
|
||||||
start: moment(dbObject.startTime),
|
start: moment(dbObject.startTime),
|
||||||
end: moment(dbObject.endTime),
|
end: endTime,
|
||||||
|
realEnd: moment(dbObject.endTime),
|
||||||
comments: dbObject.comments,
|
comments: dbObject.comments,
|
||||||
location: dbObject.location,
|
location: dbObject.location,
|
||||||
type: dbObject.type,
|
type: dbObject.type,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user