Skip to content
Snippets Groups Projects
Commit 098f9b28 authored by Alexis POYEN's avatar Alexis POYEN
Browse files

Fix : prevent iterating on empty deskRounds

parent 61803a99
No related branches found
No related tags found
No related merge requests found
......@@ -205,46 +205,49 @@ class DeskRoundSelector {
let selectRound = document.getElementById("round-select");
if (selectRound.value == 0) {
deskRounds = [];
}
let deskRoundsFiltered = [];
let selectArea = document.getElementById("area-select");
if (selectArea.value != 0) {
let area = await this.AreaModel.getArea(selectArea.value);
for (let i in area.Sections) {
} else {
let deskRoundsFiltered = [];
let selectArea = document.getElementById("area-select");
if (selectArea.value != 0) {
let area = await this.AreaModel.getArea(selectArea.value);
for (let i in area.Sections) {
for (let deskRound of deskRounds) {
let desk = await deskRoundHandler.DeskModel.getDesk(
deskRound.DeskID
);
if (desk.SectionID == area.Sections[i].ID)
deskRoundsFiltered.push(deskRound);
}
}
deskRounds = deskRoundsFiltered;
}
deskRoundsFiltered = [];
let selectSection = document.getElementById("section-select");
if (selectSection.value != 0) {
for (let deskRound of deskRounds) {
let desk = await deskRoundHandler.DeskModel.getDesk(deskRound.DeskID);
if (desk.SectionID == area.Sections[i].ID)
if (desk.SectionID == deskRoundHandler.SectionID)
deskRoundsFiltered.push(deskRound);
}
deskRounds = deskRoundsFiltered;
}
deskRounds = deskRoundsFiltered;
}
deskRoundsFiltered = [];
let selectSection = document.getElementById("section-select");
if (selectSection.value != 0) {
for (let deskRound of deskRounds) {
const markup = deskRounds
.map((deskRound) => this.deskRoundTemplate(deskRound))
.join("");
document.getElementById("select-desks").innerHTML = markup;
deskRounds.map(async (deskRound) => {
let desk = await deskRoundHandler.DeskModel.getDesk(deskRound.DeskID);
if (desk.SectionID == deskRoundHandler.SectionID)
deskRoundsFiltered.push(deskRound);
}
deskRounds = deskRoundsFiltered;
document.getElementById(
`deskrounds-deskround-desc-${deskRound.ID}`
).innerHTML = desk.Name;
document
.getElementById(`deskrounds-deskround-${deskRound.ID}`)
.addEventListener("click", async function () {
deskRoundHandler.openVotes(deskRound);
});
});
}
const markup = deskRounds
.map((deskRound) => this.deskRoundTemplate(deskRound))
.join("");
document.getElementById("select-desks").innerHTML = markup;
deskRounds.map(async (deskRound) => {
let desk = await deskRoundHandler.DeskModel.getDesk(deskRound.DeskID);
document.getElementById(
`deskrounds-deskround-desc-${deskRound.ID}`
).innerHTML = desk.Name;
document
.getElementById(`deskrounds-deskround-${deskRound.ID}`)
.addEventListener("click", async function () {
deskRoundHandler.openVotes(deskRound);
});
});
}
async openVotes(deskRound) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment