Skip to content

Display VRMS data on Events and Project Meetings pages #3833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MattPereira merged 1 commit into from
Jan 18, 2023
Merged

Display VRMS data on Events and Project Meetings pages #3833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions assets/js/utility/api-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `<li>${event.start} - ${event.end} </li><li><a href="${event.hflaWebsiteUrl}">${event.name}</a> ${event.dsc}</li>`;
} else {
eventHtml = `<li>${event.start} - ${event.end} <a href="${event.hflaWebsiteUrl}">${event.name}</a> ${event.dsc}</li>`;
}
placeToInsert.insertAdjacentHTML(
"beforeend", eventHtml
);
if (event) {
let eventHtml;
// insert the correct html for the current page
if (page === "events") {
eventHtml = `<li>${event.start} - ${event.end} </li><li><a href="${event.hflaWebsiteUrl}">${event.name}</a> ${event.dsc}</li>`;
} else {
eventHtml = `<li>${event.start} - ${event.end} <a href="${event.hflaWebsiteUrl}">${event.name}</a> ${event.dsc}</li>`;
}
placeToInsert.insertAdjacentHTML("beforeend", eventHtml);}
});
}
}
Expand Down Expand Up @@ -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 };