diff --git a/.gitignore b/.gitignore
index bcb4b42ba00..e8931f7ff21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ src/tmp/
src/results/
docs/data/*.xlsx
docs/data/*.html
+.env
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index b8497135943..00000000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-leap-day
\ No newline at end of file
diff --git a/docs/intensivstationen.html b/docs/intensivstationen.html
index dbe6a66ff2c..020a94da460 100644
--- a/docs/intensivstationen.html
+++ b/docs/intensivstationen.html
@@ -4,7 +4,7 @@
Die Lage auf den Intensivstationen in meinem Landkreis von 2020 bis heute
+ Die Lage auf den Intensivstationen von 2020 bis heute
Die Lage auf den Intensivstationen in meinem Landkreis von 2020 bis heute
Fork me on GitHub Die Lage auf den Intensivstationen von 2020 bis heute
+ Die Lage auf den Intensivstationen in meinem Landkreis von 2020 bis heute
Landkreis:
Alle Landkreise
diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb
index be983739c35..34385cb507a 100644
--- a/src/intensivstationen/Intensivstationen.ipynb
+++ b/src/intensivstationen/Intensivstationen.ipynb
@@ -24,7 +24,7 @@
"source": [
"from datetime import datetime\n",
"\n",
- "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))\t"
+ "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))"
]
},
{
@@ -676,7 +676,7 @@
},
{
"cell_type": "code",
- "execution_count": 43,
+ "execution_count": null,
"id": "f10704f3",
"metadata": {},
"outputs": [],
@@ -688,7 +688,7 @@
},
{
"cell_type": "code",
- "execution_count": 50,
+ "execution_count": null,
"id": "396cb4f8",
"metadata": {},
"outputs": [],
@@ -697,8 +697,100 @@
" medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
" return ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
" \n",
- "medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)\n",
- "medianOfFreeBedsByKreisTable.to_excel('medianOfFreeBedsByKreisTable.xlsx')"
+ "medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "b4247571",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "import requests\n",
+ "import json\n",
+ "\n",
+ "\n",
+ "class Datawrapper:\n",
+ "\n",
+ " def __init__(self, accessToken):\n",
+ " self.authHeader = {\"Authorization\": f\"Bearer {accessToken}\"}\n",
+ "\n",
+ " def setChartTitle(self, title):\n",
+ " response = requests.request(\n",
+ " \"PATCH\",\n",
+ " \"https://api.datawrapper.de/v3/charts/dYmYb\",\n",
+ " json={\"title\": title},\n",
+ " headers={\n",
+ " \"Accept\": \"*/*\",\n",
+ " \"Content-Type\": \"application/json\"\n",
+ " } | self.authHeader)\n",
+ " return json.loads(response.text)\n",
+ "\n",
+ " def uploadChartData(self, data: pd.DataFrame):\n",
+ " response = requests.request(\n",
+ " \"PUT\",\n",
+ " \"https://api.datawrapper.de/v3/charts/dYmYb/data\",\n",
+ " data=data.to_csv(\n",
+ " index=False,\n",
+ " columns=['gemeindeschluessel', 'median_free_beds_in_percent', 'Kreis']).encode(\"utf-8\"),\n",
+ " headers={\n",
+ " \"Accept\": \"*/*\",\n",
+ " \"Content-Type\": \"text/csv\"\n",
+ " } | self.authHeader)\n",
+ " return response.text\n",
+ "\n",
+ " def fetchChartData(self):\n",
+ " response = requests.request(\n",
+ " \"GET\",\n",
+ " \"https://api.datawrapper.de/v3/charts/dYmYb/data\",\n",
+ " headers={\n",
+ " \"Accept\": \"text/csv\"\n",
+ " } | self.authHeader)\n",
+ "\n",
+ " return response.text\n",
+ "\n",
+ " def publishChart(self):\n",
+ " response = requests.request(\n",
+ " \"POST\",\n",
+ " \"https://api.datawrapper.de/v3/charts/dYmYb/publish\",\n",
+ " headers={\n",
+ " \"Accept\": \"*/*\"\n",
+ " } | self.authHeader)\n",
+ " return json.loads(response.text)\n"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "d1b75357",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "def getChartTitle(dateStart, dateEnd):\n",
+ " def formatDate(date):\n",
+ " return date.strftime(\"%d.%m.%Y\")\n",
+ "\n",
+ " return f\"Median freier Intensivbetten im Zeitraum {formatDate(dateStart)} bis {formatDate(dateEnd)}\""
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "9de2f34e",
+ "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",
+ " dateStart=timeSeries['date'].min(),\n",
+ " dateEnd=timeSeries['date'].max()))\n",
+ "dataWrapper.uploadChartData(medianOfFreeBedsByKreisTable)\n",
+ "dataWrapper.publishChart()\n"
]
},
{
@@ -708,7 +800,7 @@
"metadata": {},
"outputs": [],
"source": [
- "def publish():\n",
+ "def publishGitHubPages():\n",
" %cd /home/frankknoll/Dokumente/Corona/projects/HowBadIsMyBatch-pages\n",
" ! git add -A\n",
" ! git commit -m \"updating data\"\n",
@@ -722,7 +814,7 @@
"metadata": {},
"outputs": [],
"source": [
- "publish()"
+ "publishGitHubPages()"
]
}
],
diff --git a/src/intensivstationen/medianOfFreeBedsByKreisTable.xlsx b/src/intensivstationen/medianOfFreeBedsByKreisTable.xlsx
deleted file mode 100644
index eb4ce115cc6..00000000000
Binary files a/src/intensivstationen/medianOfFreeBedsByKreisTable.xlsx and /dev/null differ