Commit b28f0a12 authored by Håkon Finstad's avatar Håkon Finstad
Browse files

Merge branch 'master' into tests

parents 6149a83d 847b0c86
Pipeline #167149 failed with stage
in 1 minute and 17 seconds
......@@ -335,6 +335,7 @@ function removeAthleteRow(event) {
event.currentTarget.parentElement.remove();
}
/*
async function displayCurrentRoster(currentUser, workoutid) {
let templateFilledAthlete = document.querySelector("#template-filled-member");
let templateEmptyAthlete = document.querySelector("#template-empty-member");
......@@ -358,7 +359,7 @@ async function displayCurrentRoster(currentUser, workoutid) {
emptyButton.addEventListener("click", addAthleteRow);
controls.appendChild(emptyDiv);
}
*/
window.addEventListener("DOMContentLoaded", async () => {
cancelWorkoutButton = document.querySelector("#btn-cancel-workout");
okWorkoutButton = document.querySelector("#btn-ok-workout");
......@@ -391,7 +392,7 @@ window.addEventListener("DOMContentLoaded", async () => {
okWorkoutButton.addEventListener("click", (async (id) => await updateWorkout(id)).bind(undefined, id));
postCommentButton.addEventListener("click", (async (id) => await createComment(id)).bind(undefined, id));
divCommentRow.className = divCommentRow.className.replace(" hide", "");
await displayCurrentRoster(currentUser, id);
//await displayCurrentRoster(currentUser, id);
}
} else {
......@@ -413,4 +414,4 @@ window.addEventListener("DOMContentLoaded", async () => {
divCommentRow.className += " hide";
}
});
\ No newline at end of file
});
......@@ -21,6 +21,7 @@ PyJWT==1.7.1
pylint==2.5.3
pylint-django==2.3.0
pylint-plugin-utils==0.6
pytest-django==4.3.0
pytz==2020.1
requests==2.24.0
rope==0.17.0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment