diff --git a/docs/intensivstationen.html b/docs/intensivstationen.html index 5252de1e7d6..e15e2d34134 100644 --- a/docs/intensivstationen.html +++ b/docs/intensivstationen.html @@ -465,7 +465,7 @@
Kartenansichten
Datenstand:
-
17.03.2022, 12:54 Uhr
+
18.03.2022, 12:57 Uhr
diff --git a/src/intensivstationen/Intensivstationen.ipynb b/src/intensivstationen/Intensivstationen.ipynb index 10f203fca9f..0bc94d1f52d 100644 --- a/src/intensivstationen/Intensivstationen.ipynb +++ b/src/intensivstationen/Intensivstationen.ipynb @@ -44,29 +44,29 @@ " INTENSIVSTATIONEN_DATE_FORMAT = \"%d.%m.%Y, %H:%M Uhr\"\n", "\n", " def __init__(self):\n", - " self.lastUpdatedIntensivstationen = None\n", - " self.lastUpdatedOriginal = None\n", + " self.lastUpdated = None\n", + " self.lastUpdatedDataSource = None\n", "\n", " def needsUpdate(self):\n", - " return self.getLastUpdatedIntensivstationen() < self.getLastUpdatedOriginal()\n", + " return self.getLastUpdated() < self.getLastUpdatedDataSource()\n", " \n", - " def getLastUpdatedIntensivstationen(self):\n", - " if self.lastUpdatedIntensivstationen is None:\n", + " def getLastUpdated(self):\n", + " if self.lastUpdated is None:\n", " htmlContent = requests.get(\"https://knollfrank.github.io/HowBadIsMyBatch/intensivstationen.html\").text\n", " soup = BeautifulSoup(htmlContent, \"lxml\")\n", " dateStr = soup.find(id = \"Datenstand\").text\n", - " self.lastUpdatedIntensivstationen = datetime.strptime(dateStr, DateProvider.INTENSIVSTATIONEN_DATE_FORMAT)\n", + " self.lastUpdated = datetime.strptime(dateStr, DateProvider.INTENSIVSTATIONEN_DATE_FORMAT)\n", " \n", - " return self.lastUpdatedIntensivstationen\n", + " return self.lastUpdated\n", "\n", - " def getLastUpdatedOriginal(self):\n", - " if self.lastUpdatedOriginal is None:\n", + " def getLastUpdatedDataSource(self):\n", + " if self.lastUpdatedDataSource is None:\n", " html = self._getOriginalHtml()\n", " lastUpdatedColumn = 'Letzte Änderung'\n", " dataFrame = self._asDataFrame(html, lastUpdatedColumn)\n", - " self.lastUpdatedOriginal = dataFrame.loc['Landkreis-Daten', lastUpdatedColumn].to_pydatetime()\n", + " self.lastUpdatedDataSource = dataFrame.loc['Landkreis-Daten', lastUpdatedColumn].to_pydatetime()\n", "\n", - " return self.lastUpdatedOriginal\n", + " return self.lastUpdatedDataSource\n", "\n", " def _getOriginalHtml(self):\n", " options = Options()\n", @@ -93,8 +93,8 @@ "outputs": [], "source": [ "dateProvider = DateProvider()\n", - "print('lastUpdatedIntensivstationen:', dateProvider.getLastUpdatedIntensivstationen())\n", - "print('lastUpdatedOriginal:', dateProvider.getLastUpdatedOriginal()) \n", + "print(' lastUpdated:', dateProvider.getLastUpdated())\n", + "print('lastUpdatedDataSource:', dateProvider.getLastUpdatedDataSource()) \n", "needsUpdate = dateProvider.needsUpdate()\n", "print('needsUpdate: ', needsUpdate)" ] @@ -147,7 +147,7 @@ "metadata": {}, "outputs": [], "source": [ - "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedOriginal())" + "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource())" ] }, {