Merge pull request #687 from hmrc/PODS-9621

PODS-9621 - Add content for if no AFT returns present
hmrc · Oct 23, 2024 · 6062b23 · 6062b23
2 parents 5349704 + 65bb10d
commit 6062b23
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/app/controllers/AFTOverviewController.scala b/app/controllers/AFTOverviewController.scala
@@ -20,7 +20,7 @@ import config.FrontendAppConfig
 import controllers.AFTOverviewController._
 import controllers.actions.{AllowAccessActionProviderForIdentifierRequest, IdentifierAction}
 import helpers.FormatHelper.formatCurrencyAmountAsString
-import models.AFTQuarter.{formatForDisplayOneYear, monthDayStringFormat}
+import models.AFTQuarter.formatForDisplayOneYear
 import models.financialStatement.PaymentOrChargeType.{AccountingForTaxCharges, EventReportingCharges, getPaymentOrChargeType}
 import models.financialStatement.{PaymentOrChargeType, SchemeFSDetail}
 import models.requests.IdentifierRequest

diff --git a/conf/messages.en b/conf/messages.en
@@ -1648,5 +1648,7 @@ aftOverview.totalOutstandingNotAvailable    = The amount outstanding is not curr
 aftOverview.viewOutstanding                 = View outstanding payments and charges
 aftOverview.financialOverview               = View your financial overview
 aftOverview.inProgress                      = In progress
+aftOverview.noReportsInProgress             = There are no AFT returns in progress.
 aftOverview.pastAftReturns                  = Past AFT returns
+aftOverview.noPastReturns                   = There are no past AFT returns.
 aftOverview.allPastAftReturns               = View or change all past AFT returns
diff --git a/conf/views/aftOverview.njk b/conf/views/aftOverview.njk
@@ -54,12 +54,13 @@
         </p>
         <hr>
 
-        {% if viewModel.quartersInProgress.length > 0 %}
+
 
             <h2 class="govuk-heading-l govuk-!-margin-top-6">
                 {{ messages("aftOverview.inProgress") }}
             </h2>
 
+        {% if viewModel.quartersInProgress.length > 0 %}
             <ul class="govuk-list">
                 {% for tuple in viewModel.quartersInProgress %}
                     <li class="govuk-body">
@@ -70,13 +71,19 @@
                 {% endfor %}
             </ul>
             <hr>
+        {% else %}
+            <p class="govuk-body">
+                {{ messages("aftOverview.noReportsInProgress") }}
+            </p>
+            <br>
+            <hr>
         {% endif %}
 
-        {% if viewModel.pastYearsAndQuarters.length > 0 %}
             <h2 class="govuk-heading-l govuk-!-margin-top-6">
                 {{ messages("aftOverview.pastAftReturns") }}
             </h2>
 
+        {% if viewModel.pastYearsAndQuarters.length > 0 %}
             {% for tuple in viewModel.pastYearsAndQuarters %}
                 <h3 class="govuk-heading-s">
                     {{ tuple[0] }}
@@ -93,6 +100,10 @@
                 </ul>
             {% endfor %}
 
+        {% else %}
+            <p class="govuk-body">
+                {{ messages("aftOverview.noPastReturns") }}
+            </p>
         {% endif %}
 
         <br>