refactoring

This commit is contained in:
frankknoll
2022-12-14 22:07:52 +01:00
parent b8e252c480
commit 88996c7ada
2 changed files with 15 additions and 21 deletions

View File

@@ -34,6 +34,7 @@
"from Datawrapper import Datawrapper\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 saveKreisOptions\n",
"\n", "\n",
"pd.set_option('display.max_rows', 100)\n", "pd.set_option('display.max_rows', 100)\n",
"pd.set_option('display.max_columns', None)\n", "pd.set_option('display.max_columns', None)\n",
@@ -186,26 +187,6 @@
"kreisOptions = ['<option selected=\"\" value=\"de\">Alle Landkreise</option>'] + getKreisOptions(kreisValues)" "kreisOptions = ['<option selected=\"\" value=\"de\">Alle Landkreise</option>'] + getKreisOptions(kreisValues)"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "403f8b7b",
"metadata": {},
"outputs": [],
"source": [
"from bs4 import BeautifulSoup\n",
"\n",
"\n",
"def saveKreisOptions(kreisOptions):\n",
" HtmlTransformerUtil().applySoupTransformerToFile(\n",
" file = \"../../docs/intensivstationen.html\",\n",
" soupTransformer =\n",
" lambda soup:\n",
" BeautifulSoup(\n",
" KreisOptionsSetter().setKreisOptions(html = str(soup), options = kreisOptions),\n",
" 'lxml'))\n"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
@@ -213,7 +194,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"saveKreisOptions(kreisOptions)" "saveKreisOptions(kreisOptions, toHtmlFile=\"../../docs/intensivstationen.html\")"
] ]
}, },
{ {

View File

@@ -0,0 +1,13 @@
from bs4 import BeautifulSoup
from HtmlTransformerUtil import HtmlTransformerUtil
from KreisOptionsSetter import KreisOptionsSetter
def saveKreisOptions(kreisOptions, toHtmlFile):
HtmlTransformerUtil().applySoupTransformerToFile(
file = toHtmlFile,
soupTransformer =
lambda soup:
BeautifulSoup(
KreisOptionsSetter().setKreisOptions(html = str(soup), options = kreisOptions),
'lxml'))