refactoring

This commit is contained in:
frankknoll
2022-02-11 20:54:49 +01:00
parent 3da5c46a8b
commit 80ab6a8157
9 changed files with 153932 additions and 64 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ src/VAERS/
.history/ .history/
src/config/ src/config/
src/results/ src/results/
data/*.xlsx

View File

@@ -25,7 +25,7 @@
document.title = title; document.title = title;
document.querySelectorAll(".title").forEach(element => element.textContent = title); document.querySelectorAll(".title").forEach(element => element.textContent = title);
document.querySelectorAll(".companyName").forEach(element => element.textContent = companyName); document.querySelectorAll(".companyName").forEach(element => element.textContent = companyName);
$("#table").load("src/results/batchCodes/" + company + ".html", function () { $("#table").load("data/" + company + ".html", function () {
$('#batchCodeTable').DataTable({ $('#batchCodeTable').DataTable({
language: { language: {
searchPlaceholder: "Enter " + companyName + " Batch Code" searchPlaceholder: "Enter " + companyName + " Batch Code"

11899
data/janssen.html Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

63027
data/moderna.html Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

42405
data/pfizer.html Normal file

File diff suppressed because it is too large Load Diff

27194
data/pfizerInternational.html Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -991,7 +991,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/moderna.html\n", "# https://www.howbadismybatch.com/moderna.html\n",
"saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna\")" "saveBatchCodeTable(vaers, \"MODERNA\", \"../data/moderna\")"
] ]
}, },
{ {
@@ -1010,7 +1010,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/pfizer.html\n", "# https://www.howbadismybatch.com/pfizer.html\n",
"saveBatchCodeTable(vaers, \"PFIZER\\BIONTECH\", \"results/batchCodes/pfizer\")" "saveBatchCodeTable(vaers, \"PFIZER\\BIONTECH\", \"../data/pfizer\")"
] ]
}, },
{ {
@@ -1029,7 +1029,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/janssen.html\n", "# https://www.howbadismybatch.com/janssen.html\n",
"saveBatchCodeTable(vaers, \"JANSSEN\", \"results/batchCodes/janssen\")" "saveBatchCodeTable(vaers, \"JANSSEN\", \"../data/janssen\")"
] ]
}, },
{ {
@@ -1048,7 +1048,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/modernaforeigndeaths.html\n", "# https://www.howbadismybatch.com/modernaforeigndeaths.html\n",
"saveBatchCodeTable(nonDomesticVaers, \"MODERNA\", \"results/batchCodes/modernaInternational\")" "saveBatchCodeTable(nonDomesticVaers, \"MODERNA\", \"../data/modernaInternational\")"
] ]
}, },
{ {
@@ -1067,7 +1067,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/pfizerforeigndeaths.html\n", "# https://www.howbadismybatch.com/pfizerforeigndeaths.html\n",
"saveBatchCodeTable(nonDomesticVaers, \"PFIZER\\BIONTECH\", \"results/batchCodes/pfizerInternational\")" "saveBatchCodeTable(nonDomesticVaers, \"PFIZER\\BIONTECH\", \"../data/pfizerInternational\")"
] ]
}, },
{ {
@@ -1086,66 +1086,9 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"# https://www.howbadismybatch.com/janssenforeigndeaths.html\n", "# https://www.howbadismybatch.com/janssenforeigndeaths.html\n",
"saveBatchCodeTable(nonDomesticVaers, \"JANSSEN\", \"results/batchCodes/janssenInternational\")" "saveBatchCodeTable(nonDomesticVaers, \"JANSSEN\", \"../data/janssenInternational\")"
] ]
}, },
{
"cell_type": "markdown",
"id": "e096e1ed",
"metadata": {},
"source": [
"### International batch codes"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "ae494a59",
"metadata": {},
"outputs": [],
"source": [
"allVaers = nonDomesticVaers # pd.concat([vaers, nonDomesticVaers])"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "e7ad1d12",
"metadata": {},
"outputs": [],
"source": [
"allVaers"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5b13b0d3",
"metadata": {},
"outputs": [],
"source": [
"allCovid19Vaers = DataFrameFilter().filterByCovid19(allVaers)\n",
"batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(allCovid19Vaers)\n",
"display(batchCodeTable)\n",
"IOUtils.saveDataFrame(batchCodeTable, \"results/batchCodes/all\")"
]
},
{
"cell_type": "markdown",
"id": "3d0aa163",
"metadata": {},
"source": [
"### All batch codes"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "23c5c089",
"metadata": {},
"outputs": [],
"source": []
},
{ {
"cell_type": "markdown", "cell_type": "markdown",
"id": "f677b620", "id": "f677b620",