From cee3c38e00533cae00175fb6f698b24698e9dc4d Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Thu, 9 Nov 2023 12:15:48 +0100
Subject: [PATCH] refactoring

---
 docs/SymptomsCausedByCOVIDLots/index.html     |  1 +
 .../js/PageInitializer.js                     | 37 ++--------------
 .../SymptomVsSymptomChartViewInitializer.js   | 44 +++++++++++++++++++
 .../test/index.test.html                      |  1 +
 4 files changed, 50 insertions(+), 33 deletions(-)
 create mode 100644 docs/SymptomsCausedByCOVIDLots/js/SymptomVsSymptomChartViewInitializer.js

diff --git a/docs/SymptomsCausedByCOVIDLots/index.html b/docs/SymptomsCausedByCOVIDLots/index.html
index 51e5de54172..897aac319ec 100644
--- a/docs/SymptomsCausedByCOVIDLots/index.html
+++ b/docs/SymptomsCausedByCOVIDLots/index.html
@@ -38,6 +38,7 @@
   <script src="./js/PrrBySymptomTableView.js"></script>
   <script src="./js/SymptomVsSymptomChartView.js"></script>
   <script src="./js/SymptomVsSymptomChartDataProvider.js"></script>
+  <script src="./js/SymptomVsSymptomChartViewInitializer.js"></script>
   <script>
     document.addEventListener(
       "DOMContentLoaded",
diff --git a/docs/SymptomsCausedByCOVIDLots/js/PageInitializer.js b/docs/SymptomsCausedByCOVIDLots/js/PageInitializer.js
index b1a84a106de..f58bacab9d3 100644
--- a/docs/SymptomsCausedByCOVIDLots/js/PageInitializer.js
+++ b/docs/SymptomsCausedByCOVIDLots/js/PageInitializer.js
@@ -1,9 +1,5 @@
 class PageInitializer {
 
-    static #symptomVsSymptomChartView;
-    static #symptomX = null;
-    static #symptomY = null;
-
     static initializePage({ symptom, vaccine, symptomVsSymptomChart }) {
         PageInitializer.#configureSymptom(symptom);
         PageInitializer.#configureVaccine(vaccine);
@@ -30,27 +26,10 @@ class PageInitializer {
             });
     }
 
-    static #configureSymptomVsSymptomChart({ symptomSelectXElement, symptomSelectYElement, symptomVsSymptomChartViewElement }) {
-        PageInitializer.#symptomVsSymptomChartView = new SymptomVsSymptomChartView(symptomVsSymptomChartViewElement);
-        PageInitializer.#initializeSelectElement(
-            {
-                selectElement: symptomSelectXElement,
-                onValueSelected: symptomX => {
-                    PageInitializer.#symptomX = symptomX;
-                    PageInitializer.#loadAndDisplayChart();
-                },
-                minimumInputLength: 4
-            });
-        PageInitializer.#initializeSelectElement(
-            {
-                selectElement: symptomSelectYElement,
-                onValueSelected: symptomY => {
-                    PageInitializer.#symptomY = symptomY;
-                    PageInitializer.#loadAndDisplayChart();
-                },
-                minimumInputLength: 4
-            });
-        PageInitializer.#loadAndDisplayChart();
+    static #configureSymptomVsSymptomChart(symptomVsSymptomChart) {
+        new SymptomVsSymptomChartViewInitializer().configureSymptomVsSymptomChart(
+            symptomVsSymptomChart,
+            PageInitializer.#initializeSelectElement);
     }
 
     static #initializeSelectElement({ selectElement, onValueSelected, minimumInputLength }) {
@@ -62,12 +41,4 @@ class PageInitializer {
                 onValueSelected(value);
             });
     }
-
-    static #loadAndDisplayChart() {
-        if (PageInitializer.#symptomX != null && PageInitializer.#symptomY != null) {
-            PageInitializer.#symptomVsSymptomChartView.loadAndDisplayChart(
-                PageInitializer.#symptomX,
-                PageInitializer.#symptomY);
-        }
-    }
 }
diff --git a/docs/SymptomsCausedByCOVIDLots/js/SymptomVsSymptomChartViewInitializer.js b/docs/SymptomsCausedByCOVIDLots/js/SymptomVsSymptomChartViewInitializer.js
new file mode 100644
index 00000000000..ce3d5dd634a
--- /dev/null
+++ b/docs/SymptomsCausedByCOVIDLots/js/SymptomVsSymptomChartViewInitializer.js
@@ -0,0 +1,44 @@
+class SymptomVsSymptomChartViewInitializer {
+
+    #symptomVsSymptomChartView;
+    #symptomX;
+    #symptomY;
+
+    configureSymptomVsSymptomChart(
+        { symptomSelectXElement, symptomSelectYElement, symptomVsSymptomChartViewElement },
+        initializeSelectElement) {
+
+        this.#symptomVsSymptomChartView = new SymptomVsSymptomChartView(symptomVsSymptomChartViewElement);
+        {
+            initializeSelectElement(
+                {
+                    selectElement: symptomSelectXElement,
+                    onValueSelected: symptomX => {
+                        this.#symptomX = symptomX;
+                        this.#loadAndDisplayChart();
+                    },
+                    minimumInputLength: 4
+                });
+            this.#symptomX = null;
+        }
+        {
+            initializeSelectElement(
+                {
+                    selectElement: symptomSelectYElement,
+                    onValueSelected: symptomY => {
+                        this.#symptomY = symptomY;
+                        this.#loadAndDisplayChart();
+                    },
+                    minimumInputLength: 4
+                });
+            this.#symptomY = null;
+        }
+        this.#loadAndDisplayChart();
+    }
+
+    #loadAndDisplayChart() {
+        if (this.#symptomX != null && this.#symptomY != null) {
+            this.#symptomVsSymptomChartView.loadAndDisplayChart(this.#symptomX, this.#symptomY);
+        }
+    }
+}
\ No newline at end of file
diff --git a/docs/SymptomsCausedByCOVIDLots/test/index.test.html b/docs/SymptomsCausedByCOVIDLots/test/index.test.html
index d666177858c..73ce91fb448 100644
--- a/docs/SymptomsCausedByCOVIDLots/test/index.test.html
+++ b/docs/SymptomsCausedByCOVIDLots/test/index.test.html
@@ -18,6 +18,7 @@
     <script src="../js/PrrBySymptomTableView.js"></script>
     <script src="../js/SymptomVsSymptomChartView.js"></script>
     <script src="../js/SymptomVsSymptomChartDataProvider.js"></script>
+    <script src="../js/SymptomVsSymptomChartViewInitializer.js"></script>
     <link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.17.2.css">
     <script src="https://code.jquery.com/qunit/qunit-2.17.2.js"></script>
     <script type="text/javascript" src="./jshamcrest.js"></script>