francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-12-15 00:07:32 +01:00
parent b4bb79efdf
commit 08743e4971
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/intensivstationen/Chart.py Normal file
View File

@@ -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()

26
src/intensivstationen/Intensivstationen.ipynb
View File

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