refactoring
This commit is contained in:
@@ -226,30 +226,30 @@
|
|||||||
"import json\n",
|
"import json\n",
|
||||||
"\n",
|
"\n",
|
||||||
"\n",
|
"\n",
|
||||||
"def getAndPersistIntensiveCareBeds(timeSeries, kreis=None):\n",
|
"def getAndPersistIntensiveCareBeds(timeSeries, kreis = None):\n",
|
||||||
" dataFrame = getIntensiveCareBeds(timeSeries, kreis)\n",
|
" intensiveCareBeds = getIntensiveCareBeds(timeSeries, kreis)\n",
|
||||||
" display(kreis)\n",
|
" display(kreis)\n",
|
||||||
" _saveDataFrameAsJson(dataFrame, _getFilename(kreis))\n",
|
" _saveAsJson(intensiveCareBeds, _getFilename(kreis))\n",
|
||||||
" return dataFrame\n",
|
" return intensiveCareBeds\n",
|
||||||
"\n",
|
"\n",
|
||||||
"\n",
|
"\n",
|
||||||
"def _saveDataFrameAsJson(dataFrame, file):\n",
|
"def _saveAsJson(intensiveCareBeds, file):\n",
|
||||||
" IOUtils.saveDictAsJson(\n",
|
" IOUtils.saveDictAsJson(\n",
|
||||||
" {\n",
|
" {\n",
|
||||||
" 'population': int(dataFrame.iloc[0]['Einwohnerzahl']),\n",
|
" 'population': int(intensiveCareBeds.iloc[0]['Einwohnerzahl']),\n",
|
||||||
" 'data': _dataFrame2Dict(dataFrame),\n",
|
" 'data': _intensiveCareBeds2Dict(intensiveCareBeds),\n",
|
||||||
" },\n",
|
" },\n",
|
||||||
" file)\n",
|
" file)\n",
|
||||||
"\n",
|
"\n",
|
||||||
"\n",
|
"\n",
|
||||||
"def _dataFrame2Dict(dataFrame):\n",
|
"def _intensiveCareBeds2Dict(intensiveCareBeds):\n",
|
||||||
" df = dataFrame[['date', 'betten_belegt', 'betten_frei']]\n",
|
" df = intensiveCareBeds[['date', 'betten_belegt', 'betten_frei']]\n",
|
||||||
" df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n",
|
" df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n",
|
||||||
" return df.to_dict(orient=\"records\")\n",
|
" return df.to_dict(orient = \"records\")\n",
|
||||||
"\n",
|
"\n",
|
||||||
"\n",
|
"\n",
|
||||||
"def _getFilename(kreis):\n",
|
"def _getFilename(kreis):\n",
|
||||||
" return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix=_getSuffix(kreis))\n",
|
" return '../../docs/data/intensivstationen/intensivstationen-{suffix}.json'.format(suffix = _getSuffix(kreis))\n",
|
||||||
"\n",
|
"\n",
|
||||||
"\n",
|
"\n",
|
||||||
"def _getSuffix(kreis):\n",
|
"def _getSuffix(kreis):\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user