Skip to content

Commit

Permalink
Merge pull request #856 from DFE-Digital/cpdnpq-1229-clerify-provider…
Browse files Browse the repository at this point in the history 
…-status-field

Managed provider details statuses and course passed, failed status
  • Loading branch information
@javier-npq
javier-npq authored Aug 30, 2023
2 parents 0517815 + a872a4c commit 8c246b4
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 63 deletions.
63 changes: 50 additions & 13 deletions app/views/accounts/_application_table.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,55 @@
<% current_user.applications.where(course: course).each do |application| %>
<%= govuk_summary_card(title: "#{title_embedded_course_name(course)}") do |card| %>
<% card.with_action { govuk_link_to("More details", accounts_user_registration_path(application)) } %>
<dl class="govuk-summary-list">
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Registration submitted
</dt>
<dd class="govuk-summary-list__value">
<%= application.created_at.to_date.to_s(:govuk_short) %>
</dd>
</div>

<%= govuk_summary_card(title: "#{title_embedded_course_name(course)}") do |card|
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Provider
</dt>
<dd class="govuk-summary-list__value">
<%= application.lead_provider.name %>
</dd>
</div>

card.with_action { govuk_link_to("More details", accounts_user_registration_path(application)) }
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Provider application
</dt>
<dd class="govuk-summary-list__value">
<% 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 %>
</dd>
</div>

card.with_summary_list(rows: [
{
key: { text: "Registration submitted" },
value: { text: application.created_at.to_date.to_s(:govuk_short) }
},
{
key: { text: "Provider" },
value: { text: application.lead_provider.name },
},
])
end %>
<% 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
</dt>
<dd class="govuk-summary-list__value">
<% if application.participant_outcome_state.capitalize == "Passed" %>
<strong class="govuk-tag govuk-tag--green">PASSED</strong>
<% elsif application.participant_outcome_state.capitalize == "Failed" %>
<strong class="govuk-tag govuk-tag--red">NOT PASSED</strong>
<% end %>
</dd>
</div>
<% end %>
</dl>
<% end %>
<% end %>
68 changes: 56 additions & 12 deletions app/views/accounts/_course_details.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,57 @@
<%= govuk_summary_card(title: "Course details") do |card|
<div class="govuk-summary-card">
<div class="govuk-summary-card__title-wrapper">
<h2 class="govuk-summary-card__title">Course details</h2>
</div>
<div class="govuk-summary-card__content">
<dl class="govuk-summary-list">
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Course
</dt>
<dd class="govuk-summary-list__value">
<%= title_embedded_course_name(application.course) %>
</dd>
</div>

card.with_summary_list(rows: [
{
key: { text: "Course" },
value: { text: title_embedded_course_name(application.course) }
},
{
key: { text: "Provider" },
value: { text: application.lead_provider.name }
},
])
end %>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Provider
</dt>
<dd class="govuk-summary-list__value">
<%= application.lead_provider.name %>
</dd>
</div>

<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Provider application
</dt>
<dd class="govuk-summary-list__value">
<% 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 %>
</dd>
</div>

<% 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
</dt>
<dd class="govuk-summary-list__value">
<% if application.participant_outcome_state.capitalize == "Passed" %>
<strong class="govuk-tag govuk-tag--green">PASSED</strong>
<% elsif application.participant_outcome_state.capitalize == "Failed" %>
<strong class="govuk-tag govuk-tag--red">NOT PASSED</strong>
<% end %>
</dd>
</div>
<% end %>
</dl>
</div>
</div>
46 changes: 23 additions & 23 deletions app/views/accounts/_funding_details.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@
<% end %>

<div class="govuk-summary-card">
<div class="govuk-summary-card__title-wrapper">
<h2 class="govuk-summary-card__title">Funding details</h2>
</div>
<div class="govuk-summary-card__content">
<dl class="govuk-summary-list">
<div class="govuk-summary-card__title-wrapper">
<h2 class="govuk-summary-card__title">Funding details</h2>
</div>
<div class="govuk-summary-card__content">
<dl class="govuk-summary-list">

<% if application.targeted_delivery_funding_eligibility %>
<% scholarship_funding_row(application) %>
<% if application.targeted_delivery_funding_eligibility %>
<% scholarship_funding_row(application) %>

<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Targeted support funding
</dt>
<dd class="govuk-summary-list__value">
<strong class="govuk-tag govuk-tag--green">ELIGIBLE</strong>
<p class="govuk-!-margin-top-2 govuk-!-margin-bottom-0"><%= targeted_support_funding(application) %></p>
</dd>
</div>
<% else %>
<% scholarship_funding_row(application) %>
<% end %>
</dl>
</div>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
Targeted support funding
</dt>
<dd class="govuk-summary-list__value">
<strong class="govuk-tag govuk-tag--green">ELIGIBLE</strong>
<p class="govuk-!-margin-top-2 govuk-!-margin-bottom-0"><%= targeted_support_funding(application) %></p>
</dd>
</div>
<% else %>
<% scholarship_funding_row(application) %>
<% end %>
</dl>
</div>
</div>
13 changes: 0 additions & 13 deletions app/views/accounts/_provider_details.html.erb
View file

This file was deleted.

4 changes: 3 additions & 1 deletion app/views/accounts/user_registrations/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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/provider_details", application: @application %>
<%= render "accounts/funding_details", application: @application %>
5 changes: 4 additions & 1 deletion config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@ en:
targeted_funding_eligibility: "Your workplace will receive £%{funding_amount} to support you to do this NPQ."
ineligible_message: "This means that you would need to pay for the course another way."
not_eligible_ehco: "You’re not eligible for scholarship funding for %{course_name}."


provider_details:
pending_status: "You need to apply separately with your training provider, if you have not done so already."

helpers:
title:
registration_wizard:
Expand Down

0 comments on commit 8c246b4

Please sign in to comment.