From eab69db9fd3de6f29e86745e97a13964719366a7 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Wed, 14 Dec 2022 22:13:59 +0100
Subject: [PATCH] refactoring

---
 src/intensivstationen/Intensivstationen.ipynb | 23 +++----------------
 .../IntensivstationenHtmlFileUpdater.py       | 12 ++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb
index 18a45f1a0ff..1a78e927d00 100644
--- a/src/intensivstationen/Intensivstationen.ipynb
+++ b/src/intensivstationen/Intensivstationen.ipynb
@@ -34,7 +34,7 @@
     "from Datawrapper import Datawrapper\n",
     "from MedianOfFreeBedsByKreisTableFactory import MedianOfFreeBedsByKreisTableFactory\n",
     "from TimeseriesReader import readTimeseries\n",
-    "from IntensivstationenHtmlFileUpdater import saveKreisOptions\n",
+    "from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n",
     "\n",
     "pd.set_option('display.max_rows', 100)\n",
     "pd.set_option('display.max_columns', None)\n",
@@ -65,23 +65,6 @@
     "print('needsUpdate:', needsUpdate)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "af101279",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def saveLastUpdatedIntensivstationen(lastUpdated):\n",
-    "    def setLastUpdated(soup):\n",
-    "        soup.find(id = \"Datenstand\").string.replace_with(lastUpdated.strftime(DateProvider.INTENSIVSTATIONEN_DATE_FORMAT))\n",
-    "        return soup\n",
-    "\n",
-    "    HtmlTransformerUtil().applySoupTransformerToFile(\n",
-    "        file = \"../../docs/intensivstationen.html\",\n",
-    "        soupTransformer = setLastUpdated)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -89,7 +72,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource())"
+    "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource(), toHtmlFile = \"../../docs/intensivstationen.html\")"
    ]
   },
   {
@@ -194,7 +177,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "saveKreisOptions(kreisOptions, toHtmlFile=\"../../docs/intensivstationen.html\")"
+    "saveKreisOptions(kreisOptions, toHtmlFile = \"../../docs/intensivstationen.html\")"
    ]
   },
   {
diff --git a/src/intensivstationen/IntensivstationenHtmlFileUpdater.py b/src/intensivstationen/IntensivstationenHtmlFileUpdater.py
index ba485ed7d3d..9a76d4e3ddb 100644
--- a/src/intensivstationen/IntensivstationenHtmlFileUpdater.py
+++ b/src/intensivstationen/IntensivstationenHtmlFileUpdater.py
@@ -1,6 +1,18 @@
 from bs4 import BeautifulSoup
 from HtmlTransformerUtil import HtmlTransformerUtil
+from DateProvider import DateProvider
 from KreisOptionsSetter import KreisOptionsSetter
+from HtmlTransformerUtil import HtmlTransformerUtil
+
+
+def saveLastUpdatedIntensivstationen(lastUpdated, toHtmlFile):
+    def setLastUpdated(soup):
+        soup.find(id = "Datenstand").string.replace_with(lastUpdated.strftime(DateProvider.INTENSIVSTATIONEN_DATE_FORMAT))
+        return soup
+
+    HtmlTransformerUtil().applySoupTransformerToFile(
+        file = toHtmlFile,
+        soupTransformer = setLastUpdated)
 
 
 def saveKreisOptions(kreisOptions, toHtmlFile):