Merge branch 'main' into pages
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
document.addEventListener(
|
||||
"DOMContentLoaded",
|
||||
event => {
|
||||
// FK-TODO: add PDF button
|
||||
BatchCodeSelectInitializer.initialize(
|
||||
{
|
||||
batchCodeSelectElement: $('#batchCodeSelect'),
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -17,29 +17,29 @@ class PageInitializer {
|
||||
});
|
||||
}
|
||||
|
||||
static #configureSymptom({ symptomSelectElement, urlSearchParam, prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName }) {
|
||||
const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName);
|
||||
static #configureSymptom({ symptomSelectElement, urlSearchParam, prrByVaccineTableElement, keyColumnName }) {
|
||||
const prrByVaccineTableView = new PrrByVaccineTableView(prrByVaccineTableElement, keyColumnName);
|
||||
Select2.initializeSelectElement(
|
||||
{
|
||||
selectElement: symptomSelectElement,
|
||||
minimumInputLength: 0,
|
||||
textOfOption2Select: urlSearchParam.get(),
|
||||
onSelectOptionHavingValueAndText: (id, text) => {
|
||||
prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id, text);
|
||||
prrByVaccineTableView.displayPrrByVaccineTable4Symptom(id);
|
||||
urlSearchParam.set(text);
|
||||
}
|
||||
});
|
||||
return prrByVaccineTableView;
|
||||
}
|
||||
|
||||
static #configureVaccine({ vaccineSelectElement, urlSearchParam, prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName }) {
|
||||
const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName);
|
||||
static #configureVaccine({ vaccineSelectElement, urlSearchParam, prrBySymptomTableElement }) {
|
||||
const prrBySymptomTableView = new PrrBySymptomTableView(prrBySymptomTableElement);
|
||||
Select2.initializeSelectElement(
|
||||
{
|
||||
selectElement: vaccineSelectElement,
|
||||
textOfOption2Select: urlSearchParam.get(),
|
||||
onSelectOptionHavingValueAndText: (id, text) => {
|
||||
prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id, text);
|
||||
prrBySymptomTableView.displayPrrBySymptomTable4Vaccine(id);
|
||||
urlSearchParam.set(text);
|
||||
},
|
||||
minimumInputLength: 0
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,6 @@ class PrrByKeyTable {
|
||||
#tableElement;
|
||||
#table;
|
||||
#sumPrrs;
|
||||
#prrByKey;
|
||||
#keyColumnName;
|
||||
#prrColumnName;
|
||||
#shallMarkRowIfPrrTooHigh;
|
||||
@@ -20,23 +19,10 @@ class PrrByKeyTable {
|
||||
}
|
||||
|
||||
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
|
||||
});
|
||||
}
|
||||
|
||||
getTable() {
|
||||
return this.#table;
|
||||
}
|
||||
|
||||
@@ -1,47 +1,20 @@
|
||||
class PrrByKeyTableView {
|
||||
|
||||
#prrByKeyTable;
|
||||
#downloadPrrByKeyTableButton;
|
||||
#text;
|
||||
#valueName;
|
||||
#prrByKeyProvider;
|
||||
|
||||
constructor(prrByKeyTable, downloadPrrByKeyTableButton, valueName, prrByKeyProvider) {
|
||||
constructor(prrByKeyTable, prrByKeyProvider) {
|
||||
this.#prrByKeyTable = prrByKeyTable;
|
||||
this.#prrByKeyTable.initialize();
|
||||
this.#initializeButton(downloadPrrByKeyTableButton);
|
||||
this.#valueName = valueName;
|
||||
this.#prrByKeyProvider = prrByKeyProvider;
|
||||
}
|
||||
|
||||
displayPrrByKeyTable4Value(id, text) {
|
||||
UIUtils.disableButton(this.#downloadPrrByKeyTableButton);
|
||||
displayPrrByKeyTable4Value(id) {
|
||||
this.#prrByKeyProvider(id)
|
||||
.then(prrByKey => {
|
||||
this.#text = text;
|
||||
this.#prrByKeyTable.display(prrByKey);
|
||||
UIUtils.enableButton(this.#downloadPrrByKeyTableButton);
|
||||
});
|
||||
.then(prrByKey => this.#prrByKeyTable.display(prrByKey));
|
||||
}
|
||||
|
||||
getTable() {
|
||||
return this.#prrByKeyTable.getTable();
|
||||
}
|
||||
|
||||
#initializeButton(downloadPrrByKeyTableButton) {
|
||||
this.#downloadPrrByKeyTableButton = downloadPrrByKeyTableButton;
|
||||
UIUtils.disableButton(downloadPrrByKeyTableButton);
|
||||
downloadPrrByKeyTableButton.addEventListener(
|
||||
'click',
|
||||
() => this.#downloadPrrByKey())
|
||||
}
|
||||
|
||||
#downloadPrrByKey() {
|
||||
UrlUtils.downloadUrlAsFilename(
|
||||
window.URL.createObjectURL(
|
||||
new Blob(
|
||||
[this.#prrByKeyTable.getDisplayedTableAsCsv(`# ${this.#valueName}: ${this.#text}`)],
|
||||
{ type: 'text/csv' })),
|
||||
this.#text);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,16 +2,14 @@ class PrrBySymptomTableView {
|
||||
|
||||
#delegate;
|
||||
|
||||
constructor(prrBySymptomTableElement, downloadPrrBySymptomTableButton, valueName) {
|
||||
constructor(prrBySymptomTableElement) {
|
||||
this.#delegate = new PrrByKeyTableView(
|
||||
this.#createPrrBySymptomTable(prrBySymptomTableElement),
|
||||
downloadPrrBySymptomTableButton,
|
||||
valueName,
|
||||
PrrByVaccineProvider.getPrrBySymptom);
|
||||
}
|
||||
|
||||
displayPrrBySymptomTable4Vaccine(id, text) {
|
||||
this.#delegate.displayPrrByKeyTable4Value(id, text);
|
||||
displayPrrBySymptomTable4Vaccine(id) {
|
||||
this.#delegate.displayPrrByKeyTable4Value(id);
|
||||
}
|
||||
|
||||
getTable() {
|
||||
|
||||
@@ -2,16 +2,14 @@ class PrrByVaccineTableView {
|
||||
|
||||
#delegate;
|
||||
|
||||
constructor(prrByVaccineTableElement, downloadPrrByVaccineTableButton, keyColumnName) {
|
||||
constructor(prrByVaccineTableElement, keyColumnName) {
|
||||
this.#delegate = new PrrByKeyTableView(
|
||||
this.#createPrrByVaccineTable(prrByVaccineTableElement, keyColumnName),
|
||||
downloadPrrByVaccineTableButton,
|
||||
'Symptom',
|
||||
PrrByVaccineProvider.getPrrByVaccine);
|
||||
}
|
||||
|
||||
displayPrrByVaccineTable4Symptom(id, text) {
|
||||
this.#delegate.displayPrrByKeyTable4Value(id, text);
|
||||
displayPrrByVaccineTable4Symptom(id) {
|
||||
this.#delegate.displayPrrByKeyTable4Value(id);
|
||||
}
|
||||
|
||||
getTable() {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,30 +0,0 @@
|
||||
QUnit.module('PrrByKey2CsvConverterTest', function () {
|
||||
|
||||
QUnit.test('convertPrrByKey2Csv', function (assert) {
|
||||
// Given
|
||||
const prrByKey = {
|
||||
"MM,R": 26.17432376240791,
|
||||
"VARCEL": 10.549534724816644
|
||||
};
|
||||
|
||||
// When
|
||||
const csv = PrrByKey2CsvConverter.convertPrrByKey2Csv(
|
||||
{
|
||||
heading: '# Symptom: Acute hepatitis C',
|
||||
columns: {
|
||||
keyColumn: 'Vaccine',
|
||||
prrColumn: 'Proportional Reporting Ratio'
|
||||
},
|
||||
prrByKey: prrByKey
|
||||
});
|
||||
|
||||
// Then
|
||||
const csvExpected =
|
||||
`# Symptom: Acute hepatitis C
|
||||
|
||||
"Vaccine","Proportional Reporting Ratio"
|
||||
"MM,R",26.17432376240791
|
||||
"VARCEL",10.549534724816644`;
|
||||
assert.equal(csv, csvExpected);
|
||||
});
|
||||
});
|
||||
@@ -1,37 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
|
||||
<!-- Meta, title, CSS, favicons, etc. -->
|
||||
<meta charset="utf-8" />
|
||||
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
|
||||
<title>Symptoms caused by Vaccines</title>
|
||||
<script src="../../Utils.js"></script>
|
||||
<script src="../../UIUtils.js"></script>
|
||||
<script src="../../NumberWithBarElementFactory.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>
|
||||
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.17.2.css">
|
||||
<script src="https://code.jquery.com/qunit/qunit-2.17.2.js"></script>
|
||||
<script type="text/javascript" src="./jshamcrest.js"></script>
|
||||
<script type="text/javascript" src="./jsmockito-1.0.4.js"></script>
|
||||
<script>
|
||||
JsHamcrest.Integration.QUnit();
|
||||
JsMockito.Integration.QUnit();
|
||||
</script>
|
||||
<script src="./PrrByKey2CsvConverterTest.js"></script>
|
||||
</head>
|
||||
|
||||
<body class="nav-md">
|
||||
<div id="qunit"></div>
|
||||
<div id="qunit-fixture"></div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,5 @@
|
||||
html, body {
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@@ -4932,10 +4933,9 @@ table.dataTable.display tbody tr.prrTooHigh {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.downloadButton {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
a:link.underline, a:visited.underline, a:hover.underline, a:active.underline {
|
||||
a:link.underline,
|
||||
a:visited.underline,
|
||||
a:hover.underline,
|
||||
a:active.underline {
|
||||
text-decoration: underline;
|
||||
}
|
||||
@@ -3,7 +3,6 @@ Local:
|
||||
- http://www.howbadismybatch.info/batchCodes.html?showCountriesColumn=yes&showDataTablesFilter=yes
|
||||
- http://www.howbadismybatch.info/VaccineDistributionByZipcode.html
|
||||
- http://www.howbadismybatch.info/SymptomsCausedByVaccines/index.html
|
||||
http://www.howbadismybatch.info/SymptomsCausedByVaccines/test/index.test.html
|
||||
- http://www.howbadismybatch.info/SymptomsCausedByDrugs/index.html
|
||||
|
||||
Live:
|
||||
@@ -11,7 +10,6 @@ Live:
|
||||
- https://knollfrank.github.io/HowBadIsMyBatch/batchCodes.html?showCountriesColumn=yes&showDataTablesFilter=yes
|
||||
- https://knollfrank.github.io/HowBadIsMyBatch/VaccineDistributionByZipcode.html
|
||||
- https://knollfrank.github.io/HowBadIsMyBatch/SymptomsCausedByVaccines/index.html
|
||||
https://knollfrank.github.io/HowBadIsMyBatch/SymptomsCausedByVaccines/test/index.test.html
|
||||
- https://knollfrank.github.io/HowBadIsMyBatch/SymptomsCausedByDrugs/index.html
|
||||
|
||||
jupyter notebook
|
||||
|
||||
Reference in New Issue
Block a user