-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2211 from SkillsFundingAgency/CON-3951---Revamped…
…-legal-agreements-page CON-3951 - Revamped legal agreements page
- Loading branch information
Showing
12 changed files
with
226 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/SFA.DAS.EmployerAccounts.Web/ViewModels/OrganisationAgreementsViewModel.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| using System.Collections.Generic; | ||
| using System.Collections.ObjectModel; | ||
| using System.Linq; | ||
|
|
||
| namespace SFA.DAS.EmployerAccounts.Web.ViewModels | ||
| { | ||
| public class OrganisationAgreementsViewModel | ||
| { | ||
| public OrganisationAgreementsViewModel() | ||
| { | ||
| Agreements = new Collection<OrganisationAgreementViewModel>(); | ||
| } | ||
|
|
||
| public ICollection<OrganisationAgreementViewModel> Agreements { get; set; } | ||
|
|
||
| public string AgreementId { get; set; } | ||
|
|
||
| public bool HasSignedAgreements => Agreements.Any(agreement => agreement.SignedDate != null); | ||
| public bool HasUnsignedAgreement => Agreements.Any(agreement => agreement.SignedDate == null); | ||
|
|
||
| public OrganisationAgreementViewModel UnsignedAgreement => Agreements.Single(agreement => agreement.SignedDate == null); | ||
|
|
||
| public IEnumerable<OrganisationAgreementViewModel> SignedAgreements => Agreements.Where(agreement => agreement.SignedDate != null); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/_AcceptedAgreement.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| @using SFA.DAS.EmployerAccounts.Web.Helpers | ||
| @model SFA.DAS.EmployerAccounts.Web.ViewModels.OrganisationAgreementViewModel | ||
|
|
||
| <div class="govuk-accordion__section "> | ||
| <div class="govuk-accordion__section-header"> | ||
| <h2 class="govuk-accordion__section-heading"> | ||
| <span class="govuk-accordion__section-button" id="[email protected]"> | ||
| @Model.Template.PublishedInfo | ||
| </span> | ||
| </h2> | ||
| <strong class="govuk-tag govuk-tag--green govuk-!-margin-top-3"> | ||
| Accepted on @Model.SignedDateText | ||
| </strong> | ||
| </div> | ||
| <div id="[email protected]" class="govuk-accordion__section-content" aria-labelledby="[email protected]"> | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <span class="govuk-caption-m"> | ||
| @Model.Template.PublishedInfo | ||
| </span> | ||
| <h3 class="govuk-heading-m"> | ||
| Agreement between @Model.AccountLegalEntity.Name and <abbr>ESFA</abbr> | ||
| </h3> | ||
| <div class="govuk-inset-text"> | ||
| @ViewData[ControllerConstants.InsetText] | ||
| </div> | ||
| <span class="govuk-caption-m"> | ||
| This agreement allows you to spend funds for <b>@Model.AccountLegalEntity.Name</b>. | ||
| </span> | ||
| <hr class=" govuk-!-margin-top-9 govuk-!-margin-bottom-9"> | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-one-third"> | ||
| <p class="govuk-body"> | ||
| <b>Parties</b> | ||
| </p> | ||
| </div> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <p class="govuk-body"> | ||
| <i> | ||
| <b>The Secretary of State for Education acting through the Education and Skills Funding Agency an executive agency of the Department for Education</b><br> | ||
| Cheylesmore House<br> | ||
| Quinton Road<br> | ||
| Coventry<br> | ||
| CV1 2WT | ||
| </i> | ||
| </p> | ||
| @if (Model.OrganisationLookupPossible) | ||
| { | ||
| <i> | ||
| <p class="govuk-body"> | ||
| <b>BARBERRY COVENTRY LIMITED</b><br> | ||
| @Html.CommaSeperatedAddressToHtml(@Model.AccountLegalEntity.Address) | ||
|
|
||
| </p> | ||
| </i> | ||
| <p> | ||
| <i> | ||
| <a href="@Url.Action("review", "organisation", new | ||
| { | ||
| Model.HashedAccountId, | ||
| Model.HashedAgreementId, | ||
| Model.AccountLegalEntityPublicHashedId | ||
| })" class="govuk-link govuk-link--no-visited-state govuk-!-font-size-19">Update these details</a> | ||
| </i> | ||
| </p> | ||
| } | ||
| </div> | ||
| </div> | ||
| <div class="govuk-grid-row govuk-!-margin-top-9 govuk-!-margin-bottom-9"> | ||
| <div class="govuk-grid-column-one-third"> | ||
| <p class="govuk-body"> | ||
| <b>Document</b> | ||
| </p> | ||
| </div> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-one-third"> | ||
| <a href="@Url.EmployerAccountsAction($"agreements/{Model.HashedAgreementId}/view")" aria-hidden="true"> | ||
| <img src="/dist/images/pub-cover-html.png" alt="."> | ||
| </a> | ||
| </div> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <a href="@Url.EmployerAccountsAction($"agreements/{Model.HashedAgreementId}/view")" class="govuk-link">Your <abbr>ESFA</abbr> agreement</a> | ||
| <p class="govuk-body">HTML</p> | ||
| <p></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <hr class=" govuk-!-margin-top-9 govuk-!-margin-bottom-9"> | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-full"> | ||
| <h3 class="govuk-heading-m"> | ||
| This agreement has been accepted | ||
| </h3> | ||
| <table class="govuk-table"> | ||
| <thead class="govuk-table__head"> | ||
| <tr class="govuk-table__row"> | ||
| <th scope="col" class="govuk-table__header">Accepted by:</th> | ||
| <td class="govuk-table__cell">@Model.SignedByName</td> | ||
| </tr> | ||
| </thead> | ||
| <tbody class="govuk-table__body"> | ||
| <tr class="govuk-table__row"> | ||
| <th scope="row" class="govuk-table__header">On behalf of:</th> | ||
| <td class="govuk-table__cell">@Model.AccountLegalEntity.Name</td> | ||
| </tr> | ||
| <tr class="govuk-table__row"> | ||
| <th scope="row" class="govuk-table__header">Address: </th> | ||
| <td class="govuk-table__cell">@Model.AccountLegalEntity.Address</td> | ||
| </tr> | ||
| <tr class="govuk-table__row"> | ||
| <th scope="row" class="govuk-table__header">Accepted on:</th> | ||
| <td class="govuk-table__cell">@Model.SignedDateText</td> | ||
| </tr> | ||
| <tr class="govuk-table__row"> | ||
| <th scope="row" class="govuk-table__header">Agreement ID:</th> | ||
| <td class="govuk-table__cell">@Model.AccountLegalEntityPublicHashedId</td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
Oops, something went wrong.