diff --git a/frameworks/Framework.py b/frameworks/Framework.py
index a0541d0..b495637 100644
--- a/frameworks/Framework.py
+++ b/frameworks/Framework.py
@@ -162,4 +162,7 @@ def formatCheckAndLinks(self, packedData):
checks.append(c)
checks.append("")
- return ["".join(checks), "
".join(links), comp]
\ No newline at end of file
+ return ["".join(checks), "
".join(links), comp]
+
+ def _hookPostBuildContentDetail(self):
+ pass
\ No newline at end of file
diff --git a/frameworks/FrameworkPageBuilder.py b/frameworks/FrameworkPageBuilder.py
index 86be59d..963d654 100644
--- a/frameworks/FrameworkPageBuilder.py
+++ b/frameworks/FrameworkPageBuilder.py
@@ -149,13 +149,15 @@ def buildContentDetail(self):
items.append([item, ''])
outp.append(self.generateRowWithCol(size=12, items=items, rowHtmlAttr="data-context=detail"))
+
+ self.framework._hookPostBuildContentDetail()
return (outp)
# To be overwrite by custom class
def _hookPreBuildContentDetail(self):
pass
-
+
def customBuildTableHTML(self):
outp = []
diff --git a/frameworks/WAFS/WAFS.py b/frameworks/WAFS/WAFS.py
index 21c7278..a164997 100644
--- a/frameworks/WAFS/WAFS.py
+++ b/frameworks/WAFS/WAFS.py
@@ -32,7 +32,6 @@ def __init__(self, data):
self.WATools = waTools
self.WATools.init(tmpParams)
self.WATools.createReportIfNotExists()
- self.WATools.createMilestoneIfNotExists()
self.WATools.listAnswers()
# print(self.WATools.answerSets)
@@ -89,3 +88,6 @@ def getDescription(self, titleNum, paired):
titleStr = self.WATools.answerSets.get(titleNum, [None])[1]
sectStr = self.WATools.answerSets.get(paired, [None])[1]
return f"{titleStr} - {sectStr}"
+
+ def _hookPostBuildContentDetail(self):
+ self.WATools.createMilestoneIfNotExists()
\ No newline at end of file
diff --git a/frameworks/helper/WATools.py b/frameworks/helper/WATools.py
index 6d46d3d..3149689 100644
--- a/frameworks/helper/WATools.py
+++ b/frameworks/helper/WATools.py
@@ -122,7 +122,7 @@ def createMilestoneIfNotExists(self):
break # No more pages, exit the loop
if not all_milestones:
- print(f"No milestones found for workload {workload_id}... creating milestone...")
+ print("No milestones found for workload {}... creating milestone...".format(self.waInfo['WorkloadId']))
self.createMilestone()
return None
diff --git a/services/PageBuilder.py b/services/PageBuilder.py
index cc01d48..7823054 100644
--- a/services/PageBuilder.py
+++ b/services/PageBuilder.py
@@ -68,6 +68,19 @@ def getHtmlId(self, el=''):
el = el or o[0:11]
return self.idPrefix + el
+ def _prebuildContentSummary(self):
+ pass
+
+ def _postbuildContentSummary(self):
+ pass
+
+ def _preBuildContentDetail(self):
+ pass
+
+ def _postBuildContentDetail(self):
+ pass
+
+
def buildPage(self):
self.init()
self.htmlFolder = Config.get('HTML_ACCOUNT_FOLDER_FULLPATH')
@@ -76,8 +89,15 @@ def buildPage(self):
output.append(self.buildHeader())
output.append(self.buildNav())
output.append(self.buildBreadcrumb())
+
+ self._prebuildContentSummary()
output.append(self.buildContentSummary())
+ self._postbuildContentSummary()
+
+ self._preBuildContentDetail()
output.append(self.buildContentDetail())
+ self._postBuildContentDetail()
+
output.append(self.buildFooter())
finalHTML = ""