From f83c1f298c1cd949acbb1775fa543838bc8d2627 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Thu, 24 Mar 2022 11:30:06 +0100
Subject: [PATCH] refactoring

---
 src/HowBadIsMyBatch.ipynb | 44 ++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index ffb29cfc145..db1e05c0f8a 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -24,10 +24,12 @@
     "from bs4 import BeautifulSoup\n",
     "import requests\n",
     "import re\n",
-    "from dateutil.parser import parse\n",
+    "from datetime import datetime\n",
     "\n",
     "class DateProvider:\n",
     "    \n",
+    "    DATE_FORMAT = \"%B %d, %Y\"\n",
+    "\n",
     "    def __init__(self):\n",
     "        self.lastUpdated = None\n",
     "        self.lastUpdatedDataSource = None\n",
@@ -59,7 +61,7 @@
     "        htmlContent = requests.get(url).text\n",
     "        soup = BeautifulSoup(htmlContent, \"lxml\")\n",
     "        dateStr = getDateStr(soup)\n",
-    "        return parse(dateStr).date()"
+    "        return datetime.strptime(dateStr, DateProvider.DATE_FORMAT)"
    ]
   },
   {
@@ -459,6 +461,23 @@
     "                    'lxml'))\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f02dddfe",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def saveLastUpdatedBatchCodeTable(lastUpdated):\n",
+    "    def setLastUpdated(soup):\n",
+    "        soup.find(id = \"last_updated\").string.replace_with(lastUpdated.strftime(DateProvider.DATE_FORMAT))\n",
+    "        return soup\n",
+    "\n",
+    "    HtmlTransformerUtil().applySoupTransformerToFile(\n",
+    "        file = \"../docs/batchCodeTable.html\",\n",
+    "        soupTransformer = setLastUpdated)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -953,16 +972,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "countries = sorted(internationalVaersCovid19['COUNTRY'].unique())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1c518028",
-   "metadata": {},
-   "outputs": [],
-   "source": [
+    "countries = sorted(internationalVaersCovid19['COUNTRY'].unique())\n",
     "countryOptions = ['<option value=\"Global\" selected>Global</option>']  + getCountryOptions(countries)"
    ]
   },
@@ -976,6 +986,16 @@
     "saveCountryOptions(countryOptions)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9c7485b5",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "saveLastUpdatedBatchCodeTable(dateProvider.getLastUpdatedDataSource())"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,