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-14 22:44:53 +01:00
parent f94ec56877
commit 256ccd926d
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/intensivstationen/Intensivstationen.ipynb
View File

@@ -32,7 +32,7 @@
"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 getKreisOptions\n", "from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n",
"\n", "\n",
"\n", "\n",
"pd.set_option('display.max_rows', 100)\n", "pd.set_option('display.max_rows', 100)\n",
@@ -85,17 +85,6 @@
"timeSeries" "timeSeries"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "74ea4d55",
"metadata": {},
"outputs": [],
"source": [
"kreise = readKreise(download = False)\n",
"kreise"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
@@ -103,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"timeSeries = ColumnsAdder(kreise).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n", "timeSeries = ColumnsAdder(kreise = readKreise(download = False)).addKreisAndBundeslandAndEinwohnerzahlColumns(timeSeries)\n",
"timeSeries" "timeSeries"
] ]
}, },
@@ -124,7 +113,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"kreisOptions = ['<option selected=\"\" value=\"de\">Alle Landkreise</option>'] + getKreisOptions(kreisValues)" "kreisOptions = getKreisOptionsAndAlleLandkreise(kreisValues)"
] ]
}, },
{ {

3
src/intensivstationen/KreisOptionsProvider.py
View File

@@ -1,3 +1,6 @@
def getKreisOptionsAndAlleLandkreise(kreisValues):
return ['<option selected="" value="de">Alle Landkreise</option>'] + getKreisOptions(kreisValues)
def getKreisOptions(kreisValues): def getKreisOptions(kreisValues):
return [getKreisOption(kreis) for kreis in kreisValues] return [getKreisOption(kreis) for kreis in kreisValues]