adding Company column

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

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",