francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Frank Knoll
2024-07-14 20:40:25 +02:00
parent e68f284d6e
commit c302dedd05
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/SymptomsCausedByDrugs/index.html
View File

@@ -36,7 +36,7 @@
<script src="./js/PrrByKeyTableView.js"></script> <script src="./js/PrrByKeyTableView.js"></script>
<script src="./js/PrrByVaccineTableView.js"></script> <script src="./js/PrrByVaccineTableView.js"></script>
<script src="./js/PrrBySymptomTableView.js"></script> <script src="./js/PrrBySymptomTableView.js"></script>
<script src="./js/SearchParam.js"></script> <script src="./js/URLSearchParam.js"></script>
<script src="./js/Select2.js"></script> <script src="./js/Select2.js"></script>
<script> <script>
document.addEventListener( document.addEventListener(
@@ -47,14 +47,14 @@
{ {
symptom: { symptom: {
symptomSelectElement: $('#symptomSelect'), symptomSelectElement: $('#symptomSelect'),
searchParam: new SearchParam('symptom'), urlSearchParam: new URLSearchParam('symptom'),
prrByVaccineTableElement: $('#prrByVaccineTable'), prrByVaccineTableElement: $('#prrByVaccineTable'),
downloadPrrByVaccineTableButton: document.querySelector("#downloadPrrByVaccineTable"), downloadPrrByVaccineTableButton: document.querySelector("#downloadPrrByVaccineTable"),
keyColumnName: name keyColumnName: name
}, },
vaccine: { vaccine: {
vaccineSelectElement: $('#vaccineSelect'), vaccineSelectElement: $('#vaccineSelect'),
searchParam: new SearchParam('vaccine'), urlSearchParam: new URLSearchParam('vaccine'),
prrBySymptomTableElement: $('#prrBySymptomTable'), prrBySymptomTableElement: $('#prrBySymptomTable'),
downloadPrrBySymptomTableButton: document.querySelector("#downloadPrrBySymptomTable"), downloadPrrBySymptomTableButton: document.querySelector("#downloadPrrBySymptomTable"),
valueName: name valueName: name

12
docs/SymptomsCausedByDrugs/js/PageInitializer.js
View File

@@ -5,29 +5,29 @@ class PageInitializer {
PageInitializer.#configureVaccine(vaccine); PageInitializer.#configureVaccine(vaccine);
} }
static #configureSymptom({ symptomSelectElement, searchParam, prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName }) { static #configureSymptom({ symptomSelectElement, urlSearchParam, prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName }) {
const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName); const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName);
Select2.initializeSelectElement( Select2.initializeSelectElement(
{ {
selectElement: symptomSelectElement, selectElement: symptomSelectElement,
textOfOption2Select: searchParam.get(), textOfOption2Select: urlSearchParam.get(),
onSelectOptionHavingValueAndText: (id, text) => { onSelectOptionHavingValueAndText: (id, text) => {
prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text); prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text);
searchParam.set(text); urlSearchParam.set(text);
}, },
minimumInputLength: 0 minimumInputLength: 0
}); });
} }
static #configureVaccine({ vaccineSelectElement, searchParam, prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName }) { static #configureVaccine({ vaccineSelectElement, urlSearchParam, prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName }) {
const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName); const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName);
Select2.initializeSelectElement( Select2.initializeSelectElement(
{ {
selectElement: vaccineSelectElement, selectElement: vaccineSelectElement,
textOfOption2Select: searchParam.get(), textOfOption2Select: urlSearchParam.get(),
onSelectOptionHavingValueAndText: (id, text) => { onSelectOptionHavingValueAndText: (id, text) => {
prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id, text); prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id, text);
searchParam.set(text); urlSearchParam.set(text);
}, },
minimumInputLength: 0 minimumInputLength: 0
}); });

2
docs/SymptomsCausedByDrugs/js/SearchParam.js → docs/SymptomsCausedByDrugs/js/URLSearchParam.js
View File

@@ -1,4 +1,4 @@
class SearchParam { class URLSearchParam {
#name; #name;

6
docs/SymptomsCausedByVaccines/index.html
View File

@@ -36,7 +36,7 @@
<script src="../SymptomsCausedByDrugs/js/PrrByKeyTableView.js"></script> <script src="../SymptomsCausedByDrugs/js/PrrByKeyTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByVaccineTableView.js"></script> <script src="../SymptomsCausedByDrugs/js/PrrByVaccineTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrBySymptomTableView.js"></script> <script src="../SymptomsCausedByDrugs/js/PrrBySymptomTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/SearchParam.js"></script> <script src="../SymptomsCausedByDrugs/js/URLSearchParam.js"></script>
<script src="../SymptomsCausedByDrugs/js/Select2.js"></script> <script src="../SymptomsCausedByDrugs/js/Select2.js"></script>
<script> <script>
document.addEventListener( document.addEventListener(
@@ -47,14 +47,14 @@
{ {
symptom: { symptom: {
symptomSelectElement: $('#symptomSelect'), symptomSelectElement: $('#symptomSelect'),
searchParam: new SearchParam('symptom'), urlSearchParam: new URLSearchParam('symptom'),
prrByVaccineTableElement: $('#prrByVaccineTable'), prrByVaccineTableElement: $('#prrByVaccineTable'),
downloadPrrByVaccineTableButton: document.querySelector("#downloadPrrByVaccineTable"), downloadPrrByVaccineTableButton: document.querySelector("#downloadPrrByVaccineTable"),
keyColumnName: name keyColumnName: name
}, },
vaccine: { vaccine: {
vaccineSelectElement: $('#vaccineSelect'), vaccineSelectElement: $('#vaccineSelect'),
searchParam: new SearchParam('vaccine'), urlSearchParam: new URLSearchParam('vaccine'),
prrBySymptomTableElement: $('#prrBySymptomTable'), prrBySymptomTableElement: $('#prrBySymptomTable'),
downloadPrrBySymptomTableButton: document.querySelector("#downloadPrrBySymptomTable"), downloadPrrBySymptomTableButton: document.querySelector("#downloadPrrBySymptomTable"),
valueName: name valueName: name

14
docs/UrlUtils.js
View File

@@ -1,13 +1,13 @@
class UrlUtils { class UrlUtils {
static isSearchParamYES(urlParams, searchParam) { static isSearchParamYES(urlParams, urlSearchParam) {
return UrlUtils.#getSearchParam(urlParams, searchParam, 'NO').toUpperCase() == 'YES'; return UrlUtils.#getSearchParam(urlParams, urlSearchParam, 'NO').toUpperCase() == 'YES';
} }
static getSearchParamOfCurrentUrl(searchParam) { static getSearchParamOfCurrentUrl(urlSearchParam) {
return UrlUtils.#getSearchParam( return UrlUtils.#getSearchParam(
new URLSearchParams(window.location.search), new URLSearchParams(window.location.search),
searchParam, urlSearchParam,
null) null)
} }
@@ -25,9 +25,9 @@ class UrlUtils {
a.click(); a.click();
} }
static #getSearchParam(urlParams, searchParam, defaultValue) { static #getSearchParam(urlParams, urlSearchParam, defaultValue) {
return urlParams.has(searchParam) ? return urlParams.has(urlSearchParam) ?
urlParams.get(searchParam) : urlParams.get(urlSearchParam) :
defaultValue; defaultValue;
} }