From 754a46d82b38c0abd8853ffd992c770acac0781c Mon Sep 17 00:00:00 2001
From: Frank Knoll <Knoll_Frank@web.de>
Date: Fri, 12 Jul 2024 10:47:33 +0200
Subject: [PATCH] refactoring

---
 docs/SymptomsCausedByVaccines/index.html      |  14 +--
 .../js/PageInitializer.js                     |  38 ------
 .../js/PrrByKey2CsvConverter.js               |  41 -------
 .../js/PrrByKeyTable.js                       | 109 ------------------
 .../js/PrrByKeyTableView.js                   |  43 -------
 .../js/PrrBySymptomTableView.js               |  25 ----
 .../js/PrrByVaccineProvider.js                |  10 --
 .../js/PrrByVaccineTableView.js               |  25 ----
 8 files changed, 7 insertions(+), 298 deletions(-)
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PageInitializer.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrByKey2CsvConverter.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrByKeyTableView.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrByVaccineProvider.js
 delete mode 100644 docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js

diff --git a/docs/SymptomsCausedByVaccines/index.html b/docs/SymptomsCausedByVaccines/index.html
index 7627529ecaa..09aa0ed2209 100644
--- a/docs/SymptomsCausedByVaccines/index.html
+++ b/docs/SymptomsCausedByVaccines/index.html
@@ -28,13 +28,13 @@
   <script src="../Utils.js"></script>
   <script src="../UIUtils.js"></script>
   <script src="../NumberWithBarElementFactory.js"></script>
-  <script src="./js/PrrByKey2CsvConverter.js"></script>
-  <script src="./js/PageInitializer.js"></script>
-  <script src="./js/PrrByVaccineProvider.js"></script>
-  <script src="./js/PrrByKeyTable.js"></script>
-  <script src="./js/PrrByKeyTableView.js"></script>
-  <script src="./js/PrrByVaccineTableView.js"></script>
-  <script src="./js/PrrBySymptomTableView.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrByKey2CsvConverter.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PageInitializer.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrByVaccineProvider.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrByKeyTable.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrByKeyTableView.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrByVaccineTableView.js"></script>
+  <script src="../SymptomsCausedByDrugs/js/PrrBySymptomTableView.js"></script>
   <script>
     document.addEventListener(
       "DOMContentLoaded",
diff --git a/docs/SymptomsCausedByVaccines/js/PageInitializer.js b/docs/SymptomsCausedByVaccines/js/PageInitializer.js
deleted file mode 100644
index 227533551db..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PageInitializer.js
+++ /dev/null
@@ -1,38 +0,0 @@
-class PageInitializer {
-
-    static initializePage({ symptom, vaccine }) {
-        PageInitializer.#configureSymptom(symptom);
-        PageInitializer.#configureVaccine(vaccine);
-    }
-
-    static #configureSymptom({ symptomSelectElement, prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName }) {
-        const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName);
-        PageInitializer.#initializeSelectElement(
-            {
-                selectElement: symptomSelectElement,
-                onValueSelected: (id, text) => prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text),
-                minimumInputLength: 0
-            });
-    }
-
-    static #configureVaccine({ vaccineSelectElement, prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName }) {
-        const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName);
-        PageInitializer.#initializeSelectElement(
-            {
-                selectElement: vaccineSelectElement,
-                onValueSelected: (id, text) => prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id ,text),
-                minimumInputLength: 0
-            });
-    }
-
-    static #initializeSelectElement({ selectElement, onValueSelected, minimumInputLength }) {
-        selectElement.select2({ minimumInputLength: minimumInputLength });
-        selectElement.on(
-            'select2:select',
-            function (event) {
-                const id = event.params.data.id;
-                const text = event.params.data.text;
-                onValueSelected(id, text);
-            });
-    }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByKey2CsvConverter.js b/docs/SymptomsCausedByVaccines/js/PrrByKey2CsvConverter.js
deleted file mode 100644
index 65272b118b4..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByKey2CsvConverter.js
+++ /dev/null
@@ -1,41 +0,0 @@
-class PrrByKey2CsvConverter {
-
-    static convertPrrByKey2Csv(
-        {
-            heading,
-            columns: { keyColumn, prrColumn },
-            prrByKey
-        }
-    ) {
-        return heading + '\n\n' +
-            PrrByKey2CsvConverter.#convert2Csv(
-                {
-                    prrByKey: PrrByKey2CsvConverter.#quoteKeys(prrByKey),
-                    keyColumn: PrrByKey2CsvConverter.#quote(keyColumn),
-                    prrColumn: PrrByKey2CsvConverter.#quote(prrColumn)
-                });
-    }
-
-    static #quoteKeys(prrByKey) {
-        return Object.fromEntries(
-            Object
-                .entries(prrByKey)
-                .map(([key, prr]) => [PrrByKey2CsvConverter.#quote(key), prr]))
-    }
-
-    static #quote(str) {
-        return '"' + str + '"';
-    }
-
-    static #convert2Csv({ prrByKey, keyColumn, prrColumn }) {
-        const header = `${keyColumn},${prrColumn}`;
-        return `${header}\n${PrrByKey2CsvConverter.#convertDict2Csv(prrByKey)}`;
-    }
-
-    static #convertDict2Csv(dict) {
-        return Object
-            .entries(dict)
-            .map(([key, value]) => `${key},${value}`)
-            .join('\n');
-    }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js b/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
deleted file mode 100644
index ee0ac57e839..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
+++ /dev/null
@@ -1,109 +0,0 @@
-class PrrByKeyTable {
-
-    #tableElement;
-    #table;
-    #sumPrrs;
-    #prrByKey;
-    #keyColumnName;
-    #prrColumnName;
-    #shallMarkRowIfPrrTooHigh;
-
-    constructor({ tableElement, keyColumnName, prrColumnName, shallMarkRowIfPrrTooHigh }) {
-        this.#tableElement = tableElement;
-        this.#keyColumnName = keyColumnName;
-        this.#prrColumnName = prrColumnName;
-        this.#shallMarkRowIfPrrTooHigh = shallMarkRowIfPrrTooHigh;
-    }
-
-    initialize() {
-        this.#table = this.#createEmptyTable();
-    }
-
-    display(prrByKey) {
-        this.#prrByKey = prrByKey;
-        const key_prr_pairs = Object.entries(prrByKey);
-        this.#setTableRows(key_prr_pairs);
-    }
-
-    getDisplayedTableAsCsv(heading) {
-        return PrrByKey2CsvConverter.convertPrrByKey2Csv(
-            {
-                heading: heading,
-                columns: {
-                    keyColumn: this.#keyColumnName,
-                    prrColumn: this.#prrColumnName
-                },
-                prrByKey: this.#prrByKey
-            });
-    }
-
-    #createEmptyTable() {
-        return this.#tableElement.DataTable(
-            {
-                search:
-                {
-                    return: false
-                },
-                processing: true,
-                deferRender: true,
-                order: [[this.#getColumnIndex(this.#prrColumnName), "desc"]],
-                columnDefs:
-                    [
-                        {
-                            searchable: false,
-                            targets: [this.#getColumnIndex(this.#prrColumnName)]
-                        },
-                        {
-                            render: (prr, type, row, meta) =>
-                                (type === 'sort' || type === 'type') ?
-                                    parseFloat(prr) :
-                                    NumberWithBarElementFactory
-                                        .createNumberWithBarElement(
-                                            {
-                                                number: prr,
-                                                barLenInPercent: prr / this.#sumPrrs * 100
-                                            })
-                                        .outerHTML,
-                            targets: [this.#getColumnIndex(this.#prrColumnName)]
-                        }
-                    ],
-                createdRow: (row, data) => {
-                    if (this.#shallMarkRowIfPrrTooHigh) {
-                        this.#markRowIfPrrTooHigh(
-                            {
-                                prr: data[this.#getColumnIndex(this.#prrColumnName)],
-                                row: row
-                            });
-                    }
-                }
-            });
-    }
-
-    #markRowIfPrrTooHigh({ prr, row }) {
-        if (prr >= 2.0) {
-            $(row).addClass('prrTooHigh');
-        }
-    }
-
-    #getColumnIndex(columnName) {
-        switch (columnName) {
-            case this.#keyColumnName:
-                return 0;
-            case this.#prrColumnName:
-                return 1;
-        }
-    }
-
-    #setTableRows(key_prr_pairs) {
-        this.#sumPrrs = this.#getSumPrrs(key_prr_pairs);
-        this.#table
-            .clear()
-            .rows.add(key_prr_pairs)
-            .draw();
-    }
-
-    #getSumPrrs(key_prr_pairs) {
-        const prrs = key_prr_pairs.map(key_prr_pair => key_prr_pair[1])
-        return Utils.sum(prrs);
-    }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByKeyTableView.js b/docs/SymptomsCausedByVaccines/js/PrrByKeyTableView.js
deleted file mode 100644
index 715f8473e5d..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByKeyTableView.js
+++ /dev/null
@@ -1,43 +0,0 @@
-class PrrByKeyTableView {
-
-    #prrByKeyTable;
-    #downloadPrrByKeyTableButton;
-    #text;
-    #valueName;
-    #prrByKeyProvider;
-
-    constructor(prrByKeyTable, downloadPrrByKeyTableButton, valueName, prrByKeyProvider) {
-        this.#prrByKeyTable = prrByKeyTable;
-        this.#prrByKeyTable.initialize();
-        this.#initializeButton(downloadPrrByKeyTableButton);
-        this.#valueName = valueName;
-        this.#prrByKeyProvider = prrByKeyProvider;
-    }
-
-    displayPrrByKeyTable4Value(id, text) {
-        UIUtils.disableButton(this.#downloadPrrByKeyTableButton);
-        this.#prrByKeyProvider(id)
-            .then(prrByKey => {
-                this.#text = text;
-                this.#prrByKeyTable.display(prrByKey);
-                UIUtils.enableButton(this.#downloadPrrByKeyTableButton);
-            });
-    }
-
-    #initializeButton(downloadPrrByKeyTableButton) {
-        this.#downloadPrrByKeyTableButton = downloadPrrByKeyTableButton;
-        UIUtils.disableButton(downloadPrrByKeyTableButton);
-        downloadPrrByKeyTableButton.addEventListener(
-            'click',
-            () => this.#downloadPrrByKey())
-    }
-
-    #downloadPrrByKey() {
-        UIUtils.downloadUrlAsFilename(
-            window.URL.createObjectURL(
-                new Blob(
-                    [this.#prrByKeyTable.getDisplayedTableAsCsv(`# ${this.#valueName}: ${this.#text}`)],
-                    { type: 'text/csv' })),
-            this.#text);
-    }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js b/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js
deleted file mode 100644
index c3f36991e0a..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js
+++ /dev/null
@@ -1,25 +0,0 @@
-class PrrBySymptomTableView {
-
-    #delegate;
-
-    constructor(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName) {
-        this.#delegate = new PrrByKeyTableView(
-            this.#createPrrBySymptomTable(prrBySymptomTableElement),
-            downloadPrrBySymptomTableButton,
-            valueName,
-            PrrByVaccineProvider.getPrrBySymptom);
-    }
-
-    displayPrrBySymptomTable4Vaccine(id, text) {
-        this.#delegate.displayPrrByKeyTable4Value(id, text);
-    }
-
-    #createPrrBySymptomTable(tableElement) {
-        return new PrrByKeyTable({
-            tableElement: tableElement,
-            keyColumnName: 'Symptom',
-            prrColumnName: 'Lower Confidence Limit of Proportional Reporting Ratio >= 2',
-            shallMarkRowIfPrrTooHigh: false
-        });
-    }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByVaccineProvider.js b/docs/SymptomsCausedByVaccines/js/PrrByVaccineProvider.js
deleted file mode 100644
index 5f7cff61a54..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByVaccineProvider.js
+++ /dev/null
@@ -1,10 +0,0 @@
-class PrrByVaccineProvider {
-
-    static getPrrByVaccine(symptom) {
-        return fetch(`./data/ProportionalReportingRatios/symptoms/${symptom}.json`).then(response => response.json());
-    }
-
-    static getPrrBySymptom(vaccine) {
-        return fetch(`./data/ProportionalReportingRatios/vaccines/${vaccine}.json`).then(response => response.json());
-    }
-}
\ No newline at end of file
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js b/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js
deleted file mode 100644
index 40782e44eef..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js
+++ /dev/null
@@ -1,25 +0,0 @@
-class PrrByVaccineTableView {
-
-    #delegate;
-
-    constructor(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName) {
-        this.#delegate = new PrrByKeyTableView(
-            this.#createPrrByVaccineTable(prrByVaccineTableElement, keyColumnName),
-            downloadPrrByVaccineTableButton,
-            'Symptom',
-            PrrByVaccineProvider.getPrrByVaccine);
-    }
-
-    displayPrrByVaccineTable4Symptom(id, text) {
-        this.#delegate.displayPrrByKeyTable4Value(id, text);
-    }
-
-    #createPrrByVaccineTable(tableElement, keyColumnName) {
-        return new PrrByKeyTable({
-            tableElement: tableElement,
-            keyColumnName: keyColumnName,
-            prrColumnName: 'Lower Confidence Limit of Proportional Reporting Ratio',
-            shallMarkRowIfPrrTooHigh: true
-        });
-    }
-}