From b3b1aefb056f9eadf7af79ee1b4c9c91c442b3bb Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Thu, 2 Jan 2025 11:28:48 +0000 Subject: [PATCH 01/11] fix columns --- .../Pages/Payments/Components/EducationPayments.razor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Server.UI/Pages/Payments/Components/EducationPayments.razor b/src/Server.UI/Pages/Payments/Components/EducationPayments.razor index 863d6712..11c9ee2b 100644 --- a/src/Server.UI/Pages/Payments/Components/EducationPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/EducationPayments.razor @@ -11,13 +11,14 @@ Payable + @context.CreatedOn @context.ActivityApproved.ToShortDateString() @context.Contract @context.ParticipantId @context.Location @context.LocationType - + @if (context.EligibleForPayment) { @("Yes") @@ -29,7 +30,7 @@ } - + From e6bee82a205787a829357b2594014e1c039fd7a0 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Thu, 2 Jan 2025 11:52:22 +0000 Subject: [PATCH 02/11] typo --- src/Domain/Common/Enums/ActivityDefinition.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Domain/Common/Enums/ActivityDefinition.cs b/src/Domain/Common/Enums/ActivityDefinition.cs index f6a01946..70cc47c2 100644 --- a/src/Domain/Common/Enums/ActivityDefinition.cs +++ b/src/Domain/Common/Enums/ActivityDefinition.cs @@ -229,7 +229,7 @@ public static IEnumerable GetActivitiesForLocation(LocationT public static readonly ActivityDefinition TherapeuticApproachesforYoungAdultsCustody = new("Therapeutic Approaches for Young Adults Custody", 193, DeliveryLocationType.Custody, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.TherapeuticApproachesForYoungAdults, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition WheretoStartandIntroductiontoEmployabilityCustody = new("Where to Start and Introduction to Employability Custody", 194, DeliveryLocationType.Custody, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.WhereToStartAndIntroductionToEmployability, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition WorkRelatedMentoringInWorkSupportCustody = new("Work-Related Mentoring / In Work Support Custody", 195, DeliveryLocationType.Custody, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.WorkRelatedMentoringInWorkSupport, ExpectedClaims.MoreThanOne); - public static readonly ActivityDefinition AFutureFocuWiderCommunity = new("A Future Focus Wider Community", 196, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AFutureFocus, ExpectedClaims.MoreThanOne); + public static readonly ActivityDefinition AFutureFocusWiderCommunity = new("A Future Focus Wider Community", 196, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AFutureFocus, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition ASenseofaNewandProSocialIdentityWiderCommunity = new("A Sense of a New and Pro-Social Identity Wider Community", 197, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.ASenseOfANewAndProSocialIdentity, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition ArtsandCraftsWiderCommunity = new("Arts and Crafts Wider Community", 198, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.ArtsAndCrafts, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition ChangingLivesWiderCommunity = new("Changing Lives Wider Community", 199, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.ChangingLives, ExpectedClaims.MoreThanOne); From 0b8f60601b94db01ea078578a56c0c7184ce0db4 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Thu, 2 Jan 2025 12:18:58 +0000 Subject: [PATCH 03/11] typos --- src/Domain/Common/Enums/ActivityDefinition.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Domain/Common/Enums/ActivityDefinition.cs b/src/Domain/Common/Enums/ActivityDefinition.cs index 70cc47c2..c0561889 100644 --- a/src/Domain/Common/Enums/ActivityDefinition.cs +++ b/src/Domain/Common/Enums/ActivityDefinition.cs @@ -89,7 +89,7 @@ public static IEnumerable GetActivitiesForLocation(LocationT public static readonly ActivityDefinition VolunteeringWorkExperienceCustody = new("Volunteering / Work Experience Custody", 53, DeliveryLocationType.Custody, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.VolunteeringWorkExperience, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition WellbeingCustody = new("Wellbeing", 54, DeliveryLocationType.Custody, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Wellbeing, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition AccessingHealthSupportWiderCommunity = new("Accessing Health Support Wider Community", 55, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AccessingHealthSupport, ExpectedClaims.MoreThanOne); - public static readonly ActivityDefinition AddictioWiderCommunity = new("Addiction Wider Community", 56, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Addiction, ExpectedClaims.MoreThanOne); + public static readonly ActivityDefinition AddictionWiderCommunity = new("Addiction Wider Community", 56, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Addiction, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition AngerManagementSupportWiderCommunity = new("Anger Management Support Wider Community", 57, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AngerManagementSupport, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition ApplicationsJobsWiderCommunity = new("Applications (Jobs) Wider Community", 58, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.ApplicationsJobs, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition AssessmentofLiteracyandNumeracySkillsWiderCommunity = new("Assessment of Literacy and Numeracy Skills Wider Community", 59, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AssessmentOfLiteracyAndNumeracySkills, ExpectedClaims.One); @@ -141,9 +141,9 @@ public static IEnumerable GetActivitiesForLocation(LocationT public static readonly ActivityDefinition VictimAwarenessWiderCommunity = new("Victim Awareness Wider Community", 105, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.VictimAwareness, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition VolunteeringWorkExperienceWiderCommunity = new("Volunteering / Work Experience Wider Community", 106, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.VolunteeringWorkExperience, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition WellbeingWiderCommunity = new("Wellbeing Wider Community", 107, DeliveryLocationType.WiderCommunity, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Wellbeing, ExpectedClaims.MoreThanOne); - public static readonly ActivityDefinition AccessingHealthSupport = new("Accessing Health Support Hub", 108, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AccessingHealthSupport, ExpectedClaims.MoreThanOne); - public static readonly ActivityDefinition Addiction = new("Addiction Hub", 109, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Addiction, ExpectedClaims.MoreThanOne); - public static readonly ActivityDefinition AngerManagementSupport = new("Anger Management Support Hub", 110, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AngerManagementSupport, ExpectedClaims.MoreThanOne); + public static readonly ActivityDefinition AccessingHealthSupportHub = new("Accessing Health Support Hub", 108, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AccessingHealthSupport, ExpectedClaims.MoreThanOne); + public static readonly ActivityDefinition AddictionHub = new("Addiction Hub", 109, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.Addiction, ExpectedClaims.MoreThanOne); + public static readonly ActivityDefinition AngerManagementSupportHub = new("Anger Management Support Hub", 110, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AngerManagementSupport, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition ApplicationsJobsHub = new("Applications (Jobs) Hub", 111, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.ApplicationsJobs, ExpectedClaims.MoreThanOne); public static readonly ActivityDefinition AssessmentofLiteracyandNumeracySkillsHub = new("Assessment of Literacy and Numeracy Skills Hub", 112, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AssessmentOfLiteracyAndNumeracySkills, ExpectedClaims.One); public static readonly ActivityDefinition AwarenessAndUseOfSocialMediaDigitalPlatformsHub = new("Awareness and use of social media / digital platforms Hub", 113, DeliveryLocationType.Hub, ClassificationType.NonISWActivity, ActivityType.SupportWork, ActivityCategory.AwarenessAndUseOfSocialMediaDigitalPlatforms, ExpectedClaims.MoreThanOne); From 0c9fca96430d52f6af8f06ecb491665f9108fa32 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Thu, 2 Jan 2025 12:37:22 +0000 Subject: [PATCH 04/11] make it clear we are checking RTW --- src/Server.UI/Pages/QA/Enrolments/Escalation.razor | 7 +++++++ src/Server.UI/Pages/QA/Enrolments/QA1.razor | 8 ++++++++ src/Server.UI/Pages/QA/Enrolments/QA2.razor | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/src/Server.UI/Pages/QA/Enrolments/Escalation.razor b/src/Server.UI/Pages/QA/Enrolments/Escalation.razor index 70d6b567..db6de2ff 100644 --- a/src/Server.UI/Pages/QA/Enrolments/Escalation.razor +++ b/src/Server.UI/Pages/QA/Enrolments/Escalation.razor @@ -45,6 +45,13 @@ } + @if(_participantDto.ConsentStatus == ConsentStatus.GrantedStatus) + { + + Consent has been granted for this participant. Right to work needs confirming. + + } + diff --git a/src/Server.UI/Pages/QA/Enrolments/QA1.razor b/src/Server.UI/Pages/QA/Enrolments/QA1.razor index cd5db8bd..10c22651 100644 --- a/src/Server.UI/Pages/QA/Enrolments/QA1.razor +++ b/src/Server.UI/Pages/QA/Enrolments/QA1.razor @@ -59,6 +59,13 @@ } + @if(_participantDto.ConsentStatus == ConsentStatus.GrantedStatus) + { + + Consent has been granted for this participant. Right to work needs confirming. + + } + @@ -130,6 +137,7 @@ private MudForm? _form; private EnrolmentQueueEntryDto? _queueEntry = null; private ParticipantDto? _participantDto = null; + [CascadingParameter] public UserProfile? UserProfile { get; set; } = null!; diff --git a/src/Server.UI/Pages/QA/Enrolments/QA2.razor b/src/Server.UI/Pages/QA/Enrolments/QA2.razor index 4b821cc6..7e1c4953 100644 --- a/src/Server.UI/Pages/QA/Enrolments/QA2.razor +++ b/src/Server.UI/Pages/QA/Enrolments/QA2.razor @@ -60,6 +60,13 @@ } + @if(_participantDto.ConsentStatus == ConsentStatus.GrantedStatus) + { + + Consent has been granted for this participant. Right to work needs confirming. + + } + From 675fdaff345ffc61a706792e27c19280bb4f4516 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Thu, 2 Jan 2025 13:28:50 +0000 Subject: [PATCH 05/11] First not single, as there can be a few submissions --- .../IntegrationEventHandlers/RecordEnrolmentPaymentConsumer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Application/Features/ManagementInformation/IntegrationEventHandlers/RecordEnrolmentPaymentConsumer.cs b/src/Application/Features/ManagementInformation/IntegrationEventHandlers/RecordEnrolmentPaymentConsumer.cs index 0d84a338..fc1fbf6e 100644 --- a/src/Application/Features/ManagementInformation/IntegrationEventHandlers/RecordEnrolmentPaymentConsumer.cs +++ b/src/Application/Features/ManagementInformation/IntegrationEventHandlers/RecordEnrolmentPaymentConsumer.cs @@ -52,7 +52,7 @@ public async Task Consume(ConsumeContext Date: Thu, 2 Jan 2025 14:15:36 +0000 Subject: [PATCH 06/11] ordering on payment screen + PQA message --- .../Components/ActivityPayments.razor | 22 ++++++++++++---- .../Components/EducationPayments.razor | 26 ++++++++++++++----- .../Components/EmploymentPayments.razor | 22 ++++++++++++---- .../Components/EnrolmentPayments.razor | 26 ++++++++++++++----- .../Components/InductionPayments.razor | 22 ++++++++++++---- src/Server.UI/Pages/QA/Enrolments/PQA.razor | 7 +++++ 6 files changed, 96 insertions(+), 29 deletions(-) diff --git a/src/Server.UI/Pages/Payments/Components/ActivityPayments.razor b/src/Server.UI/Pages/Payments/Components/ActivityPayments.razor index 82d5baa6..f49eb21e 100644 --- a/src/Server.UI/Pages/Payments/Components/ActivityPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/ActivityPayments.razor @@ -1,10 +1,12 @@ @inherits CatsComponentBase - + Created Approved - Contract Participant Id Location Type @@ -12,10 +14,12 @@ Activity Type Payable + + @context.Key + @context.CreatedOn @context.ActivityApproved.ToShortDateString() - @context.Contract @context.ParticipantId @context.Location @context.LocationType @@ -52,6 +56,14 @@ private Data[] Payments { get; set; } = []; + private TableGroupDefinition _groupDefinition = new() + { + GroupName = "Contract", + Indentation = false, + Expandable = true, + Selector = (e) => e.Contract + }; + protected override async Task OnInitializedAsync() { var unitOfWork = GetNewUnitOfWork(); @@ -90,8 +102,8 @@ Location = x.Location, LocationType = x.LocationType, IneligibilityReason = x.IneligibilityReason - } - ) + }) + .OrderByDescending(e => e.CreatedOn) .ToArrayAsync(); _loading = false; diff --git a/src/Server.UI/Pages/Payments/Components/EducationPayments.razor b/src/Server.UI/Pages/Payments/Components/EducationPayments.razor index 11c9ee2b..71594a03 100644 --- a/src/Server.UI/Pages/Payments/Components/EducationPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/EducationPayments.razor @@ -1,22 +1,26 @@ @inherits CatsComponentBase - + Created Approved - Contract Participant Id Location Type Payable + + @context.Key + @context.CreatedOn @context.ActivityApproved.ToShortDateString() - @context.Contract @context.ParticipantId - @context.Location - @context.LocationType + @context.Location + @context.LocationType @if (context.EligibleForPayment) @@ -48,6 +52,14 @@ private Data[] Payments { get; set; } = []; + private TableGroupDefinition _groupDefinition = new() + { + GroupName = "Contract", + Indentation = false, + Expandable = true, + Selector = (e) => e.Contract + }; + protected override async Task OnInitializedAsync() { var unitOfWork = GetNewUnitOfWork(); @@ -82,8 +94,8 @@ Location = x.Location, LocationType = x.LocationType, IneligibilityReason = x.IneligibilityReason - } - ) + }) + .OrderByDescending(e => e.CreatedOn) .ToArrayAsync(); _loading = false; diff --git a/src/Server.UI/Pages/Payments/Components/EmploymentPayments.razor b/src/Server.UI/Pages/Payments/Components/EmploymentPayments.razor index 64782cd9..a72c5e53 100644 --- a/src/Server.UI/Pages/Payments/Components/EmploymentPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/EmploymentPayments.razor @@ -1,17 +1,21 @@ @inherits CatsComponentBase - + Created Approved - Contract Participant Id Payable + + @context.Key + @context.CreatedOn @context.ActivityApproved.ToShortDateString() - @context.Contract @context.ParticipantId @(context.EligibleForPayment ? "Yes" : "No") @@ -30,6 +34,14 @@ private Data[] Payments { get; set; } = []; + private TableGroupDefinition _groupDefinition = new() + { + GroupName = "Contract", + Indentation = false, + Expandable = true, + Selector = (e) => e.Contract + }; + protected override async Task OnInitializedAsync() { var unitOfWork = GetNewUnitOfWork(); @@ -57,8 +69,8 @@ ParticipantId = x.ParticipantId, EligibleForPayment = x.EligibleForPayment, Contract = x.Contract - } - ) + }) + .OrderByDescending(e => e.CreatedOn) .ToArrayAsync(); _loading = false; diff --git a/src/Server.UI/Pages/Payments/Components/EnrolmentPayments.razor b/src/Server.UI/Pages/Payments/Components/EnrolmentPayments.razor index 6b388e07..d6af2871 100644 --- a/src/Server.UI/Pages/Payments/Components/EnrolmentPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/EnrolmentPayments.razor @@ -1,22 +1,26 @@ @inherits CatsComponentBase - + Created Approved - Contract Participant Id Location Type Payable + + @context.Key + @context.CreatedOn @(context.Approved.HasValue ? context.Approved.Value.ToShortDateString() : "" ) - @context.Contract @context.ParticipantId - @context.Location - @context.LocationType + @context.Location + @context.LocationType @if (context.EligibleForPayment) @@ -48,6 +52,14 @@ private Data[] Payments { get; set; } = []; + private TableGroupDefinition _groupDefinition = new() + { + GroupName = "Contract", + Indentation = false, + Expandable = true, + Selector = (e) => e.Contract + }; + protected override async Task OnInitializedAsync() { var unitOfWork = GetNewUnitOfWork(); @@ -82,8 +94,8 @@ Location = x.Location, LocationType = x.LocationType, IneligibilityReason = x.IneligibilityReason - } - ) + }) + .OrderByDescending(e => e.CreatedOn) .ToArrayAsync(); _loading = false; diff --git a/src/Server.UI/Pages/Payments/Components/InductionPayments.razor b/src/Server.UI/Pages/Payments/Components/InductionPayments.razor index b6b68a91..7146541a 100644 --- a/src/Server.UI/Pages/Payments/Components/InductionPayments.razor +++ b/src/Server.UI/Pages/Payments/Components/InductionPayments.razor @@ -1,19 +1,23 @@ @inherits CatsComponentBase - + Created Approved - Contract Participant Id Location Type Payable + + @context.Key + @context.CreatedOn @(context.Approved.HasValue ? context.Approved.Value.ToShortDateString() : "" ) - @context.Contract @context.ParticipantId @context.Location @context.LocationType @@ -48,6 +52,14 @@ private Data[] Payments { get; set; } = []; + private TableGroupDefinition _groupDefinition = new() + { + GroupName = "Contract", + Indentation = false, + Expandable = true, + Selector = (e) => e.Contract + }; + protected override async Task OnInitializedAsync() { var unitOfWork = GetNewUnitOfWork(); @@ -82,8 +94,8 @@ Location = x.Location, LocationType = x.LocationType, IneligibilityReason = x.IneligibilityReason - } - ) + }) + .OrderByDescending(e => e.CreatedOn) .ToArrayAsync(); _loading = false; diff --git a/src/Server.UI/Pages/QA/Enrolments/PQA.razor b/src/Server.UI/Pages/QA/Enrolments/PQA.razor index 63a03e03..a00d00a4 100644 --- a/src/Server.UI/Pages/QA/Enrolments/PQA.razor +++ b/src/Server.UI/Pages/QA/Enrolments/PQA.razor @@ -49,6 +49,13 @@ } + @if(_participantDto.ConsentStatus == ConsentStatus.GrantedStatus && _participantDto.EnrolmentStatus == EnrolmentStatus.SubmittedToProviderStatus) + { + + The consent form has previously been approved for this participant. The Right to Work submission requires verifying. + + } + From 6e77057b0489b273613d02aef551494ea37a1ff4 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Fri, 3 Jan 2025 08:33:28 +0000 Subject: [PATCH 07/11] Github build agents are case sensitive. --- src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj index 13723f9e..9d1f7a9f 100644 --- a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj +++ b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj @@ -18,7 +18,7 @@ - + From ee89c1d459dc667401b7edfb3b76e552d791da37 Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Fri, 3 Jan 2025 09:11:58 +0000 Subject: [PATCH 08/11] fixing the file reference broke aspire link --- src/Aspire/Aspire.AppHost/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Aspire/Aspire.AppHost/Program.cs b/src/Aspire/Aspire.AppHost/Program.cs index a3d83258..275695b0 100644 --- a/src/Aspire/Aspire.AppHost/Program.cs +++ b/src/Aspire/Aspire.AppHost/Program.cs @@ -17,7 +17,7 @@ .WithManagementPlugin() .WithLifetime(ContainerLifetime.Persistent); -builder.AddProject("cats") +builder.AddProject("cats") .WithReference(catsDb) .WithReference(rabbit) .WaitFor(sql); From 29546a3213b533c0d0317fe63bcaa8ff5924e71f Mon Sep 17 00:00:00 2001 From: Carl Sixsmith Date: Fri, 3 Jan 2025 09:51:41 +0000 Subject: [PATCH 09/11] This fix alters the UI so it uses a table and makes it clear when the data is being loaded. No functional change, only UI --- src/Server.UI/Pages/Transfers/Transfers.razor | 225 +++++++----------- 1 file changed, 88 insertions(+), 137 deletions(-) diff --git a/src/Server.UI/Pages/Transfers/Transfers.razor b/src/Server.UI/Pages/Transfers/Transfers.razor index fb2e225e..43978f06 100644 --- a/src/Server.UI/Pages/Transfers/Transfers.razor +++ b/src/Server.UI/Pages/Transfers/Transfers.razor @@ -10,145 +10,92 @@ @attribute [Authorize(Policy = SecurityPolicies.UserHasAdditionalRoles)] - - - -
-
- -
- Incoming Transfers -
-
-
- - - Participant - Occurred - From - To - Type - Action - - - - @foreach(var transfer in incomingTransfers.OrderByDescending(t => t.MoveOccured)) - { - - -
- @transfer.Participant.FullName - @transfer.Participant.Id -
- - - - @transfer.MoveOccured.ToLocalTime().ToString("dd/MM/yyyy HH:mm") - - - - - @transfer.FromLocation.Name (@transfer.FromLocation.LocationType.Name) - - - - - @transfer.ToLocation.Name (@transfer.ToLocation.LocationType.Name) - - - - - @transfer.TransferType.Name - - - - Process - - - } - @if(incomingTransfers.Count is 0) - { - - -
- @ConstantString.NoRecords -
- - - } - - - - - - -
-
- -
- Outgoing Transfers -
-
-
- - - Participant - Occurred - From - To - Type - Action - - - - @foreach (var transfer in outgoingTransfers.OrderByDescending(t => t.MoveOccured)) - { - - -
- @transfer.Participant.FullName - @transfer.Participant.Id -
- - - - @transfer.MoveOccured.ToLocalTime().ToString("dd/MM/yyyy HH:mm") - - - - - @transfer.FromLocation.Name (@transfer.FromLocation.LocationType.Name) - - - - - @transfer.ToLocation.Name (@transfer.ToLocation.LocationType.Name) - - - - - @transfer.TransferType.Name - - - - View - - - } - @if (outgoingTransfers.Count is 0) - { - - -
- @ConstantString.NoRecords -
- - - } - - + + + + + Incoming Transfers + + + + Participant + Occurred + From + To + Type + Action + + + +
+ @context.Participant.FullName + @context.Participant.Id +
+ + + @context.MoveOccured.ToLocalTime().ToString("dd/MM/yyyy HH:mm") + + + @context.FromLocation.Name (@context.FromLocation.LocationType.Name) + + + @context.ToLocation.Name (@context.ToLocation.LocationType.Name) + + + @context.TransferType.Name + + + Process + + + + + + + + Outgoing Transfers + + + + Participant + Occurred + From + To + Type + Action + + + +
+ @context.Participant.FullName + @context.Participant.Id +
+ + + @context.MoveOccured.ToLocalTime().ToString("dd/MM/yyyy HH:mm") + + + @context.FromLocation.Name (@context.FromLocation.LocationType.Name) + + + @context.ToLocation.Name (@context.ToLocation.LocationType.Name) + + + @context.TransferType.Name + + + View + + + + + @code { + + private bool isLoadingIncomingTransfers = true; + private bool isLoadingOutgoingTransfers = true; + private List incomingTransfers = []; private List outgoingTransfers = []; @@ -162,13 +109,17 @@ private async Task> GetIncomingTransfers() { + isLoadingIncomingTransfers = true; var query = await GetNewMediator().Send(new GetIncomingTransfers.Query()); + isLoadingIncomingTransfers = false; return query.Data?.ToList() ?? []; } private async Task> GetOutgoingTransfers() { + isLoadingOutgoingTransfers = true; var query = await GetNewMediator().Send(new GetOutgoingTransfers.Query()); + isLoadingOutgoingTransfers = false; return query.Data?.ToList() ?? []; } From 889aaeb2e818567996214b5cf99f76f82405aaa2 Mon Sep 17 00:00:00 2001 From: PaulCooperWorkJustice Date: Fri, 3 Jan 2025 10:15:21 +0000 Subject: [PATCH 10/11] Fix to the Activity List queues to point to activities and not enrolments. --- .../Activities/DTOs/ActivityQueueEntryDto.cs | 15 +++++-- .../Components/EscalationList.razor | 27 ++++++------ .../QA/Activities/Components/QA1List.razor | 41 ++++++++++--------- .../QA/Activities/Components/QA2List.razor | 30 +++++++++----- 4 files changed, 66 insertions(+), 47 deletions(-) diff --git a/src/Application/Features/Activities/DTOs/ActivityQueueEntryDto.cs b/src/Application/Features/Activities/DTOs/ActivityQueueEntryDto.cs index 717a38b7..ab9fdef3 100644 --- a/src/Application/Features/Activities/DTOs/ActivityQueueEntryDto.cs +++ b/src/Application/Features/Activities/DTOs/ActivityQueueEntryDto.cs @@ -10,8 +10,9 @@ public class ActivityQueueEntryDto public DateTime Created { get; set; } = default!; public string TenantId { get; set; } = default!; public string TenantName { get; set; } = default!; - public string ParticipantName { get; set; } = default!; - + public string ParticipantName { get; set; } = default!; + public string? ParticipantId { get; set; } + public string SupportWorker { get; set; } = default!; public string? AssignedTo { get; set; } @@ -37,6 +38,8 @@ public Mapping() .ForMember(target => target.ParticipantName, options => { options.MapFrom(target => target.Participant!.FirstName + " " + target.Participant.LastName); }) + .ForMember(target => target.ParticipantId, + options => options.MapFrom(source => source.ParticipantId)) .ForMember(target => target.SupportWorker, options => options.MapFrom( source => source.Participant!.Owner!.DisplayName )) @@ -58,6 +61,8 @@ public Mapping() { options.MapFrom(target => target.Participant!.FirstName + " " + target.Participant.LastName); }) + .ForMember(target => target.ParticipantId, + options => options.MapFrom(source => source.ParticipantId)) .ForMember(target => target.SupportWorker, options => options.MapFrom( source => source.Participant!.Owner!.DisplayName )) @@ -77,6 +82,8 @@ public Mapping() { options.MapFrom(target => target.Participant!.FirstName + " " + target.Participant.LastName); }) + .ForMember(target => target.ParticipantId, + options => options.MapFrom(source => source.ParticipantId)) .ForMember(target => target.SupportWorker, options => options.MapFrom( source => source.Participant!.Owner!.DisplayName )) @@ -96,6 +103,8 @@ public Mapping() { options.MapFrom(target => target.Participant!.FirstName + " " + target.Participant.LastName); }) + .ForMember(target => target.ParticipantId, + options => options.MapFrom(source => source.ParticipantId)) .ForMember(target => target.SupportWorker, options => options.MapFrom( source => source.Participant!.Owner!.DisplayName )) @@ -104,4 +113,4 @@ public Mapping() } } } -} +} \ No newline at end of file diff --git a/src/Server.UI/Pages/QA/Activities/Components/EscalationList.razor b/src/Server.UI/Pages/QA/Activities/Components/EscalationList.razor index db5824d1..f57af090 100644 --- a/src/Server.UI/Pages/QA/Activities/Components/EscalationList.razor +++ b/src/Server.UI/Pages/QA/Activities/Components/EscalationList.razor @@ -7,7 +7,6 @@ @inject IStringLocalizer L -