From 50b5cf010d9b6dbe995873d4d0171de7cfa043a1 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Thu, 10 Feb 2022 14:11:27 +0100
Subject: [PATCH] saving dataframes as html and excel

---
 HowBadIsMyBatch.ipynb | 34 +++++++++++++++++++++-------------
 help.txt              |  3 +++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb
index 875e50bd2bf..f84118616b0 100644
--- a/HowBadIsMyBatch.ipynb
+++ b/HowBadIsMyBatch.ipynb
@@ -899,7 +899,15 @@
     "\n",
     "def saveDataFrameAsExcelFile(dataFrame, file):\n",
     "    ensurePath(file)\n",
-    "    dataFrame.to_excel(file)\n"
+    "    dataFrame.to_excel(file + '.xlsx')\n",
+    "\n",
+    "def saveDataFrameAsHtml(dataFrame, file):\n",
+    "    ensurePath(file)\n",
+    "    dataFrame.to_html(file + '.html')\n",
+    "\n",
+    "def saveDataFrame(dataFrame, file):\n",
+    "    saveDataFrameAsExcelFile(dataFrame, file)\n",
+    "    saveDataFrameAsHtml(dataFrame, file)"
    ]
   },
   {
@@ -929,10 +937,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def saveBatchCodeTable(vaers, manufacturer, excelFile):\n",
+    "def saveBatchCodeTable(vaers, manufacturer, file):\n",
     "    batchCodeTable = BatchCodeTableFactory.createBatchCodeTable(vaers, manufacturer = manufacturer, dose = '1')\n",
     "    display(batchCodeTable)\n",
-    "    saveDataFrameAsExcelFile(batchCodeTable, excelFile)"
+    "    saveDataFrame(batchCodeTable, file)\n"
    ]
   },
   {
@@ -961,7 +969,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/moderna.html\n",
-    "saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna.xlsx\")"
+    "saveBatchCodeTable(vaers, \"MODERNA\", \"results/batchCodes/moderna)"
    ]
   },
   {
@@ -980,7 +988,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/pfizer.html\n",
-    "saveBatchCodeTable(vaers, \"PFIZER\\BIONTECH\", \"results/batchCodes/pfizer.xlsx\")"
+    "saveBatchCodeTable(vaers, \"PFIZER\\BIONTECH\", \"results/batchCodes/pfizer\")"
    ]
   },
   {
@@ -999,7 +1007,7 @@
    "outputs": [],
    "source": [
     "# https://www.howbadismybatch.com/janssen.html\n",
-    "saveBatchCodeTable(vaers, \"JANSSEN\", \"results/batchCodes/janssen.xlsx\")"
+    "saveBatchCodeTable(vaers, \"JANSSEN\", \"results/batchCodes/janssen\")"
    ]
   },
   {
@@ -1030,7 +1038,7 @@
     "nonDomesticCovid19Vaers = DataFrameFilter().filterByCovid19(nonDomesticVaers)\n",
     "batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(nonDomesticCovid19Vaers)\n",
     "display(batchCodeTable)\n",
-    "saveDataFrameAsExcelFile(batchCodeTable, \"results/batchCodes/international.xlsx\")"
+    "saveDataFrame(batchCodeTable, \"results/batchCodes/international\")"
    ]
   },
   {
@@ -1048,10 +1056,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def saveSevereEffectsBatchCodeTable(vaers, excelFile):\n",
+    "def saveSevereEffectsBatchCodeTable(vaers, file):\n",
     "    severeEffectsBatchCodeTable = BatchCodeTableFactory.createSevereEffectsBatchCodeTable(vaers, dose = '1')\n",
     "    display(severeEffectsBatchCodeTable)\n",
-    "    saveDataFrameAsExcelFile(severeEffectsBatchCodeTable, excelFile)"
+    "    saveDataFrame(severeEffectsBatchCodeTable, file)"
    ]
   },
   {
@@ -1061,7 +1069,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "saveSevereEffectsBatchCodeTable(vaers, 'results/severeEffects.xlsx')"
+    "saveSevereEffectsBatchCodeTable(vaers, 'results/severeEffects')"
    ]
   },
   {
@@ -1091,7 +1099,7 @@
    "outputs": [],
    "source": [
     "doseByMonthTable = DoseTableFactory.createDoseByMonthTable(vaers)\n",
-    "saveDataFrameAsExcelFile(doseByMonthTable, 'results/firstsecond/doseByMonthTable.xlsx')\n",
+    "saveDataFrame(doseByMonthTable, 'results/firstsecond/doseByMonthTable')\n",
     "doseByMonthTable"
    ]
   },
@@ -1131,7 +1139,7 @@
    "outputs": [],
    "source": [
     "internationalLotTable = internationalLotTable[internationalLotTable['Total reports'] > 50]\n",
-    "saveDataFrameAsExcelFile(internationalLotTable, 'results/international/International_Deadly_Lots.xlsx')\n",
+    "saveDataFrame(internationalLotTable, 'results/international/International_Deadly_Lots')\n",
     "internationalLotTable"
    ]
   },
@@ -1145,7 +1153,7 @@
     "def createAndSaveAndDisplayBatchCodeTableByCountry(nonDomesticVaers, country):\n",
     "    batchCodeTable = InternationalLotTableFactory.createBatchCodeTableByCountry(nonDomesticVaers, country)\n",
     "    batchCodeTable = batchCodeTable[batchCodeTable['Total reports'] > 50]\n",
-    "    saveDataFrameAsExcelFile(batchCodeTable, 'results/international/' + country + '.xlsx')\n",
+    "    saveDataFrame(batchCodeTable, 'results/international/' + country)\n",
     "    display(country + \":\", batchCodeTable)\n",
     "\n",
     "def createAndSaveAndDisplayBatchCodeTablesByCountry(nonDomesticVaers, countries):\n",
diff --git a/help.txt b/help.txt
index dc3e565ab58..e9500d2a9b7 100644
--- a/help.txt
+++ b/help.txt
@@ -3,6 +3,9 @@ jupyter notebook
 get VAERS data:
 - download data (e.g. 2022VAERSData.zip) from https://vaers.hhs.gov/data/datasets.html and save and unzip in VAERS folder
 
+FK-FIXME:
+- Anzahl 'DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL' und 'ER_VISIT' MÜSSEN immer noch korrekt gezählt werden nach createDataFrameFromDescr()
+
 FK-TODO:
 - publish all figures and tables (as interactive HTML-Pages?)
 - Vergleich Grippe mit Covid19