refactoring

docs/SymptomsCausedByVaccines/index.html

@@ -32,8 +32,6 @@
   <script src="./js/PageInitializer.js"></script>
   <script src="./js/PrrByVaccineProvider.js"></script>
   <script src="./js/PrrByKeyTable.js"></script>
-  <script src="./js/PrrByVaccineTable.js"></script>
-  <script src="./js/PrrBySymptomTable.js"></script>
   <script src="./js/PrrByKeyTableView.js"></script>
   <script src="./js/PrrByVaccineTableView.js"></script>
   <script src="./js/PrrBySymptomTableView.js"></script>

docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js

@@ -54,7 +54,9 @@ class PrrByKeyTable {
                             targets: [this.#getColumnIndex(this.#prrColumnName)]
                         },
                         {
-                            render: prr =>
+                            render: (prr, type, row, meta) =>
+                                (type === 'sort' || type === 'type') ?
+                                    parseFloat(prr) :
                                     NumberWithBarElementFactory
                                         .createNumberWithBarElement(
                                             {

docs/SymptomsCausedByVaccines/js/PrrBySymptomTable.js

@@ -1,25 +0,0 @@
-class PrrBySymptomTable {
-
-    #delegate;
-
-    constructor(tableElement) {
-        this.#delegate = new PrrByKeyTable({
-            tableElement: tableElement,
-            keyColumnName: 'Symptom',
-            prrColumnName: 'Proportional Reporting Ratio > 1',
-            shallMarkRowIfPrrTooHigh: false
-        });
-    }
-
-    initialize() {
-        this.#delegate.initialize();
-    }
-
-    display(prrBySymptom) {
-        this.#delegate.display(prrBySymptom);
-    }
-
-    getDisplayedTableAsCsv(heading) {
-        return this.#delegate.getDisplayedTableAsCsv(heading);
-    }
-}

docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js

@@ -4,7 +4,7 @@ class PrrBySymptomTableView {
 
     constructor(prrBySymptomTableElement, downloadPrrBySymptomTableButton) {
         this.#delegate = new PrrByKeyTableView(
-            new PrrBySymptomTable(prrBySymptomTableElement),
+            this.#createPrrBySymptomTable(prrBySymptomTableElement),
             downloadPrrBySymptomTableButton,
             'Vaccine',
             PrrByVaccineProvider.getPrrBySymptom);
@@ -13,4 +13,13 @@ class PrrBySymptomTableView {
     displayPrrBySymptomTable4Vaccine(vaccine) {
         this.#delegate.displayPrrByKeyTable4Value(vaccine);
     }
+
+    #createPrrBySymptomTable(tableElement) {
+        return new PrrByKeyTable({
+            tableElement: tableElement,
+            keyColumnName: 'Symptom',
+            prrColumnName: 'Proportional Reporting Ratio > 1',
+            shallMarkRowIfPrrTooHigh: false
+        });
+    }
 }

docs/SymptomsCausedByVaccines/js/PrrByVaccineTable.js

@@ -1,25 +0,0 @@
-class PrrByVaccineTable {
-
-    #delegate;
-
-    constructor(tableElement) {
-        this.#delegate = new PrrByKeyTable({
-            tableElement: tableElement,
-            keyColumnName: 'Vaccine',
-            prrColumnName: 'Proportional Reporting Ratio',
-            shallMarkRowIfPrrTooHigh: true
-        });
-    }
-
-    initialize() {
-        this.#delegate.initialize();
-    }
-
-    display(prrByVaccine) {
-        this.#delegate.display(prrByVaccine);
-    }
-
-    getDisplayedTableAsCsv(heading) {
-        return this.#delegate.getDisplayedTableAsCsv(heading);
-    }
-}

docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js

@@ -4,7 +4,7 @@ class PrrByVaccineTableView {
 
     constructor(prrByVaccineTableElement, downloadPrrByVaccineTableButton) {
         this.#delegate = new PrrByKeyTableView(
-            new PrrByVaccineTable(prrByVaccineTableElement),
+            this.#createPrrByVaccineTable(prrByVaccineTableElement),
             downloadPrrByVaccineTableButton,
             'Symptom',
             PrrByVaccineProvider.getPrrByVaccine);
@@ -13,4 +13,13 @@ class PrrByVaccineTableView {
     displayPrrByVaccineTable4Symptom(symptom) {
         this.#delegate.displayPrrByKeyTable4Value(symptom);
     }
+
+    #createPrrByVaccineTable(tableElement) {
+        return new PrrByKeyTable({
+            tableElement: tableElement,
+            keyColumnName: 'Vaccine',
+            prrColumnName: 'Proportional Reporting Ratio',
+            shallMarkRowIfPrrTooHigh: true
+        });
+    }
 }

test/SymptomsCausedByVaccines/index.test.html

@@ -15,8 +15,6 @@
   <script src="../../docs/SymptomsCausedByVaccines/js/PageInitializer.js"></script>
   <script src="../../docs/SymptomsCausedByVaccines/js/PrrByVaccineProvider.js"></script>
   <script src="../../docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js"></script>
-  <script src="../../docs/SymptomsCausedByVaccines/js/PrrByVaccineTable.js"></script>
-  <script src="../../docs/SymptomsCausedByVaccines/js/PrrBySymptomTable.js"></script>
   <script src="../../docs/SymptomsCausedByVaccines/js/PrrByKeyTableView.js"></script>
   <script src="../../docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js"></script>
   <script src="../../docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js"></script>