diff --git a/docs/SymptomsCausedByVaccines/index.html b/docs/SymptomsCausedByVaccines/index.html
index 235bbd3ae9a..b038e2443e8 100644
--- a/docs/SymptomsCausedByVaccines/index.html
+++ b/docs/SymptomsCausedByVaccines/index.html
@@ -32,8 +32,6 @@
-
-
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js b/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
index 2c925d93330..913f1820592 100644
--- a/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
+++ b/docs/SymptomsCausedByVaccines/js/PrrByKeyTable.js
@@ -54,14 +54,16 @@ class PrrByKeyTable {
targets: [this.#getColumnIndex(this.#prrColumnName)]
},
{
- render: prr =>
- NumberWithBarElementFactory
- .createNumberWithBarElement(
- {
- number: prr,
- barLenInPercent: prr / this.#sumPrrs * 100
- })
- .outerHTML,
+ 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)]
}
],
diff --git a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTable.js b/docs/SymptomsCausedByVaccines/js/PrrBySymptomTable.js
deleted file mode 100644
index 103111d7048..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTable.js
+++ /dev/null
@@ -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);
- }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js b/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js
index 19cc539c2ac..a7c3ec11f6f 100644
--- a/docs/SymptomsCausedByVaccines/js/PrrBySymptomTableView.js
+++ b/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
+ });
+ }
}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTable.js b/docs/SymptomsCausedByVaccines/js/PrrByVaccineTable.js
deleted file mode 100644
index fac70832c31..00000000000
--- a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTable.js
+++ /dev/null
@@ -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);
- }
-}
diff --git a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js b/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js
index d63a69f46b3..8a9aff99560 100644
--- a/docs/SymptomsCausedByVaccines/js/PrrByVaccineTableView.js
+++ b/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
+ });
+ }
}
diff --git a/test/SymptomsCausedByVaccines/index.test.html b/test/SymptomsCausedByVaccines/index.test.html
index 8f9b260d3ca..80308b65f53 100644
--- a/test/SymptomsCausedByVaccines/index.test.html
+++ b/test/SymptomsCausedByVaccines/index.test.html
@@ -15,8 +15,6 @@
-
-