update provider details and course status disply conditions

DFE-Digital · Aug 29, 2023 · a872a4c · a872a4c
1 parent 963c352
commit a872a4c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/app/views/accounts/_application_table.html.erb b/app/views/accounts/_application_table.html.erb
@@ -22,26 +22,24 @@
 
       <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">
-          Provider Application
+          Provider application
         </dt>
         <dd class="govuk-summary-list__value">
-          <% if application.lead_provider_approval_status %>
-            <% if application.lead_provider_approval_status.capitalize == "Pending" %>
+            <% if application.lead_provider_approval_status.blank? || application.lead_provider_approval_status.capitalize == "Pending" %>
               <strong class="govuk-tag govuk-tag--yellow">APPLY WITH PROVIDER</strong>
               <p class="govuk-!-margin-top-2 govuk-!-margin-bottom-0"><%= I18n.t("provider_details.pending_status")  %></p>
             <% elsif application.lead_provider_approval_status.capitalize == "Accepted" %>
               <strong class="govuk-tag govuk-tag--green">SUCCESSFUL</strong>
             <% elsif application.lead_provider_approval_status.capitalize == "Rejected" %>
               <strong class="govuk-tag govuk-tag--red">UNSUCCESSFUL</strong>
             <% end %>
-          <% end %>
         </dd>
       </div>
 
-      <% if application.participant_outcome_state && application.lead_provider_approval_status.capitalize != "Rejected" %>
+      <% if application.participant_outcome_state.present? && application.lead_provider_approval_status.capitalize == "Accepted" %>
         <div class="govuk-summary-list__row">
           <dt class="govuk-summary-list__key">
-            Course Status
+            Course status
           </dt>
           <dd class="govuk-summary-list__value">
               <% if application.participant_outcome_state.capitalize == "Passed" %>

diff --git a/app/views/accounts/_course_details.html.erb b/app/views/accounts/_course_details.html.erb
@@ -24,26 +24,24 @@
 
       <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">
-          Provider Application
+          Provider application
         </dt>
         <dd class="govuk-summary-list__value">
-          <% if application.lead_provider_approval_status %>
-            <% if application.lead_provider_approval_status.capitalize == "Pending" %>
+            <% if application.lead_provider_approval_status.blank? || application.lead_provider_approval_status&.capitalize == "Pending" %>
               <strong class="govuk-tag govuk-tag--yellow">APPLY WITH PROVIDER</strong>
               <p class="govuk-!-margin-top-2 govuk-!-margin-bottom-0"><%= I18n.t("provider_details.pending_status")  %></p>
-            <% elsif application.lead_provider_approval_status.capitalize == "Accepted" %>
+            <% elsif application.lead_provider_approval_status&.capitalize == "Accepted" %>
               <strong class="govuk-tag govuk-tag--green">SUCCESSFUL</strong>
-            <% elsif application.lead_provider_approval_status.capitalize == "Rejected" %>
+            <% elsif application.lead_provider_approval_status&.capitalize == "Rejected" %>
               <strong class="govuk-tag govuk-tag--red">UNSUCCESSFUL</strong>
             <% end %>
-          <% end %>
         </dd>
       </div>
 
-      <% if application.participant_outcome_state && application.lead_provider_approval_status.capitalize != "Rejected" %>
+      <% if application.participant_outcome_state.present? && application.lead_provider_approval_status&.capitalize == "Accepted" %>
         <div class="govuk-summary-list__row">
           <dt class="govuk-summary-list__key">
-            Course Status
+            Course status
           </dt>
           <dd class="govuk-summary-list__value">
               <% if application.participant_outcome_state.capitalize == "Passed" %>
@@ -56,4 +54,4 @@
       <% end %>
     </dl>
   </div>
-</div>
+</div>
diff --git a/app/views/accounts/_funding_details.html.erb b/app/views/accounts/_funding_details.html.erb
@@ -42,4 +42,4 @@
       <% end %>
     </dl>
   </div>
-</div>
+</div>
diff --git a/app/views/accounts/user_registrations/show.html.erb b/app/views/accounts/user_registrations/show.html.erb
@@ -17,6 +17,9 @@
 <% end %>
 
 <h1 class="govuk-heading-xl"><%= title_embedded_course_name(@application.course) %> registration details</h1>
+<div class="govuk-inset-text">
+  If you need to change something about your NPQ, email <a href="mailto:[email protected]">[email protected]</a>.
+</div>
 <%= render "accounts/work_details", application: @application %>
 <%= render "accounts/course_details", application: @application %>
 <%= render "accounts/funding_details", application: @application %>