diff --git a/src/BatchCodeTableHtmlUpdater.py b/src/BatchCodeTableHtmlUpdater.py index 8c9233b50ec..ac383cf2d1a 100644 --- a/src/BatchCodeTableHtmlUpdater.py +++ b/src/BatchCodeTableHtmlUpdater.py @@ -4,32 +4,33 @@ from CountryOptionsSetter import CountryOptionsSetter from DateProvider import DateProvider from HtmlUtils import getCountryOptions, getCountries from DateProvider import DateProvider -from BatchCodeTablePersister import createAndSaveBatchCodeTables def updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile): countryOptions = getCountryOptions(getCountries(internationalVaersCovid19)) _saveCountryOptions(countryOptions, batchCodeTableHtmlFile) - _saveLastUpdatedBatchCodeTable(DateProvider().getLastUpdatedDataSource(), batchCodeTableHtmlFile) - createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality=100) + _saveLastUpdatedBatchCodeTable( + DateProvider().getLastUpdatedDataSource(), + batchCodeTableHtmlFile) def _saveCountryOptions(countryOptions, batchCodeTableHtmlFile): HtmlTransformerUtil().applySoupTransformerToFile( - file = batchCodeTableHtmlFile, - soupTransformer = - lambda soup: - BeautifulSoup( - CountryOptionsSetter().setCountryOptions(html = str(soup), options = countryOptions), - 'lxml')) + file=batchCodeTableHtmlFile, + soupTransformer=lambda soup: + BeautifulSoup( + CountryOptionsSetter().setCountryOptions( + html=str(soup), + options=countryOptions), + 'lxml')) def _saveLastUpdatedBatchCodeTable(lastUpdated, batchCodeTableHtmlFile): def setLastUpdated(soup): - soup.find(id = "last_updated").string.replace_with(lastUpdated.strftime(DateProvider.DATE_FORMAT)) + soup.find(id="last_updated").string.replace_with( + lastUpdated.strftime(DateProvider.DATE_FORMAT)) return soup HtmlTransformerUtil().applySoupTransformerToFile( - file = batchCodeTableHtmlFile, - soupTransformer = setLastUpdated) - \ No newline at end of file + file=batchCodeTableHtmlFile, + soupTransformer=setLastUpdated) diff --git a/src/BatchCodeTablePersister.py b/src/BatchCodeTablePersister.py index e685e9a86bb..3008fe88778 100644 --- a/src/BatchCodeTablePersister.py +++ b/src/BatchCodeTablePersister.py @@ -7,8 +7,7 @@ from HtmlUtils import getCountries def createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality): batchCodeTableFactory = BatchCodeTableFactory(internationalVaersCovid19) _createAndSaveBatchCodeTablesForCountries( - createBatchCodeTableForCountry=lambda country: batchCodeTableFactory.createBatchCodeTableByCountry( - country), + createBatchCodeTableForCountry=lambda country: batchCodeTableFactory.createBatchCodeTableByCountry(country), countries=getCountries(internationalVaersCovid19), minADRsForLethality=minADRsForLethality) _createAndSaveBatchCodeTableForCountry( diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 0c5418b0b62..81e4508139b 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -17,7 +17,8 @@ "from datetime import datetime\n", "from DateProvider import DateProvider\n", "from InternationalVaersCovid19Provider import getInternationalVaersCovid19\n", - "from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile" + "from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile\n", + "from BatchCodeTablePersister import createAndSaveBatchCodeTables" ] }, { @@ -78,6 +79,16 @@ "updateBatchCodeTableHtmlFile(internationalVaersCovid19, batchCodeTableHtmlFile=\"../docs/batchCodeTable.html\")" ] }, + { + "cell_type": "code", + "execution_count": null, + "id": "0915aa5a", + "metadata": {}, + "outputs": [], + "source": [ + "createAndSaveBatchCodeTables(internationalVaersCovid19, minADRsForLethality=100)" + ] + }, { "cell_type": "code", "execution_count": null,