Skip to content

Commit

Permalink
Merge branch 'master' into P2-2241_Remove_apar_summary
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisJWoodcock
ChrisJWoodcock committed Dec 9, 2024
2 parents f2d349c + e87af4f commit 1d16f6a
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 80 deletions.
6 changes: 3 additions & 3 deletions src/SFA.DAS.AssessorService.Api.Types/Consts/EmailTemplateNames.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ public class EmailTemplateNames
public const string ApplyEPAOInitialSubmission = "ApplyEPAOInitialSubmission";
public const string ApplyEPAOStandardSubmission = "ApplyEPAOStandardSubmission";
public const string ApplyEPAOAlertSubmission = "ApplyEPAOAlertSubmission";
public const string WithdrawalEPAOSubmission = "WithdrawalEPAOSubmission";
public const string EPAOWithdrawalFeedbackNotification = "EPAOWithdrawalFeedbackNotification";
public const string EPAOWithdrawalSubmission = "EPAOWithdrawalSubmission";
public const string EPAOWithdrawalFeedback = "EPAOWithdrawalFeedback";
public const string EPAOCancelApplication = "EPAOCancelApplication";
public const string EPAOStandardWithdrawalApproval = "EPAOStandardWithdrawalApproval";
public const string EPAORegisterWithdrawalApproval = "EPAORegisterWithdrawalApproval";
public const string EPAOOrganisationWithdrawalApproval = "EPAOOrganisationWithdrawalApproval";

/// <summary>
/// Requires tokens: { contactname }
Expand Down
4 changes: 2 additions & 2 deletions ...DAS.AssessorService.Application/Handlers/Apply/Review/ReturnApplicationSequenceHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ await _mediator.Send(new SendEmailRequest(contactToNotify.Email, emailTemplate,
if (lastSubmission != null)
{
var contactToNotify = await _contactQueryRepository.GetContactById(lastSubmission.SubmittedBy);
var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.EPAOWithdrawalFeedbackNotification);
var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.EPAOWithdrawalFeedback);

await _mediator.Send(new SendEmailRequest(contactToNotify.Email, emailTemplate,
new
Expand All @@ -131,7 +131,7 @@ await _mediator.Send(new SendEmailRequest(contactToNotify.Email, emailTemplate,
{
var contactToNotify = await _contactQueryRepository.GetContactById(lastSubmission.SubmittedBy);

var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.EPAORegisterWithdrawalApproval);
var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.EPAOOrganisationWithdrawalApproval);
await _mediator.Send(new SendEmailRequest(contactToNotify.Email, emailTemplate,
new { ServiceName = SERVICE_NAME, ServiceTeam = SERVICE_TEAM, Contact = contactToNotify.DisplayName, LoginLink = loginLink }), cancellationToken);
}
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Application/Handlers/Apply/SubmitApplicationSequenceHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private async Task NotifyContact(Domain.Entities.Contact contactToNotify, Domain
}
else if (sequenceNo == ApplyConst.ORGANISATION_WITHDRAWAL_SEQUENCE_NO || sequenceNo == ApplyConst.STANDARD_WITHDRAWAL_SEQUENCE_NO)
{
var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.WithdrawalEPAOSubmission);
var emailTemplate = await _eMailTemplateQueryRepository.GetEmailTemplate(EmailTemplateNames.EPAOWithdrawalSubmission);
await _mediator.Send(new SendEmailRequest(email, emailTemplate, new { contactname, reference }), cancellationToken);
}

Expand Down
6 changes: 3 additions & 3 deletions ...ssessorService.Database/PostDeploymentScripts/LookupData/EmailTemplatesInsertOrUpdate.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ INSERT INTO #EmailTemplates VALUES('DA7603D3-87B1-4040-B272-EDE806538BE8', 'EPAO
INSERT INTO #EmailTemplates VALUES('CA7C8BE2-A6F1-479B-A77D-F0614F7E8924', 'PrintAssessorCoverLetters', '5b171b91-d406-402a-a651-081cce820acb')
INSERT INTO #EmailTemplates VALUES('F5A787F4-0276-4C23-A125-F6D4C1AE0650', 'EPAOUserApproveConfirm', '68506adb-7e17-45c9-ad54-45ef9a2cad15')
INSERT INTO #EmailTemplates VALUES('76DE4F5E-0B82-4729-AD80-DE0C0F54FEEF', 'PrintSasToken', '83b79354-4d2b-476d-b02d-cdb9c016911e')
INSERT INTO #EmailTemplates VALUES('01A8A975-3E19-4B13-A45E-8BA4868957BA', 'WithdrawalEPAOSubmission', '629451a3-ae87-4213-b93a-f8f5c8828ff3')
INSERT INTO #EmailTemplates VALUES('A38B1DF3-F990-4D8B-A0D4-2272449CC27A', 'EPAOWithdrawalFeedbackNotification', 'b0c12344-62d7-4435-aa36-299307f5f8d8')
INSERT INTO #EmailTemplates VALUES('01A8A975-3E19-4B13-A45E-8BA4868957BA', 'EPAOWithdrawalSubmission', '629451a3-ae87-4213-b93a-f8f5c8828ff3')
INSERT INTO #EmailTemplates VALUES('A38B1DF3-F990-4D8B-A0D4-2272449CC27A', 'EPAOWithdrawalFeedback', 'b0c12344-62d7-4435-aa36-299307f5f8d8')
INSERT INTO #EmailTemplates VALUES('706A53FF-BA54-448C-A994-89B953A15BDB', 'EPAOCancelApplication', 'dd5fd888-8552-4855-8411-b34f0d1f82f4')
INSERT INTO #EmailTemplates VALUES('037E5136-83F2-46BF-A4CC-A3753DF69769', 'EPAOStandardWithdrawalApproval', '30ea8a72-ed58-4e52-8322-9767f94265bd')
INSERT INTO #EmailTemplates VALUES('F1D63871-8DF3-4595-9454-C129E07CC580', 'EPAORegisterWithdrawalApproval', '1872e2bd-cf13-42c7-a120-5829c36d5afc')
INSERT INTO #EmailTemplates VALUES('F1D63871-8DF3-4595-9454-C129E07CC580', 'EPAOOrganisationWithdrawalApproval', '1872e2bd-cf13-42c7-a120-5829c36d5afc')
INSERT INTO #EmailTemplates VALUES('E3FA3DD7-81D5-48A8-B96A-A9D941EEEBF4', 'ApplyEPAOStandardOptin', '68a076ed-1240-41fa-af90-d4b4c85a5eeb')
INSERT INTO #EMailTemplates VALUES('15dabcf7-2542-4c94-8cc4-3f15b2afe84f', 'MergeConfirmationForPrimaryEpao', '972ebfa7-c996-45fa-b2e9-63a73ddd9049')
INSERT INTO #EMailTemplates VALUES('7caf6bf6-2e0a-4a84-b475-75fe45eedd26', 'MergeConfirmationForSecondaryEpao', 'ee2c3edd-fa8c-4676-a7fc-92036f8bc80a')
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Settings/IWebConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public interface IWebConfiguration
string ZenDeskSnippetKey { get; set; }
string ZenDeskSectionId { get; set; }
string ZenDeskCobrowsingSnippetKey { get; set; }

string FindAnEPAOUrl { get; set; }
}
}
1 change: 1 addition & 0 deletions src/SFA.DAS.AssessorService.Settings/WebConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ public class WebConfiguration : IWebConfiguration
[JsonRequired] public string ZenDeskSectionId { get; set; }
[JsonRequired] public string ZenDeskCobrowsingSnippetKey { get; set; }

[JsonRequired] public string FindAnEPAOUrl { get; set; }
}
}
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Controllers/Apply/ApplicationController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ private static string BuildPageContext(ApplicationResponse application, QnA.Api.
}
else if (sequence.SequenceNo == ApplyConst.ORGANISATION_WITHDRAWAL_SEQUENCE_NO)
{
pageContext = "Withdrawing from register";
pageContext = "Withdrawing from all standards";
}
return pageContext;
}
Expand Down
1 change: 1 addition & 0 deletions src/SFA.DAS.AssessorService.Web/Controllers/OrganisationController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public async Task<IActionResult> OrganisationDetails()
var organisation = await _organisationsApiClient.GetEpaOrganisation(epaoid);
var viewModel = MapOrganisationModel(organisation);
viewModel.ExternalApiSubscriptions = await GetExternalApiSubscriptions(_webConfiguration.AzureApiAuthentication.ProductId, ukprn);
viewModel.FindAnEPAOUrl = _webConfiguration.FindAnEPAOUrl;

var userId = _contextAccessor.HttpContext.User.FindFirst("UserId").Value;
var userPrivileges = await _contactsApiClient.GetContactPrivileges(Guid.Parse(userId));
Expand Down
1 change: 1 addition & 0 deletions src/SFA.DAS.AssessorService.Web/ViewModels/Organisation/ViewAndEditOrganisationViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class ViewAndEditOrganisationViewModel
public string ActionChoice { get; set; }
public List<AzureSubscription> ExternalApiSubscriptions { get; set; }
public string SubscriptionId { get; set; }
public string FindAnEPAOUrl { get; set; }
}
}

2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Application/FeedbackIntro.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@if (Model.IsOrganisationWithdrawalApplication)
{
<p class="govuk-body">We've reviewed your withdrawal request for withdrawing from the register of end-point assessment organisations and need more information.</p>
<p class="govuk-body">We've reviewed your withdrawal notification and need more information.</p>

<p class="govuk-body">We've provided feedback on the answers we need more information about.</p>

Expand Down
8 changes: 2 additions & 6 deletions src/SFA.DAS.AssessorService.Web/Views/Application/Submitted.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

@if (Model.IsOrganisationWithdrawalApplication)
{
<p class="govuk-panel__body">You have requested to withdraw from the apprenticeship provider assessment register.</p>
<p class="govuk-panel__body">You've requested to withdraw from all standards.</p>
}
else if(Model.IsStandardWithdrawalApplication)
{
Expand All @@ -47,7 +47,7 @@
</div>

<p class="govuk-body">
We have sent you a confirmation email.
We've sent you a confirmation email.
</p>

<h2 class="govuk-heading-m govuk-!-margin-top-6">
Expand All @@ -64,10 +64,6 @@
<p class="govuk-body">
You must not agree to assess any new learners while we review your withdrawal.
</p>

<p class="govuk-body">
Once you withdraw, your organisation cannot reapply to join the register for at least 12 months.
</p>
}


Expand Down
20 changes: 4 additions & 16 deletions src/SFA.DAS.AssessorService.Web/Views/ApplyForWithdrawal/Index.cshtml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model bool
@{
ViewData["Title"] = "Withdraw from a standard or the register";
ViewData["Title"] = "Withdraw from standards";
Layout = "_DashboardLayout";
}
<a asp-action="Index" asp-controller="Dashboard" class="govuk-back-link">Back</a>
Expand All @@ -9,25 +9,17 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">
Withdraw from a standard or the register
Withdraw from standards
</h1>

<p class="govuk-body">
End-point assessment organisations (EPAOs) must withdraw if they no longer want to assess a specific standard or be on the Apprenticeship provider assessment register.
End-point assessment organisations (EPAOs) must withdraw if they no longer want to assess a specific standard or all standards.
</p>

<p class="govuk-body">
We need you to provide some information before you withdraw, so that we can work with you to support any learners.
</p>

<p class="govuk-body">
All withdrawals notifications must comply with the <a class="govuk-link" href="https://www.gov.uk/government/publications/apprenticeship-provider-and-assessment-register-conditions-of-acceptance/apar-conditions-of-acceptance#conditions-of-acceptance-for-end-point-assessment-organisations" rel="noreferrer noopener" target="_blank">APAR conditions of acceptance (opens in a new tab or window)</a>.
</p>

<p class="govuk-inset-text">
Once you withdraw, your organisation cannot reapply to join the register or assess that standard for at least 12 months.
</p>

<h2 class="govuk-heading-m">
What you'll need
</h2>
Expand All @@ -36,17 +28,13 @@
</p>

<ul class="govuk-list govuk-list--bullet">
<li>if applicable, the standard you wish to withdraw from</li>
<li>the standards you wish to withdraw from</li>
<li>why you want to withdraw</li>
<li>whether you’ll complete your registered learners’ assessments</li>
<li>how you’ll communicate your market exit to customers</li>
<li>the date that you want to withdraw</li>
</ul>

<p class="govuk-body">
You must tell ESFA that you want to withdraw before you tell your customers.
</p>

@if (Model)
{
<a asp-action="TypeOfWithdrawal" asp-controller="ApplyForWithdrawal" class="govuk-button">
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/ApplyForWithdrawal/TypeOfWithdrawal.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
sfa-validation-for="TypeOfWithdrawal"
sfa-validationerror-class="govuk-input--error">
<label class="govuk-label govuk-radios__label" for="TypeOfWithdrawal-organisation">
The apprenticeship provider and assessment register
Assessing all standards
</label>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/SFA.DAS.AssessorService.Web/Views/ApplyForWithdrawal/WithdrawalApplications.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<td class="govuk-table__cell">
@if (application.ApplyData.RequiredSequences.Contains(ApplyConst.ORGANISATION_WITHDRAWAL_SEQUENCE_NO))
{
<text>Register</text>
<text>All standards</text>
}
else if (application.ApplyData.RequiredSequences.Contains(ApplyConst.STANDARD_WITHDRAWAL_SEQUENCE_NO))
{
Expand All @@ -45,7 +45,7 @@
<td class="govuk-table__cell">
@if (application.ApplyData.RequiredSequences.Contains(ApplyConst.ORGANISATION_WITHDRAWAL_SEQUENCE_NO))
{
<text>Not applicable</text>
<text>All standards</text>
}
else if (application.ApplyData.RequiredSequences.Contains(ApplyConst.STANDARD_WITHDRAWAL_SEQUENCE_NO))
{
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Dashboard/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<a class="govuk-link" asp-controller="Organisation" asp-action="OrganisationDetails" asp-fragment="api-subscription">API subscription</a>
</li>
<li>
<a class="govuk-link" asp-controller="ApplyForWithdrawal" asp-action="Index">Withdraw from the register</a>
<a class="govuk-link" asp-controller="ApplyForWithdrawal" asp-action="Index">Withdraw from all standards</a>
</li>
</ul>
</div>
Expand Down
27 changes: 8 additions & 19 deletions src/SFA.DAS.AssessorService.Web/Views/Home/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,20 @@
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">Use this service if you're an end-point assessor and want to assess apprenticeships. You need to be part of an organisation on our Apprenticeship provider and assessment register (APAR).</p>

<p class="govuk-body">You can use this service to:</p>
<p class="govuk-body">If you're an end-point assessor, you can use this service to:</p>

<ul class="govuk-list govuk-list--bullet">
<li>view the standards and versions you are assessing</li>
<li>see upcoming assessments in your pipeline</li>
<li>record assessments and request certificates</li>
<li>apply for new standards or versions</li>
<li>add new standards or versions</li>
</ul>

<p class="govuk-body">
You’ll need a GOV.UK One Login to set up or access an account. You can create one in the service using a work email address.
</p>

</div>
<div class="govuk-grid-column-one-third">
<hr/>
<h2 class="govuk-heading-s govuk-!-font-size-14">Related content</h2>
<p class="govuk-body-s"><a class="govuk-link" href="https://www.gov.uk/guidance/joining-the-apar-as-an-end-point-assessment-organisation" rel="noreferrer noopener" target="_blank">How to join Apprenticeship provider and assessment register (APAR) as an end-point assessment organisation<span class="govuk-visually-hidden">(opens in new tab)</span></a></p>
<p class="govuk-body-s"><a class="govuk-link" href="https://www.gov.uk/government/publications/apprenticeship-provider-and-assessment-register-conditions-of-acceptance" rel="noreferrer noopener" target="_blank">Conditions of acceptance for APAR<span class="govuk-visually-hidden">(opens in new tab)</span></a></p>

</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
Expand All @@ -59,15 +50,13 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-m">Before you start</h2>
<p class="govuk-body">To use this service you need to be on the Apprenticeship provider and assessment register (APAR).</p>

<h3 class="govuk-heading-s">If you are already registered on APAR</h3>
<p class="govuk-body"><a class="govuk-link" asp-action="@actionName" asp-controller="Account">Create an account</a> and select the organisation you belong to.</p>
<h3 class="govuk-heading-s">To register on APAR</h3>
<p class="govuk-body">If you've recently been approved by a regulator like Ofqual and want to join APAR, contact our helpdesk.</p>
<p class="govuk-body">If your organisation does not have an existing account, you'll need to join the Apprenticeship assessment service.</p>

<p class="govuk-body">Email: <a class="govuk-link" href="mailto:[email protected]">helpdesk@manage-apprenticeships.service.gov.uk</a></p>
<p class="govuk-body">Telephone: 08000 150 600</p>
<p class="govuk-body">Contact our helpdesk:</p>
<ul class="govuk-list govuk-list--bullet">
<li>email <a class="govuk-link" href="mailto:[email protected]">helpdesk@manage-apprenticeships.service.gov.uk</a></li>
<li>phone 08000 150 600</li>
</ul>
</div>
</div>
</main>
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Organisation/ChangeAddress.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<h1 class="govuk-heading-xl">@viewTitle</h1>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">The main contact address for this organisation. This information appears on the register.</p>
<p class="govuk-body">The main contact address for this organisation.</p>

<form asp-controller="Organisation" asp-action="ChangeAddress">
<div id="addressLookupWrapper" class="hide-nojs form-group disabled">
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Organisation/ChangePhoneNumber.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<h1 class="govuk-heading-xl">@viewTitle</h1>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">The main contact number for this organisation. This information appears on the register.</p>
<p class="govuk-body">The main contact number for this organisation.</p>

<form asp-controller="Organisation" asp-action="ChangePhoneNumber">
<div class="govuk-form-group">
Expand Down
1 change: 0 additions & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Organisation/ChangePhoneNumberConfirm.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
</div>
</dl>
</div>
<p class="govuk-body">Confirm the new contact number for this organisation. This number will apppear on the register and may be called.</p>
<button class="govuk-button" type="submit" name="ActionChoice" value="Confirm">Confirm</button>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/SFA.DAS.AssessorService.Web/Views/Organisation/ChangeWebsite.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<h1 class="govuk-heading-xl">@viewTitle</h1>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">The website address for this organisation. This information appears on the register.</p>
<p class="govuk-body">The website address for this organisation.</p>

<form asp-controller="Organisation" asp-action="ChangeWebsite">
<div class="govuk-form-group">
Expand Down
Loading

0 comments on commit 1d16f6a

Please sign in to comment.