refactoring

This commit is contained in:
Frank Knoll
2024-07-12 10:47:33 +02:00
parent a7e88bcce0
commit 754a46d82b
8 changed files with 7 additions and 298 deletions

View File

@@ -28,13 +28,13 @@
<script src="../Utils.js"></script>
<script src="../UIUtils.js"></script>
<script src="../NumberWithBarElementFactory.js"></script>
<script src="./js/PrrByKey2CsvConverter.js"></script>
<script src="./js/PageInitializer.js"></script>
<script src="./js/PrrByVaccineProvider.js"></script>
<script src="./js/PrrByKeyTable.js"></script>
<script src="./js/PrrByKeyTableView.js"></script>
<script src="./js/PrrByVaccineTableView.js"></script>
<script src="./js/PrrBySymptomTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByKey2CsvConverter.js"></script>
<script src="../SymptomsCausedByDrugs/js/PageInitializer.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByVaccineProvider.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByKeyTable.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByKeyTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrByVaccineTableView.js"></script>
<script src="../SymptomsCausedByDrugs/js/PrrBySymptomTableView.js"></script>
<script>
document.addEventListener(
"DOMContentLoaded",

View File

@@ -1,38 +0,0 @@
class PageInitializer {
static initializePage({ symptom, vaccine }) {
PageInitializer.#configureSymptom(symptom);
PageInitializer.#configureVaccine(vaccine);
}
static #configureSymptom({ symptomSelectElement, prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName }) {
const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName);
PageInitializer.#initializeSelectElement(
{
selectElement: symptomSelectElement,
onValueSelected: (id, text) => prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text),
minimumInputLength: 0
});
}
static #configureVaccine({ vaccineSelectElement, prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName }) {
const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName);
PageInitializer.#initializeSelectElement(
{
selectElement: vaccineSelectElement,
onValueSelected: (id, text) => prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id ,text),
minimumInputLength: 0
});
}
static #initializeSelectElement({ selectElement, onValueSelected, minimumInputLength }) {
selectElement.select2({ minimumInputLength: minimumInputLength });
selectElement.on(
'select2:select',
function (event) {
const id = event.params.data.id;
const text = event.params.data.text;
onValueSelected(id, text);
});
}
}

View File

@@ -1,41 +0,0 @@
class PrrByKey2CsvConverter {
static convertPrrByKey2Csv(
{
heading,
columns: { keyColumn, prrColumn },
prrByKey
}
) {
return heading + '\n\n' +
PrrByKey2CsvConverter.#convert2Csv(
{
prrByKey: PrrByKey2CsvConverter.#quoteKeys(prrByKey),
keyColumn: PrrByKey2CsvConverter.#quote(keyColumn),
prrColumn: PrrByKey2CsvConverter.#quote(prrColumn)
});
}
static #quoteKeys(prrByKey) {
return Object.fromEntries(
Object
.entries(prrByKey)
.map(([key, prr]) => [PrrByKey2CsvConverter.#quote(key), prr]))
}
static #quote(str) {
return '"' + str + '"';
}
static #convert2Csv({ prrByKey, keyColumn, prrColumn }) {
const header = `${keyColumn},${prrColumn}`;
return `${header}\n${PrrByKey2CsvConverter.#convertDict2Csv(prrByKey)}`;
}
static #convertDict2Csv(dict) {
return Object
.entries(dict)
.map(([key, value]) => `${key},${value}`)
.join('\n');
}
}

View File

@@ -1,109 +0,0 @@
class PrrByKeyTable {
#tableElement;
#table;
#sumPrrs;
#prrByKey;
#keyColumnName;
#prrColumnName;
#shallMarkRowIfPrrTooHigh;
constructor({ tableElement, keyColumnName, prrColumnName, shallMarkRowIfPrrTooHigh }) {
this.#tableElement = tableElement;
this.#keyColumnName = keyColumnName;
this.#prrColumnName = prrColumnName;
this.#shallMarkRowIfPrrTooHigh = shallMarkRowIfPrrTooHigh;
}
initialize() {
this.#table = this.#createEmptyTable();
}
display(prrByKey) {
this.#prrByKey = prrByKey;
const key_prr_pairs = Object.entries(prrByKey);
this.#setTableRows(key_prr_pairs);
}
getDisplayedTableAsCsv(heading) {
return PrrByKey2CsvConverter.convertPrrByKey2Csv(
{
heading: heading,
columns: {
keyColumn: this.#keyColumnName,
prrColumn: this.#prrColumnName
},
prrByKey: this.#prrByKey
});
}
#createEmptyTable() {
return this.#tableElement.DataTable(
{
search:
{
return: false
},
processing: true,
deferRender: true,
order: [[this.#getColumnIndex(this.#prrColumnName), "desc"]],
columnDefs:
[
{
searchable: false,
targets: [this.#getColumnIndex(this.#prrColumnName)]
},
{
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)]
}
],
createdRow: (row, data) => {
if (this.#shallMarkRowIfPrrTooHigh) {
this.#markRowIfPrrTooHigh(
{
prr: data[this.#getColumnIndex(this.#prrColumnName)],
row: row
});
}
}
});
}
#markRowIfPrrTooHigh({ prr, row }) {
if (prr >= 2.0) {
$(row).addClass('prrTooHigh');
}
}
#getColumnIndex(columnName) {
switch (columnName) {
case this.#keyColumnName:
return 0;
case this.#prrColumnName:
return 1;
}
}
#setTableRows(key_prr_pairs) {
this.#sumPrrs = this.#getSumPrrs(key_prr_pairs);
this.#table
.clear()
.rows.add(key_prr_pairs)
.draw();
}
#getSumPrrs(key_prr_pairs) {
const prrs = key_prr_pairs.map(key_prr_pair => key_prr_pair[1])
return Utils.sum(prrs);
}
}

View File

@@ -1,43 +0,0 @@
class PrrByKeyTableView {
#prrByKeyTable;
#downloadPrrByKeyTableButton;
#text;
#valueName;
#prrByKeyProvider;
constructor(prrByKeyTable, downloadPrrByKeyTableButton, valueName, prrByKeyProvider) {
this.#prrByKeyTable = prrByKeyTable;
this.#prrByKeyTable.initialize();
this.#initializeButton(downloadPrrByKeyTableButton);
this.#valueName = valueName;
this.#prrByKeyProvider = prrByKeyProvider;
}
displayPrrByKeyTable4Value(id, text) {
UIUtils.disableButton(this.#downloadPrrByKeyTableButton);
this.#prrByKeyProvider(id)
.then(prrByKey => {
this.#text = text;
this.#prrByKeyTable.display(prrByKey);
UIUtils.enableButton(this.#downloadPrrByKeyTableButton);
});
}
#initializeButton(downloadPrrByKeyTableButton) {
this.#downloadPrrByKeyTableButton = downloadPrrByKeyTableButton;
UIUtils.disableButton(downloadPrrByKeyTableButton);
downloadPrrByKeyTableButton.addEventListener(
'click',
() => this.#downloadPrrByKey())
}
#downloadPrrByKey() {
UIUtils.downloadUrlAsFilename(
window.URL.createObjectURL(
new Blob(
[this.#prrByKeyTable.getDisplayedTableAsCsv(`# ${this.#valueName}: ${this.#text}`)],
{ type: 'text/csv' })),
this.#text);
}
}

View File

@@ -1,25 +0,0 @@
class PrrBySymptomTableView {
#delegate;
constructor(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName) {
this.#delegate = new PrrByKeyTableView(
this.#createPrrBySymptomTable(prrBySymptomTableElement),
downloadPrrBySymptomTableButton,
valueName,
PrrByVaccineProvider.getPrrBySymptom);
}
displayPrrBySymptomTable4Vaccine(id, text) {
this.#delegate.displayPrrByKeyTable4Value(id, text);
}
#createPrrBySymptomTable(tableElement) {
return new PrrByKeyTable({
tableElement: tableElement,
keyColumnName: 'Symptom',
prrColumnName: 'Lower Confidence Limit of Proportional Reporting Ratio >= 2',
shallMarkRowIfPrrTooHigh: false
});
}
}

View File

@@ -1,10 +0,0 @@
class PrrByVaccineProvider {
static getPrrByVaccine(symptom) {
return fetch(`./data/ProportionalReportingRatios/symptoms/${symptom}.json`).then(response => response.json());
}
static getPrrBySymptom(vaccine) {
return fetch(`./data/ProportionalReportingRatios/vaccines/${vaccine}.json`).then(response => response.json());
}
}

View File

@@ -1,25 +0,0 @@
class PrrByVaccineTableView {
#delegate;
constructor(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName) {
this.#delegate = new PrrByKeyTableView(
this.#createPrrByVaccineTable(prrByVaccineTableElement, keyColumnName),
downloadPrrByVaccineTableButton,
'Symptom',
PrrByVaccineProvider.getPrrByVaccine);
}
displayPrrByVaccineTable4Symptom(id, text) {
this.#delegate.displayPrrByKeyTable4Value(id, text);
}
#createPrrByVaccineTable(tableElement, keyColumnName) {
return new PrrByKeyTable({
tableElement: tableElement,
keyColumnName: keyColumnName,
prrColumnName: 'Lower Confidence Limit of Proportional Reporting Ratio',
shallMarkRowIfPrrTooHigh: true
});
}
}