From 08743e49712892397091fa58cc18138987c805f4 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Thu, 15 Dec 2022 00:07:32 +0100
Subject: [PATCH] refactoring

---
 src/intensivstationen/Chart.py                |  9 +++++++
 src/intensivstationen/Intensivstationen.ipynb | 26 +++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 src/intensivstationen/Chart.py

diff --git a/src/intensivstationen/Chart.py b/src/intensivstationen/Chart.py
new file mode 100644
index 00000000000..0ec26fd2197
--- /dev/null
+++ b/src/intensivstationen/Chart.py
@@ -0,0 +1,9 @@
+from decouple import AutoConfig
+from Datawrapper import Datawrapper
+
+def createMedianOfFreeBedsByKreisChart(medianOfFreeBedsByKreisTable, chartTitle):
+    config = AutoConfig(search_path='../..')
+    dataWrapper = Datawrapper(config('DATAWRAPPER_API_TOKEN'))
+    dataWrapper.setChartTitle(chartTitle)
+    dataWrapper.uploadChartData(medianOfFreeBedsByKreisTable)
+    dataWrapper.publishChart()
diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb
index 2bed2017aad..74e259318b9 100644
--- a/src/intensivstationen/Intensivstationen.ipynb
+++ b/src/intensivstationen/Intensivstationen.ipynb
@@ -26,13 +26,13 @@
     "from DateProvider import DateProvider\n",
     "from datetime import datetime\n",
     "from ColumnsAdder import ColumnsAdder\n",
-    "from Datawrapper import Datawrapper\n",
     "from MedianOfFreeBedsByKreisTableFactory import MedianOfFreeBedsByKreisTableFactory\n",
     "from TimeseriesReader import readTimeseries\n",
     "from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n",
     "from KreiseReader import readKreise\n",
     "from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n",
     "from IntensiveCareBedsPersister import getAndPersistIntensiveCareBeds4AlleKreise\n",
+    "from Chart import createMedianOfFreeBedsByKreisChart\n",
     "\n",
     "\n",
     "pd.set_option('display.max_rows', 100)\n",
@@ -71,7 +71,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource(), toHtmlFile = \"../../docs/intensivstationen.html\")"
+    "saveLastUpdatedIntensivstationen(\n",
+    "    dateProvider.getLastUpdatedDataSource(),\n",
+    "    toHtmlFile = \"../../docs/intensivstationen.html\")"
    ]
   },
   {
@@ -92,8 +94,9 @@
    "outputs": [],
    "source": [
     "kreisValues = sorted(timeSeries['Kreis'].drop_duplicates().values)\n",
-    "kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues)\n",
-    "saveKreisOptions(kreisOptions, toHtmlFile = \"../../docs/intensivstationen.html\")"
+    "saveKreisOptions(\n",
+    "    kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues),\n",
+    "    toHtmlFile = \"../../docs/intensivstationen.html\")"
    ]
   },
   {
@@ -152,20 +155,15 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9de2f34e",
+   "id": "8b392b34",
    "metadata": {},
    "outputs": [],
    "source": [
-    "from decouple import AutoConfig\n",
-    "\n",
-    "config = AutoConfig(search_path='../..')\n",
-    "dataWrapper = Datawrapper(config('DATAWRAPPER_API_TOKEN'))\n",
-    "dataWrapper.setChartTitle(\n",
-    "    getChartTitle(\n",
+    "createMedianOfFreeBedsByKreisChart(\n",
+    "    medianOfFreeBedsByKreisTable,\n",
+    "    chartTitle = getChartTitle(\n",
     "        dateStart=timeSeries['date'].min(),\n",
-    "        dateEnd=timeSeries['date'].max()))\n",
-    "dataWrapper.uploadChartData(medianOfFreeBedsByKreisTable)\n",
-    "dataWrapper.publishChart()\n"
+    "        dateEnd=timeSeries['date'].max()))"
    ]
   },
   {