Templated as per PR comments #3041

AtlasOfLivingAustralia · Dec 6, 2023 · 4304a11 · 4304a11
1 parent ee6b125
commit 4304a11
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 24 deletions.
diff --git a/grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp b/grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp
@@ -2,7 +2,7 @@
 <table class="table secondary-outcome">
     <thead>
     <tr>
-        <th class="outcome-priority">Additional outcome/s</th>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
         <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
     </tr>
     </thead>

diff --git a/grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp b/grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp
@@ -5,11 +5,11 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="baseline">Monitoring methodology</th>
+        <th class="baseline">${indicatorHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Project service / Target measure/s</th>
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
         </g:if>
-        <th class="baseline-method">Monitoring method</th>
+        <th class="baseline-method">${approachHeading}</th>
         <g:if test="${extendedMonitoring}">
             <th class="monitoring-evidence">Evidence to be retained</th>
         </g:if>

diff --git a/grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp b/grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp
@@ -6,12 +6,7 @@
     <thead>
     <tr>
         <th class="code"></th>
-        <g:if test="${outcomeType == 'mid'}">
-            <th class="outcome">Medium-term outcome statement/s</th>
-        </g:if>
-        <g:else>
-            <th class="outcome">Short-term outcome statement/s</th>
-        </g:else>
+        <th class="outcome">${subtitle ?: ""} </th>
         <th class="investment-priority">Investment priority</th>
         <th class="program-outcome">Related program outcome/s</th>
     </tr>

diff --git a/grails-app/views/project/meriPlanChanges/_projectMethodology.gsp b/grails-app/views/project/meriPlanChanges/_projectMethodology.gsp
@@ -4,7 +4,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project delivery assumptions</th>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
     </tr>
     </thead>
     <tbody>

diff --git a/grails-app/views/project/meriPlanChanges/_projectReview.gsp b/grails-app/views/project/meriPlanChanges/_projectReview.gsp
@@ -1,7 +1,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project review, improvement and evaluation methodology and approach</th>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
     </tr>
     </thead>
     <tbody>

diff --git a/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp b/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp
@@ -4,7 +4,7 @@
     <thead>
 
     <tr>
-        <th class="outcome-priority">Additional outcome/s</th>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
         <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
     </tr>
     </thead>

diff --git a/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp b/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp
@@ -5,11 +5,11 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="baseline">Monitoring methodology</th>
+        <th class="baseline">${indicatorHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Project service / Target measure/s</th>
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
         </g:if>
-        <th class="baseline-method">Monitoring method</th>
+        <th class="baseline-method">${approachHeading}</th>
         <g:if test="${extendedMonitoring}">
             <th class="monitoring-evidence">Evidence to be retained</th>
         </g:if>

diff --git a/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp b/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp
@@ -11,12 +11,7 @@
         <g:else>
             <th class="code"></th>
         </g:else>
-        <g:if test="${outcomeType == 'mid'}">
-            <th class="outcome">Medium-term outcome statement/s</th>
-        </g:if>
-        <g:else>
-            <th class="outcome">Short-term outcome statement/s</th>
-        </g:else>
+        <th class="outcome">${subtitle ?: ""} </th>
         <g:if test="${extendedOutcomes}">
             <th class="investment-priority">Investment priority</th>
             <th class="program-outcome">Related program outcome/s</th>

diff --git a/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp b/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp
@@ -4,7 +4,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project delivery assumptions</th>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
     </tr>
     </thead>
     <tbody>

diff --git a/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp b/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp
@@ -1,7 +1,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project review, improvement and evaluation methodology and approach</th>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
     </tr>
     </thead>
     <tbody>