diff --git a/assets/js/utility/api-events.js b/assets/js/utility/api-events.js index d2b0ebce4d..5bc56f973a 100644 --- a/assets/js/utility/api-events.js +++ b/assets/js/utility/api-events.js @@ -32,16 +32,15 @@ function insertEventSchedule(eventData, page) { ); } else { value.forEach((event) => { - let eventHtml; - // insert the correct html for the current page - if ( page === "events" ) { - eventHtml = `
  • ${event.start} - ${event.end}
  • ${event.name} ${event.dsc}
  • `; - } else { - eventHtml = `
  • ${event.start} - ${event.end} ${event.name} ${event.dsc}
  • `; - } - placeToInsert.insertAdjacentHTML( - "beforeend", eventHtml - ); + if (event) { + let eventHtml; + // insert the correct html for the current page + if (page === "events") { + eventHtml = `
  • ${event.start} - ${event.end}
  • ${event.name} ${event.dsc}
  • `; + } else { + eventHtml = `
  • ${event.start} - ${event.end} ${event.name} ${event.dsc}
  • `; + } + placeToInsert.insertAdjacentHTML("beforeend", eventHtml);} }); } } @@ -143,14 +142,16 @@ function convertTime12to24(time12h) { * Function that represent the individual object extracted from the api */ function display_object(item) { - const rv_object = { - name: item.project.name, - dsc: item.description, - start: localeTimeIn12Format(item.startTime), - end: localeTimeIn12Format(item.endTime), - hflaWebsiteUrl: item.project.hflaWebsiteUrl, - }; - return rv_object; + if (item && item.project) { + const rv_object = { + name: item.project.name, + dsc: item.description, + start: localeTimeIn12Format(item.startTime), + end: localeTimeIn12Format(item.endTime), + hflaWebsiteUrl: item.project.hflaWebsiteUrl, + }; + return rv_object; + } } export { getEventData, insertEventSchedule };