From d8076becd99901be780a637cf117be3d6140e7fe Mon Sep 17 00:00:00 2001
From: AlexisPoyen <apoyen@grandlyon.com>
Date: Fri, 10 Jul 2020 09:30:53 +0200
Subject: [PATCH] Refactor : prevent useless affectation and code usage
---
web/components/vote/desk-round.js | 41 +++++++++++++++----------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/web/components/vote/desk-round.js b/web/components/vote/desk-round.js
index 9055135..ab56650 100644
--- a/web/components/vote/desk-round.js
+++ b/web/components/vote/desk-round.js
@@ -181,31 +181,30 @@ class DeskRoundSelector {
}
async loadDesks() {
- let deskRoundHandler = this;
- let deskRounds = await this.DeskRoundModel.getDeskRounds();
+ let selectRound = document.getElementById("round-select");
- deskRounds = deskRounds.filter((deskRound) => {
- return deskRound.RoundID == deskRoundHandler.RoundID;
- });
- // Filter the desks to display only the one affected to capturer
- if (this.DeskRoundModel.current_user.role === "CAPTURER") {
- let capturer = await this.CapturerModel.getCapturerByUserID(
- this.DeskRoundModel.current_user.id
- );
- let deskRoundsToKeep = [];
- for (let i in deskRounds) {
- for (let j in capturer.DeskRounds) {
- if (capturer.DeskRounds[j].ID == deskRounds[i].ID)
- deskRoundsToKeep.push(deskRounds[i]);
+ if (selectRound.value != 0) {
+ let deskRoundHandler = this;
+ let deskRounds = await this.DeskRoundModel.getDeskRounds();
+
+ deskRounds = deskRounds.filter((deskRound) => {
+ return deskRound.RoundID == deskRoundHandler.RoundID;
+ });
+ // Filter the desks to display only the one affected to capturer
+ if (this.DeskRoundModel.current_user.role === "CAPTURER") {
+ let capturer = await this.CapturerModel.getCapturerByUserID(
+ this.DeskRoundModel.current_user.id
+ );
+ let deskRoundsToKeep = [];
+ for (let i in deskRounds) {
+ for (let j in capturer.DeskRounds) {
+ if (capturer.DeskRounds[j].ID == deskRounds[i].ID)
+ deskRoundsToKeep.push(deskRounds[i]);
+ }
}
+ deskRounds = deskRoundsToKeep;
}
- deskRounds = deskRoundsToKeep;
- }
- let selectRound = document.getElementById("round-select");
- if (selectRound.value == 0) {
- deskRounds = [];
- } else {
let deskRoundsFiltered = [];
let selectArea = document.getElementById("area-select");
if (selectArea.value != 0) {
--
GitLab