diff --git a/eventsAndVisitorsPage.js b/eventsAndVisitorsPage.js index ae66f18..b4b4881 100644 --- a/eventsAndVisitorsPage.js +++ b/eventsAndVisitorsPage.js @@ -148,21 +148,23 @@ async function loadEvents() { var from = "" if (valid_events[i].type == 'conference') { - to = moment.utc(valid_events[i].endDate).tz("Europe/Rome") - from = moment.utc(valid_events[i].startDate).tz("Europe/Rome") + to = moment.utc(valid_events[i].endDate) + from = moment.utc(valid_events[i].startDate) + from = `${clock_icon} ${from.format('MMM DD')}`; } else { // Seminar here to = moment.utc(valid_events[i].startDatetime).add(valid_events[i].duration, 'minutes').tz("Europe/Rome") from = moment.utc(valid_events[i].startDatetime).tz("Europe/Rome") - } - from = `${clock_icon} ${from.format('MMM DD HH:mm')}`; - - if (from >= now && to <= now) { - from = `${clock_icon} Running now`; + if (from >= now && to <= now) { + from = `${clock_icon} Running now`; + } else { + from = `${clock_icon} ${from.format('MMM DD HH:mm')}`; + } } - + + let venue = `${venue_icon} ${valid_events[i].conferenceRoom?.name}` var border_override = ""; @@ -188,7 +190,7 @@ async function loadEvents() { ${tag}

- ${speaker}
+ ${speaker?speaker+'
':''} ${valid_events[i].title}