From 382bae09237424f9f213cdc110c4bbd139fbfdc5 Mon Sep 17 00:00:00 2001
From: Alexis POYEN <apoyen@grandlyon.com>
Date: Thu, 16 Jul 2020 10:14:09 +0200
Subject: [PATCH] Refactor : factorize code of select area in results
---
web/components/visualization/results-zone.js | 45 +++++++++-----------
1 file changed, 19 insertions(+), 26 deletions(-)
diff --git a/web/components/visualization/results-zone.js b/web/components/visualization/results-zone.js
index cacdf0f..de8a2a0 100644
--- a/web/components/visualization/results-zone.js
+++ b/web/components/visualization/results-zone.js
@@ -165,7 +165,8 @@ class ResultZoneComponent {
}
} else if (event.target.id == "select-sections") {
let area = resultHandler.parent.results.areasResults.find(
- (areaFind) => areaFind.ID == document.getElementById("select-areas").value
+ (areaFind) =>
+ areaFind.ID == document.getElementById("select-areas").value
);
let section = area.Sections.find(
(sectionFind) => sectionFind.ID == event.target.value
@@ -342,42 +343,19 @@ class ResultZoneComponent {
}
displayAreasResults() {
- let selectAreas = document.getElementById("select-areas");
+ this.refreshAreas();
document.getElementById("select-sections").parentNode.style.display =
"none";
- for (let i = selectAreas.options.length - 1; i >= 0; i--) {
- selectAreas.remove(i);
- }
-
- this.parent.results.areasResults.forEach((area) => {
- let el = document.createElement("option");
- el.textContent = area.Name;
- el.value = area.ID;
- selectAreas.appendChild(el);
- });
-
if (this.parent.zone == "areas" && this.areaDisplayed != undefined) {
document.getElementById("select-areas").value = this.areaDisplayed.ID;
} else this.displayZoneResults(this.parent.results.areasResults[0]);
}
displaySectionsResults() {
- let selectAreas = document.getElementById("select-areas");
+ this.refreshAreas();
document.getElementById("select-sections").parentNode.style.display =
"block";
-
- for (let i = selectAreas.options.length - 1; i >= 0; i--) {
- selectAreas.remove(i);
- }
-
- this.parent.results.areasResults.forEach((area) => {
- let el = document.createElement("option");
- el.textContent = area.Name;
- el.value = area.ID;
- selectAreas.appendChild(el);
- });
-
this.refreshSections(this.parent.results.areasResults[0]);
if (this.parent.zone == "sections" && this.sectionDisplayed != undefined) {
@@ -524,4 +502,19 @@ class ResultZoneComponent {
selectSections.appendChild(el);
}
}
+
+ refreshAreas() {
+ let selectAreas = document.getElementById("select-areas");
+
+ for (let i = selectAreas.options.length - 1; i >= 0; i--) {
+ selectAreas.remove(i);
+ }
+
+ this.parent.results.areasResults.forEach((area) => {
+ let el = document.createElement("option");
+ el.textContent = area.Name;
+ el.value = area.ID;
+ selectAreas.appendChild(el);
+ });
+ }
}
--
GitLab