refactoring

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

View File

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

View File

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

View File

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

View File

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

View File

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