diff --git a/src/BatchCodeTableHtmlUpdater.py b/src/BatchCodeTableHtmlUpdater.py
index e6d3accf92e..10697b379bc 100644
--- a/src/BatchCodeTableHtmlUpdater.py
+++ b/src/BatchCodeTableHtmlUpdater.py
@@ -2,13 +2,16 @@ from bs4 import BeautifulSoup
from HtmlTransformerUtil import HtmlTransformerUtil
from BatchcodeOptionsSetter import BatchcodeOptionsSetter
from HtmlUtils import getBatchcodeOptions, getBatchcodes
-from DateProvider import DateProvider
+from SymptomsCausedByVaccines.HtmlUpdater import saveLastUpdated2HtmlFile
def updateBatchCodeTableHtmlFile(batchCodeTable, batchCodeTableHtmlFile, lastUpdated):
batchcodeOptions = getBatchcodeOptions(getBatchcodes(batchCodeTable.sort_values(by = 'Adverse Reaction Reports', ascending = False)))
_saveBatchcodeOptions(batchcodeOptions, batchCodeTableHtmlFile)
- saveLastUpdated2HtmlFile(lastUpdated, batchCodeTableHtmlFile)
+ saveLastUpdated2HtmlFile(
+ lastUpdated = lastUpdated,
+ htmlFile = batchCodeTableHtmlFile,
+ lastUpdatedElementId = 'last_updated')
def _saveBatchcodeOptions(batchcodeOptions, batchCodeTableHtmlFile):
HtmlTransformerUtil().applySoupTransformerToFile(
@@ -19,13 +22,3 @@ def _saveBatchcodeOptions(batchcodeOptions, batchCodeTableHtmlFile):
html=str(soup),
options=batchcodeOptions),
'lxml'))
-
-def saveLastUpdated2HtmlFile(lastUpdated, htmlFile):
- def setLastUpdated(soup):
- soup.find(id="last_updated").string.replace_with(
- lastUpdated.strftime(DateProvider.DATE_FORMAT))
- return soup
-
- HtmlTransformerUtil().applySoupTransformerToFile(
- file = htmlFile,
- soupTransformer = setLastUpdated)
diff --git a/src/SymptomsCausedByVaccines/HtmlUpdater.py b/src/SymptomsCausedByVaccines/HtmlUpdater.py
index 122748debc5..9028c5c3c2e 100644
--- a/src/SymptomsCausedByVaccines/HtmlUpdater.py
+++ b/src/SymptomsCausedByVaccines/HtmlUpdater.py
@@ -9,7 +9,10 @@ from SymptomsCausedByVaccines.OptionsSetter import OptionsSetter
def updateHtmlFile(symptomByVaccine, htmlFile, lastUpdated):
vaccineOptions = getVaccineOptions(Analyzer(symptomByVaccine).getVaccines())
_saveVaccineOptions(vaccineOptions, htmlFile)
- saveLastUpdated2HtmlFile(lastUpdated, htmlFile)
+ saveLastUpdated2HtmlFile(
+ lastUpdated = lastUpdated,
+ htmlFile = htmlFile,
+ lastUpdatedElementId = 'last_updated')
def _saveVaccineOptions(vaccineOptions, htmlFile):
HtmlTransformerUtil().applySoupTransformerToFile(
@@ -22,10 +25,9 @@ def _saveVaccineOptions(vaccineOptions, htmlFile):
options = vaccineOptions),
'lxml'))
-# FK-TODO: DRY with src/BatchCodeTableHtmlUpdater.py
-def saveLastUpdated2HtmlFile(lastUpdated, htmlFile):
+def saveLastUpdated2HtmlFile(lastUpdated, htmlFile, lastUpdatedElementId):
def setLastUpdated(soup):
- soup.find(id="last_updated").string.replace_with(
+ soup.find(id = lastUpdatedElementId).string.replace_with(
lastUpdated.strftime(DateProvider.DATE_FORMAT))
return soup