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

adding Company column

Browse Source
This commit is contained in:
frankknoll
2022-02-19 16:57:26 +01:00
parent 119dcee570
commit 6594ef67e6
14 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/Australia.json
+1 -1
View File
@@ -1 +1 @@
{"columns":["Batch","Total Number of Adverse Reaction Reports","Deaths","Disabilities","Life Threatening Illnesses","Severe reports","Lethality"],"data":[["3002188",1,0,0,1,null,null],["EX2405",1,0,1,0,null,null],["FL350",1,0,1,0,null,null],["FF3438",1,0,1,0,null,null],["FE8163",2,0,2,0,null,null],["FF4222",1,0,1,0,null,null],["EP2163 SERIAL 1",1,1,0,0,null,null],["FF4206",2,0,1,0,null,null],["NO BATCH NUMBER",33,4,0,0,null,null],["UNKNOWN",58,1,4,2,null,null],["FA7338",1,0,0,0,null,null],["FE3712",1,0,0,0,null,null],["ER7449",1,0,0,0,null,null],["3006325",1,0,0,0,null,null],["FG1657",1,0,0,0,null,null],["FG3712",1,0,0,0,null,null],["FG7372",1,0,0,0,null,null],["FH3219",1,0,0,0,null,null],["EJ8516",1,0,0,0,null,null],["FL3560",1,0,0,0,null,null],["FN0565",1,0,0,0,null,null],["UNSURE",1,0,0,0,null,null]]}
{"columns":["Batch","Total Number of Adverse Reaction Reports","Deaths","Disabilities","Life Threatening Illnesses","Company","Severe reports","Lethality"],"data":[["3002188",1,0,0,1,"MODERNA",null,null],["EX2405",1,0,1,0,"PFIZER\\BIONTECH",null,null],["FL350",1,0,1,0,"PFIZER\\BIONTECH",null,null],["FF3438",1,0,1,0,"PFIZER\\BIONTECH",null,null],["FE8163",2,0,2,0,"PFIZER\\BIONTECH",null,null],["FF4222",1,0,1,0,"PFIZER\\BIONTECH",null,null],["EP2163 SERIAL 1",1,1,0,0,"PFIZER\\BIONTECH",null,null],["FF4206",2,0,1,0,"PFIZER\\BIONTECH",null,null],["NO BATCH NUMBER",33,4,0,0,"UNKNOWN MANUFACTURER",null,null],["UNKNOWN",58,1,4,2,"PFIZER\\BIONTECH",null,null],["FA7338",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FE3712",1,0,0,0,"PFIZER\\BIONTECH",null,null],["ER7449",1,0,0,0,"PFIZER\\BIONTECH",null,null],["3006325",1,0,0,0,"MODERNA",null,null],["FG1657",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FG3712",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FG7372",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FH3219",1,0,0,0,"PFIZER\\BIONTECH",null,null],["EJ8516",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FL3560",1,0,0,0,"PFIZER\\BIONTECH",null,null],["FN0565",1,0,0,0,"PFIZER\\BIONTECH",null,null],["UNSURE",1,0,0,0,"PFIZER\\BIONTECH",null,null]]}
data/Austria.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Belgium.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/France.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Germany.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Italy.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Japan.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Netherlands.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Portugal.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Spain.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/Sweden.json
+1 -1
View File
File diff suppressed because one or more lines are too long
data/United Kingdom.json
+1 -1
View File
File diff suppressed because one or more lines are too long
internationalBatchCodeTables.html
+5 -2
View File
@@ -19,8 +19,9 @@
'Deaths': 2,
'Disabilities': 3,
'Life Threatening Illnesses': 4,
'Severe reports': 5,
'Lethality': 6
'Company': 5,
'Severe reports': 6,
'Lethality': 7
};
return $('#batchCodeTable').DataTable(
{
@@ -44,6 +45,7 @@
columnIndex['Deaths'],
columnIndex['Disabilities'],
columnIndex['Life Threatening Illnesses'],
columnIndex['Company'],
columnIndex['Severe reports'],
columnIndex['Lethality']
]
@@ -114,6 +116,7 @@
<th>Deaths</th>
<th>Disabilities</th>
<th>Life Threatening Illnesses</th>
<th>Company</th>
<th>Severe reports</th>
<th>Lethality</th>
</tr>
src/HowBadIsMyBatch.ipynb
+14 -3
View File
@@ -417,6 +417,17 @@
" def createBatchCodeTableByCountry(dataFrame : pd.DataFrame, country):\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" batchCodeTable = InternationalLotTableFactory._createBatchCodeTableByCountry(dataFrame, country)\n",
" batchCodeTable = CompanyColumnAdder.addCompanyColumn(batchCodeTable, CompanyColumnAdder.createCompanyByBatchCodeTable(dataFrame))\n",
" batchCodeTable = batchCodeTable[\n",
" [\n",
" 'Total Number of Adverse Reaction Reports',\n",
" 'Deaths',\n",
" 'Disabilities',\n",
" 'Life Threatening Illnesses',\n",
" 'Company',\n",
" 'Severe reports',\n",
" 'Lethality'\n",
" ]]\n",
" return batchCodeTable.sort_values(by = 'Severe reports', ascending = False)\n",
"\n",
" @staticmethod\n",
@@ -1138,9 +1149,9 @@
" assert_frame_equal(\n",
" batchCodeTable,\n",
" TestHelper.createDataFrame(\n",
" columns = ['Total Number of Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Severe reports', 'Lethality'],\n",
" data = [ [2, 1, 2, 2, 2/2 * 100, 1/2 * 100],\n",
" [1, 0, 0, 0, 0/1 * 100, 0/1 * 100]],\n",
" columns = ['Total Number of Adverse Reaction Reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Company', 'Severe reports', 'Lethality'],\n",
" data = [ [2, 1, 2, 2, 'MODERNA', 2/2 * 100, 1/2 * 100],\n",
" [1, 0, 0, 0, 'MODERNA', 0/1 * 100, 0/1 * 100]],\n",
" index = pd.Index(\n",
" [\n",
" '030L20B',\n",