Merge pull request #207 from UKGovernmentBEIS/fix/cab-content-updates

Cab content changes

DVSRegister.CommonUtility/Constants.cs

@@ -16,20 +16,20 @@ public static class Constants
         public const string URNErrorMessage = "Invalid unique reference number. Please try again. If you are still \r\nexperiencing issues, please reach out to the digital identity and \r\nattribute service provider to confirm the correct data.";      
         public const int DaysLeftToComplete = 21;
         public const string SupplementarySchemeErrorMessage = "Select if the digital identity and attribute service provider is certified against any supplementary schemes on their certificate";
-        public const string ConformityIssueDayError = "The certificate of confirmity issue date must include a day";
-        public const string ConformityIssueMonthError = "The certificate of confirmity issue date must include a month";
-        public const string ConformityIssueYearError = "The certificate of confirmity issue date must include a year";
-        public const string ConformityIssuePastDateError = "The certificate of confirmity issue date must be today or in past";
-        public const string ConformityIssueDateInvalidError = "The certificate of confirmity issue date must be a real date";
+        public const string ConformityIssueDayError = "The certificate of conformity issue date must include a day";
+        public const string ConformityIssueMonthError = "The certificate of conformity issue date must include a month";
+        public const string ConformityIssueYearError = "The certificate of conformity issue date must include a year";
+        public const string ConformityIssuePastDateError = "The certificate of conformity issue date must be today or in the past";
+        public const string ConformityIssueDateInvalidError = "The certificate of conformity issue date must be a real date";
 
-        public const string ConformityExpiryDayError = "The certificate of confirmity expiry date must include a day";
-        public const string ConformityExpiryMonthError = "The certificate of confirmity expiry date must include a month";
-        public const string ConformityExpiryYearError = "The certificate of confirmity expiry date must include a year";
-        public const string ConformityExpiryDateError = "The certificate of confirmity expiry date must be today or in past";
-        public const string ConformityMaxExpiryDateError = "The certificate of confirmity expiry date must not be more than 2 years after the date of issue";
-        public const string ConformityExpiryDateInvalidError = "The certificate of confirmity expiry date must be a real date";
-        public const string ConformityIssueDateExpiryDateError = "The certificate of confirmity expiry date cannot be before issue date";
-        public const string ConformityExpiryPastDateError = "The certificate of confirmity expiry date must be in future";
+        public const string ConformityExpiryDayError = "The certificate of conformity expiry date must include a day";
+        public const string ConformityExpiryMonthError = "The certificate of conformity expiry date must include a month";
+        public const string ConformityExpiryYearError = "The certificate of conformity expiry date must include a year";
+        public const string ConformityExpiryDateError = "The certificate of conformity expiry date must be today or in the past";
+        public const string ConformityMaxExpiryDateError = "The certificate of conformity expiry date must not be more than 2 years and 30 days after the date of issue";
+        public const string ConformityExpiryDateInvalidError = "The certificate of conformity expiry date must be a real date";
+        public const string ConformityIssueDateExpiryDateError = "The certificate of conformity expiry date cannot be before issue date";
+        public const string ConformityExpiryPastDateError = "The certificate of conformity expiry date must be in the future";
         public const string IncorrectPassword = "Incorrect Password";
         public const string IncorrectLoginDetails = "Enter a valid email address and password. After five incorrect attempts, your account will be temporarily locked";
 

DVSRegister/Models/CAB/Provider/PrimaryContactViewModel.cs

@@ -5,10 +5,10 @@ namespace DVSRegister.Models.CAB
 {
     public class PrimaryContactViewModel
     {
-        [Required(ErrorMessage = "Enter your full name")]
+        [Required(ErrorMessage = "Enter a full name")]
         public string? PrimaryContactFullName { get; set; }
 
-        [Required(ErrorMessage = "Enter your job title")]
+        [Required(ErrorMessage = "Enter a job title")]
         public string? PrimaryContactJobTitle { get; set; }
 
         [EmailAddress(ErrorMessage = "Enter an email address in the correct format, like [email protected]")]

DVSRegister/Models/CAB/Provider/ProfileSummaryViewModel.cs

@@ -12,12 +12,12 @@ public class ProfileSummaryViewModel
         [Required(ErrorMessage = "Enter the digital identity and attribute provider's trading name")]
         public string? TradingName { get; set; }
 
-        [Required(ErrorMessage = "Select if the digital identity and attribute service provider has a Companies House or charity registration number")]
+        [Required(ErrorMessage = "Select ‘Yes’ if the provider has either a Companies House or charity registration number")]
         public bool? HasRegistrationNumber { get; set; }
 
-        [Required(ErrorMessage = "Enter a Companies House Number.")]
-        [RequiredLength(8, ErrorMessage = "Your Companies House number must be 8 characters long")]
-        [AcceptedCharacters(@"^[a-zA-Z0-9]*$", ErrorMessage = "Your Companies House number must contain only letters and numbers")]
+        [Required(ErrorMessage = "Enter a Companies House or charity registration number")]
+        [RequiredLength(8, ErrorMessage = "Your Companies House number must be 8 characters long.")]
+        [AcceptedCharacters(@"^[a-zA-Z0-9]*$", ErrorMessage = "Your Companies House number must contain only letters and numbers.")]
         public string? CompanyRegistrationNumber { get; set; }
 
         [Required(ErrorMessage = "Enter a D-U-N-S number")]

DVSRegister/Models/CAB/Provider/SecondaryContactViewModel.cs

@@ -5,10 +5,10 @@ namespace DVSRegister.Models.CAB
 {
     public class SecondaryContactViewModel
     {
-        [Required(ErrorMessage = "Enter your full name")]
+        [Required(ErrorMessage = "Enter a full name")]
         public string? SecondaryContactFullName { get; set; }
 
-        [Required(ErrorMessage = "Enter your job title")]
+        [Required(ErrorMessage = "Enter a job title")]
         public string? SecondaryContactJobTitle { get; set; }
 
         [EmailAddress(ErrorMessage = "Enter an email address in the correct format, like [email protected]")]

DVSRegister/Models/CAB/Service/IdentityProfileViewModel.cs

@@ -7,7 +7,7 @@ public class IdentityProfileViewModel
     {
         public List<IdentityProfileDto>? AvailableIdentityProfiles{ get; set; }
 
-        [EnsureMinimumCount(ErrorMessage = "Select the identity profile(s) for the digital identity and attribute service provider")]
+        [EnsureMinimumCount(ErrorMessage = "Select the identity profiles for the digital identity and attribute service provider")]
         public List<int>? SelectedIdentityProfileIds { get; set; }
         public List<IdentityProfileDto>? SelectedIdentityProfiles { get; set; }
         public bool FromSummaryPage { get; set; }

DVSRegister/Models/CAB/Service/RoleViewModel.cs

@@ -7,7 +7,7 @@ public class RoleViewModel
     {
         public List<RoleDto>? AvailableRoles{ get; set; }
 
-        [EnsureMinimumCount(ErrorMessage = "Select the role(s) from the UK digital identity and attributes trust framework that apply to the provider's service")]
+        [EnsureMinimumCount(ErrorMessage = "Select the roles from the UK digital identity and attributes trust framework that apply to the provider's service")]
         public List<int>? SelectedRoleIds { get; set; }
         public List<RoleDto>? SelectedRoles{ get; set; }
         public bool FromSummaryPage { get; set; }

DVSRegister/Views/Cab/ListProviders.cshtml

@@ -38,7 +38,7 @@
                             Label = "Search for a service provider or service",
                             Value = Model?.SearchText ?? string.Empty,
                             Class = "govuk-input",
-                            Hint = "Search for trading name, registered name or service name"
+                            Hint = "Search for registered name, trading name or service name"
                         };
                     }
 

DVSRegister/Views/Cab/ProviderProfileDetails.cshtml

@@ -61,6 +61,14 @@
                                     </dd>
                                 </div>
                             }
+                            <div class="govuk-summary-list__row">
+                                <dt class="govuk-summary-list__key">
+                                    Companies House
+                                </dt>
+                                <dd class="govuk-summary-list__value">
+                                    @TODO TBD
+                                </dd>
+                            </div>
                         </dl>
                     </div>
                 </div>
@@ -163,7 +171,7 @@
                         <dl class="govuk-summary-list">
                             <div class="govuk-summary-list__row">
                                 <dt class="govuk-summary-list__key">
-                                    Public contact email
+                                    Contact email
                                 </dt>
                                 <dd class="govuk-summary-list__value">
                                     @Model.PublicContactEmail

DVSRegister/Views/Cab/ProviderServiceDetails.cshtml

@@ -14,15 +14,15 @@
             <div class="govuk-grid-column-full">
 
                 <h1 class="govuk-heading-xl">
-                    @Model.ServiceName details
+                    Service @Model.ServiceNumber details
                 </h1>
             </div>
             <div class="govuk-grid-column-full">
                 <div class="govuk-summary-card">
                     <div class="govuk-summary-card__title-wrapper">
-                        <h2 class="govuk-summary-card__title">
-                            @Model.ServiceName details
-                        </h2>
+                        <p class="govuk-summary-card__title">
+                            Service @Model.ServiceNumber details
+                        </p>
                     </div>
                     <div class="govuk-summary-card__content">
                         <dl class="govuk-summary-list">

DVSRegister/Views/CabProvider/BeforeYouStart.cshtml

@@ -11,7 +11,7 @@
             <div class="govuk-grid-column-two-thirds">
 
 
-                <h1 class="govuk-heading-xl">Before You Start </h1>
+                <h1 class="govuk-heading-xl">Before you create a profile</h1>
 
                 <p class="govuk-body">Before starting your submission, check that you have all the required information listed below. You must complete your submission in a single session as the application does not support saving and resuming at a later time.</p>
 
@@ -20,10 +20,10 @@
                 <ul class="govuk-list govuk-list--bullet">
                     <li>Registered name</li>
                     <li>Trading name</li>
-                    <li>Companies House registration number, or charity registration number(if applicable)</li>
-                    <li>D-U-N-S Number(if applicable)</li>
-                    <li>Primary contact details (name,role,email address and telephone number)</li>
-                    <li>Secondary contact details (name,role,email address and telephone number)</li>
+                    <li>Companies House registration number, or charity registration number, if applicable</li>
+                    <li>D-U-N-S Number, if applicable</li>
+                    <li>Primary contact details (name, role, email address and telephone number)</li>
+                    <li>Secondary contact details (name, role, email address and telephone number)</li>
                     <li>Public contact email</li>
                     <li>Telephone number</li>
                     <li>Website address</li>

DVSRegister/Views/CabProvider/CompanyRegistrationNumber.cshtml

@@ -30,10 +30,10 @@
                     }
 
                 <h1 class="govuk-heading-xl form-title">
-                    Does the digital identity and attribute service provider have a Companies House or charity registration number?
+                    The digital identity and attribute service provider’s Companies House or charity registration number
                 </h1>
 
-                <p class="govuk-body">This number should allow for checks against Companies House or the charity register</p>
+                <p class="govuk-body">This number should allow for checks against Companies House or the charity register.</p>
 
                 <div class="govuk-form-group">
                     @{

DVSRegister/Views/CabProvider/DUNSNumber.cshtml

@@ -19,6 +19,10 @@
                     The digital identity and attribute service provider’s  D-U-N-S Number
                 </h1>
 
+                <p class="govuk-body">
+                    You should ask the service provider to provide this information.
+                </p>
+
                 @if (Html.ViewData?.ModelState.ContainsKey("DUNSNumber") == true)
                 {
                     var errors = Html.ViewData?.ModelState["DUNSNumber"]?.Errors;

DVSRegister/Views/CabProvider/InformationSubmitted.cshtml

@@ -9,35 +9,30 @@
             <div class="govuk-grid-column-two-thirds">
                 <div class="govuk-panel govuk-panel--confirmation">
                     <h1 class="govuk-panel__title">
-                       Information submitted
+                        Service provider profile created successfully
                     </h1>
                 </div>
                 <p class="govuk-body">
-                    The digital identity and attribute service provider’s information has been
-                    submitted.
-                </p>
-                <p class="govuk-body">
-                    We have sent a confirmation of your submitted information to the following
-                    email address:
+                    The digital identity and attribute service provider’s profile has been created. You can view the profile by returning to home and selecting ‘view existing service providers’.
 
-                    <b> @ViewBag.Email </b>
                 </p>
+
                 <h2 class="govuk-heading-m">What happens next</h2>
                 <p class="govuk-body">
-                    You can now return to the homepage and select ‘view existing service
+                    You can now return to the home and select ‘view existing service
                     providers’ to create a service submission for this provider.
                 </p>
                 <p class="govuk-body">
-                    If you need help, you can contact DSIT at <a href="{URL}" class="govuk-link">digital.identity.register@dsit.gov.uk.</a>
+                    If you need help, you can contact DSIT at <b>digital.identity.register@dsit.gov.uk</b>.</a>
                 </p>
                 <p class="govuk-body">
                     You can close this page now.
                 </p>
-              
+
             </div>
         </div>
         <a href="@Url.Action("LandingPage", "Cab")" role="button" draggable="false" class="govuk-button" data-module="govuk-button">
-            Return to service
+            Return to home
 
         </a>
     </main>

DVSRegister/Views/CabProvider/ProfileSummary.cshtml

@@ -269,7 +269,7 @@
                             <dl class="govuk-summary-list">
                                 <div class="govuk-summary-list__row">
                                     <dt class="govuk-summary-list__key">
-                                        Public contact email
+                                        Contact email
                                     </dt>
                                     <dd class="govuk-summary-list__value">
                                         @Model.PublicContactEmail
@@ -317,12 +317,12 @@
                 <strong class="govuk-warning-text__text">
                     <span class="govuk-visually-hidden">Warning</span>
                     If DSIT approves this submission, the company and public contact
-                    information you have provided will be publicly available.
+                    information you have provided will be publicly available
                 </strong>
             </div>
 
             <button type="submit" data-prevent-double-click="true" class="govuk-button govuk-!-margin-top-6" data-module="govuk-button">
-                Confirm and Continue
+                Submit
             </button>
         </main>
     </div>

DVSRegister/Views/CabProvider/RegisteredName.cshtml

@@ -16,7 +16,6 @@
         <main class="govuk-main-wrapper">
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
-                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s registered name</h1>
 
                     @if (Html.ViewData?.ModelState.ContainsKey("RegisteredName") == true)
                     {
@@ -30,13 +29,14 @@
                         }
                     }
 
-                    <p class="govuk-body">This registered name will be publicly displayed on the register of digital identity and attribute service providers. This should match the registered name on the certificate.</p>
+                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s registered name</h1>
+                    <p class="govuk-body">This registered name will be publicly displayed on the register of digital identity and attribute services. This should match the registered name on the certificate of conformity.</p>
 
                     @{
                         var registeredNameViewmodel = new TextBoxViewModel
                 {
                     PropertyName = "RegisteredName",
-                    Label = "Registered Name",
+                    Label = "Registered name",
                     Value = Model?.RegisteredName ?? string.Empty,
                     Class = "govuk-input",
                     HasError = hasError,

DVSRegister/Views/CabProvider/TelephoneNumber.cshtml

@@ -14,7 +14,7 @@
         <main class="govuk-main-wrapper">
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
-                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s telephone number   </h1>
+                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s public telephone number   </h1>
 
                     @if (Html.ViewData?.ModelState.ContainsKey("ProviderTelephoneNumber") == true)
                     {
@@ -39,7 +39,7 @@
                  var telephoneNumberViewModel = new TextBoxViewModel
                 {
                     PropertyName = "ProviderTelephoneNumber",
-                    Label = "Telephone number",
+                    Label = "Public telephone number",
                     Value = Model?.ProviderTelephoneNumber??string.Empty,
                     Class = "govuk-input",
                     Hint = "For international numbers include the country code",

DVSRegister/Views/CabProvider/TradingName.cshtml

@@ -16,7 +16,6 @@
         <main class="govuk-main-wrapper">
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
-                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s trading name</h1>
 
                     @if (Html.ViewData?.ModelState.ContainsKey("TradingName") == true)
                     {
@@ -30,13 +29,14 @@
                         }
                     }
 
-                    <p class="govuk-body">This trading name will be publicly displayed on the register of digital identity and attribute service providers. This should match the registered name on the certificate.</p>
+                    <h1 class="govuk-heading-xl"> The digital identity and attribute service provider’s trading name</h1>
+                    <p class="govuk-body">This trading name will be publicly displayed on the register of digital identity and attribute services. This should match the trading name on the certificate of conformity.</p>
 
                     @{
                         var tradingNameViewmodel = new TextBoxViewModel
                 {
                     PropertyName = "TradingName",
-                    Label = "Trading Name",
+                    Label = "Trading name",
                     Value = Model?.TradingName ?? string.Empty,
                     Class = "govuk-input",
                     HasError = hasError,