From e7bf8976e9d7507b7efefdd42f0b251b14ebf394 Mon Sep 17 00:00:00 2001
From: Idris Abu <idris.abu@eviden.com>
Date: Thu, 4 Jul 2024 12:18:15 +0100
Subject: [PATCH 1/3] Changes to display enrolment status on the delegate tab

---
 .../EPR.RegulatorService.Frontend.Web.csproj  |   9 +-
 .../_DelegatedPersons.cy.Designer.cs          |  62 +++++++++
 .../_DelegatedPersons.cy.resx                 | 126 ++++++++++++++++++
 .../_DelegatedPersons.en.Designer.cs          |  61 +++++++++
 .../_DelegatedPersons.en.resx                 |  26 ++++
 .../_DelegatedPersons.cshtml                  |  21 ++-
 6 files changed, 302 insertions(+), 3 deletions(-)
 create mode 100644 src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.Designer.cs
 create mode 100644 src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
 create mode 100644 src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.Designer.cs
 create mode 100644 src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.resx

diff --git a/src/EPR.RegulatorService.Frontend.Web/EPR.RegulatorService.Frontend.Web.csproj b/src/EPR.RegulatorService.Frontend.Web/EPR.RegulatorService.Frontend.Web.csproj
index fbeee125..a296153b 100644
--- a/src/EPR.RegulatorService.Frontend.Web/EPR.RegulatorService.Frontend.Web.csproj
+++ b/src/EPR.RegulatorService.Frontend.Web/EPR.RegulatorService.Frontend.Web.csproj
@@ -8,7 +8,7 @@
     <UserSecretsId>8c277499-f889-42f1-b2d9-569b72dd51ae</UserSecretsId>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup> 
     <!-- SonarCloud does not recognise file-scoped namespaces in current version. -->
     <NoWarn>S3903</NoWarn>
   </PropertyGroup>
@@ -47,6 +47,13 @@
     <EmbeddedResource Update="Resources\Views\RegulatorEnrolment\FullName.en.resx" />
     <EmbeddedResource Update="Resources\Views\SearchManageApprovers\RegulatorSearchPage.cy.resx" />
     <EmbeddedResource Update="Resources\Views\SearchManageApprovers\RegulatorSearchPage.en.resx" />
+    <EmbeddedResource Update="Resources\Views\Shared\Partials\ManageApprovedUser\_DelegatedPersons.cy.resx">
+      <LastGenOutput>_ApprovedPerson.en.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Views\Shared\Partials\ManageApprovedUser\_DelegatedPersons.en.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Views\Shared\Partials\_EnrolmentRequestApprovedUser.en.resx" />
     <EmbeddedResource Update="Resources\Views\Shared\Partials\_EnrolmentRequestApprovedUser.cy.resx" />
     <EmbeddedResource Update="Resources\Views\Shared\Partials\_EnrolmentRequestDelegatedUser.cy.resx" />
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.Designer.cs b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.Designer.cs
new file mode 100644
index 00000000..82771663
--- /dev/null
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.Designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace EPR.RegulatorService.Frontend.Web.Resources.Views.Shared.Partials {
+    using System;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class _DelegatedPersons_cy
+    {
+        
+        private static System.Resources.ResourceManager resourceMan;
+        
+        private static System.Globalization.CultureInfo resourceCulture;
+        
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal _DelegatedPersons_cy() {
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.Equals(null, resourceMan)) {
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("EPR.RegulatorService.Frontend.Web.Resources.Views.Shared.Partials._ApprovedPerson" +
+                            "_en", typeof(_ApprovedPerson_en).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static string Enrolment_Status_Pending {
+            get {
+                return ResourceManager.GetString("Enrolment.Status.Pending", resourceCulture);
+            }
+        }
+        
+        internal static string Enrolment_Status_Awaiting {
+            get {
+                return ResourceManager.GetString("Enrolment.Status.Awaiting", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
new file mode 100644
index 00000000..bf871728
--- /dev/null
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Enrolment.Status.Pending" xml:space="preserve">
+    <value>WAPPLICATION PENDING</value>
+  </data>
+  <data name="Enrolment.Status.Awaiting" xml:space="preserve">
+    <value>WAPPLICATION AWAITING APPROVAL</value>
+  </data>
+</root>
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.Designer.cs b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.Designer.cs
new file mode 100644
index 00000000..bc033076
--- /dev/null
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.Designer.cs
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace EPR.RegulatorService.Frontend.Web.Resources.Views.Shared.Partials {
+    using System;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class _DelegatedPersons_en {
+        
+        private static System.Resources.ResourceManager resourceMan;
+        
+        private static System.Globalization.CultureInfo resourceCulture;
+        
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal _DelegatedPersons_en() {
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.Equals(null, resourceMan)) {
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("EPR.RegulatorService.Frontend.Web.Resources.Views.Shared.Partials._ApprovedPerson" +
+                            "_en", typeof(_ApprovedPerson_en).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static string Enrolment_Status_Pending {
+            get {
+                return ResourceManager.GetString("Enrolment.Status.Pending", resourceCulture);
+            }
+        }
+        
+        internal static string Enrolment_Status_Awaiting {
+            get {
+                return ResourceManager.GetString("Enrolment.Status.Awaiting", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.resx
new file mode 100644
index 00000000..65772a7e
--- /dev/null
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.en.resx
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="Enrolment.Status.Pending" xml:space="preserve">
+        <value>APPLICATION PENDING</value>
+   </data>
+    <data name="Enrolment.Status.Awaiting" xml:space="preserve">
+        <value>APPLICATION AWAITING APPROVAL</value>
+   </data>
+</root>
\ No newline at end of file
diff --git a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
index 71d71625..50a29384 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
+++ b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
@@ -1,10 +1,27 @@
-@model List<EPR.RegulatorService.Frontend.Core.Models.CompanyDetails.CompanyUserInformation>
+@using EPR.RegulatorService.Frontend.Core.Enums
+@model List<EPR.RegulatorService.Frontend.Core.Models.CompanyDetails.CompanyUserInformation>
 
 @foreach (var user in Model)
 {
   <div class="govuk-summary-card">
     <div class="govuk-summary-card__title-wrapper">
-      <h2 class="govuk-summary-card__title">@user.FirstName @user.LastName</h2>
+      @* <h2 class="govuk-summary-card__title">@user.FirstName @user.LastName</h2> *@
+      <h2 class="govuk-summary-card__title">
+          <span class="govuk-summary-card__title"> @user.FirstName @user.LastName </span>
+          @if (user.UserEnrolments.Any(e =>
+          e.EnrolmentStatusId is (int)EnrolmentStatus.Invited or (int)EnrolmentStatus.Nominated))
+          {
+              <span class="govuk-summary-card__title govuk-tag--yellow">
+                  @Localizer["Enrolment.Status.Pending"]
+              </span>
+          }
+          @if (user.UserEnrolments.Any(e => e.EnrolmentStatusId == (int)EnrolmentStatus.Pending))
+          {
+              <span class="govuk-summary-card__title govuk-tag--yellow">
+                  @Localizer["Enrolment.Status.Awaiting"]
+              </span>
+          }
+      </h2>
     </div>
     <div class="govuk-summary-card__content">
       <dl class="govuk-summary-list">

From 5111ad1d7dcc703cba63a875fe924bc1938a2c02 Mon Sep 17 00:00:00 2001
From: Idris Abu <idris.abu@eviden.com>
Date: Thu, 11 Jul 2024 10:16:20 +0100
Subject: [PATCH 2/3] Resolution of review comment in _DelegatedPersons.cshtml

---
 .../Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
index 50a29384..bad602bd 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
+++ b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
@@ -5,7 +5,6 @@
 {
   <div class="govuk-summary-card">
     <div class="govuk-summary-card__title-wrapper">
-      @* <h2 class="govuk-summary-card__title">@user.FirstName @user.LastName</h2> *@
       <h2 class="govuk-summary-card__title">
           <span class="govuk-summary-card__title"> @user.FirstName @user.LastName </span>
           @if (user.UserEnrolments.Any(e =>

From 74ea9ef37fb71f65a4267fe6f6907397ebfe6b37 Mon Sep 17 00:00:00 2001
From: "Simon Crowder (ext)" <155532504+scdefra@users.noreply.github.com>
Date: Thu, 11 Jul 2024 10:36:47 +0100
Subject: [PATCH 3/3] Resolved feedback

---
 .../Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
index bad602bd..119433c0 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
+++ b/src/EPR.RegulatorService.Frontend.Web/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cshtml
@@ -8,7 +8,7 @@
       <h2 class="govuk-summary-card__title">
           <span class="govuk-summary-card__title"> @user.FirstName @user.LastName </span>
           @if (user.UserEnrolments.Any(e =>
-          e.EnrolmentStatusId is (int)EnrolmentStatus.Invited or (int)EnrolmentStatus.Nominated))
+          e.EnrolmentStatusId == (int)EnrolmentStatus.Invited || e.EnrolmentStatusId == (int)EnrolmentStatus.Nominated))
           {
               <span class="govuk-summary-card__title govuk-tag--yellow">
                   @Localizer["Enrolment.Status.Pending"]