From ca4d47bbac777e05cbd38a626d97a32d0718f44a Mon Sep 17 00:00:00 2001 From: Frank Knoll Date: Fri, 12 Jul 2024 08:48:27 +0200 Subject: [PATCH] changing some names from Vaccine to Drug --- docs/SymptomsCausedByDrugs/js/PageInitializer.js | 11 ++++++----- docs/SymptomsCausedByDrugs/js/PrrByKeyTableView.js | 13 ++++++------- .../js/PrrBySymptomTableView.js | 6 +++--- .../js/PrrByVaccineProvider.js | 4 ++-- .../js/PrrByVaccineTableView.js | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/SymptomsCausedByDrugs/js/PageInitializer.js b/docs/SymptomsCausedByDrugs/js/PageInitializer.js index 914e5b52283..90e5bfbcce3 100644 --- a/docs/SymptomsCausedByDrugs/js/PageInitializer.js +++ b/docs/SymptomsCausedByDrugs/js/PageInitializer.js @@ -10,8 +10,8 @@ class PageInitializer { PageInitializer.#initializeSelectElement( { selectElement: symptomSelectElement, - onValueSelected: symptom => prrByVaccineTableView.displayPrrByVaccineTable4Symptom(symptom), - minimumInputLength: 4 + onValueSelected: (id, text) => prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text), + minimumInputLength: 0 }); } @@ -20,7 +20,7 @@ class PageInitializer { PageInitializer.#initializeSelectElement( { selectElement: vaccineSelectElement, - onValueSelected: vaccine => prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(vaccine), + onValueSelected: (id, text) => prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id ,text), minimumInputLength: 0 }); } @@ -30,8 +30,9 @@ class PageInitializer { selectElement.on( 'select2:select', function (event) { - const value = event.params.data.id; - onValueSelected(value); + const id = event.params.data.id; + const text = event.params.data.text; + onValueSelected(id, text); }); } } diff --git a/docs/SymptomsCausedByDrugs/js/PrrByKeyTableView.js b/docs/SymptomsCausedByDrugs/js/PrrByKeyTableView.js index 9694a94125b..715f8473e5d 100644 --- a/docs/SymptomsCausedByDrugs/js/PrrByKeyTableView.js +++ b/docs/SymptomsCausedByDrugs/js/PrrByKeyTableView.js @@ -2,7 +2,7 @@ class PrrByKeyTableView { #prrByKeyTable; #downloadPrrByKeyTableButton; - #value; + #text; #valueName; #prrByKeyProvider; @@ -14,11 +14,11 @@ class PrrByKeyTableView { this.#prrByKeyProvider = prrByKeyProvider; } - displayPrrByKeyTable4Value(value) { + displayPrrByKeyTable4Value(id, text) { UIUtils.disableButton(this.#downloadPrrByKeyTableButton); - this.#prrByKeyProvider(value) + this.#prrByKeyProvider(id) .then(prrByKey => { - this.#value = value; + this.#text = text; this.#prrByKeyTable.display(prrByKey); UIUtils.enableButton(this.#downloadPrrByKeyTableButton); }); @@ -36,9 +36,8 @@ class PrrByKeyTableView { UIUtils.downloadUrlAsFilename( window.URL.createObjectURL( new Blob( - [this.#prrByKeyTable.getDisplayedTableAsCsv(`# ${this.#valueName}: ${this.#value}`)], + [this.#prrByKeyTable.getDisplayedTableAsCsv(`# ${this.#valueName}: ${this.#text}`)], { type: 'text/csv' })), - this.#value - ); + this.#text); } } diff --git a/docs/SymptomsCausedByDrugs/js/PrrBySymptomTableView.js b/docs/SymptomsCausedByDrugs/js/PrrBySymptomTableView.js index e41f4d3c998..b84f2f02523 100644 --- a/docs/SymptomsCausedByDrugs/js/PrrBySymptomTableView.js +++ b/docs/SymptomsCausedByDrugs/js/PrrBySymptomTableView.js @@ -6,12 +6,12 @@ class PrrBySymptomTableView { this.#delegate = new PrrByKeyTableView( this.#createPrrBySymptomTable(prrBySymptomTableElement), downloadPrrBySymptomTableButton, - 'Vaccine', + 'Drug', PrrByVaccineProvider.getPrrBySymptom); } - displayPrrBySymptomTable4Vaccine(vaccine) { - this.#delegate.displayPrrByKeyTable4Value(vaccine); + displayPrrBySymptomTable4Vaccine(id, text) { + this.#delegate.displayPrrByKeyTable4Value(id, text); } #createPrrBySymptomTable(tableElement) { diff --git a/docs/SymptomsCausedByDrugs/js/PrrByVaccineProvider.js b/docs/SymptomsCausedByDrugs/js/PrrByVaccineProvider.js index c41b5eaa99a..5f7cff61a54 100644 --- a/docs/SymptomsCausedByDrugs/js/PrrByVaccineProvider.js +++ b/docs/SymptomsCausedByDrugs/js/PrrByVaccineProvider.js @@ -1,10 +1,10 @@ class PrrByVaccineProvider { static getPrrByVaccine(symptom) { - return fetch(`./data/ProportionalReportingRatios/symptoms/${symptom}`).then(response => response.json()); + return fetch(`./data/ProportionalReportingRatios/symptoms/${symptom}.json`).then(response => response.json()); } static getPrrBySymptom(vaccine) { - return fetch(`./data/ProportionalReportingRatios/vaccines/${vaccine}`).then(response => response.json()); + return fetch(`./data/ProportionalReportingRatios/vaccines/${vaccine}.json`).then(response => response.json()); } } \ No newline at end of file diff --git a/docs/SymptomsCausedByDrugs/js/PrrByVaccineTableView.js b/docs/SymptomsCausedByDrugs/js/PrrByVaccineTableView.js index bd55ea1792e..12a0f638b77 100644 --- a/docs/SymptomsCausedByDrugs/js/PrrByVaccineTableView.js +++ b/docs/SymptomsCausedByDrugs/js/PrrByVaccineTableView.js @@ -10,14 +10,14 @@ class PrrByVaccineTableView { PrrByVaccineProvider.getPrrByVaccine); } - displayPrrByVaccineTable4Symptom(symptom) { - this.#delegate.displayPrrByKeyTable4Value(symptom); + displayPrrByVaccineTable4Symptom(id, text) { + this.#delegate.displayPrrByKeyTable4Value(id, text); } #createPrrByVaccineTable(tableElement) { return new PrrByKeyTable({ tableElement: tableElement, - keyColumnName: 'Vaccine', + keyColumnName: 'Drug', prrColumnName: 'Lower Confidence Limit of Proportional Reporting Ratio', shallMarkRowIfPrrTooHigh: true });