From 68fec3fa66d103c71cde769b2f840084aeeb98d1 Mon Sep 17 00:00:00 2001 From: Herrera Date: Fri, 13 Mar 2026 14:52:45 -0700 Subject: [PATCH 1/2] PSP-11299 : FT:Management Activities : Management File Number is not part of the activity list view reports --- .../Controllers/ManagementActivityController.cs | 1 - .../ManagementActivityInvoicesReportModel.cs | 12 +++++++++--- .../ManagementActivityOverviewReportModel.cs | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/source/backend/api/Areas/Reports/Controllers/ManagementActivityController.cs b/source/backend/api/Areas/Reports/Controllers/ManagementActivityController.cs index c1abc8b3f1..5bc159ffdf 100644 --- a/source/backend/api/Areas/Reports/Controllers/ManagementActivityController.cs +++ b/source/backend/api/Areas/Reports/Controllers/ManagementActivityController.cs @@ -166,6 +166,5 @@ private ICollection TransformAllPropertiesToLatL return activityProperties; } - } } diff --git a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs index 9f5b873fe9..3cf51169f6 100644 --- a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs +++ b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs @@ -1,11 +1,12 @@ +using Pims.Core.Extensions; +using Pims.Dal.Entities; +using Pims.Dal.Helpers.Extensions; using System; using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.Globalization; using System.Linq; -using Pims.Core.Extensions; -using Pims.Dal.Entities; -using Pims.Dal.Helpers.Extensions; namespace Pims.Api.Areas.Reports.Models.Management { @@ -16,6 +17,10 @@ public class ManagementActivityInvoicesReportModel [CsvHelper.Configuration.Attributes.Name("Invoice Number")] public string InvoiceNumber { get; set; } + [DisplayName("Management File Number")] + [CsvHelper.Configuration.Attributes.Name("Management File Number")] + public string ManagementFileNumber { get; set; } + [DisplayName("Management File Name")] [CsvHelper.Configuration.Attributes.Name("Management File Name")] public string ManagementFileName { get; set; } @@ -129,6 +134,7 @@ public ManagementActivityInvoicesReportModel(PimsManagementActivityInvoice invoi ArgumentNullException.ThrowIfNull(invoice, nameof(invoice)); InvoiceNumber = GetNullableString(invoice.InvoiceNum); + ManagementFileNumber = invoice.ManagementActivity?.ManagementFile?.ManagementFileId != null ? $"M-{invoice.ManagementActivity.ManagementFile?.ManagementFileId}" : string.Empty; ManagementFileName = GetNullableString(invoice.ManagementActivity?.ManagementFile?.FileName); LegacyFileNum = GetNullableString(invoice.ManagementActivity?.ManagementFile?.LegacyFileNum); Funding = GetNullableString(invoice.ManagementActivity?.ManagementFile?.AcquisitionFundingTypeCodeNavigation?.Description); diff --git a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityOverviewReportModel.cs b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityOverviewReportModel.cs index 0f3a62e3f8..3da03c8a4d 100644 --- a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityOverviewReportModel.cs +++ b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityOverviewReportModel.cs @@ -15,6 +15,10 @@ public class ManagementActivityOverviewReportModel [CsvHelper.Configuration.Attributes.Name("Management File Name")] public string ManagementFileName { get; set; } + [DisplayName("Management File Number")] + [CsvHelper.Configuration.Attributes.Name("Management File Number")] + public string ManagementFileNumber { get; set; } + [DisplayName("Historical File Number")] [CsvHelper.Configuration.Attributes.Name("Historical File Number")] public string LegacyFileNum { get; set; } @@ -103,6 +107,7 @@ public ManagementActivityOverviewReportModel(PimsManagementActivity activity) { ArgumentNullException.ThrowIfNull(activity, nameof(activity)); + ManagementFileNumber = activity.ManagementFile?.ManagementFileId != null ? $"M-{activity.ManagementFile?.ManagementFileId}" : string.Empty; ManagementFileName = GetNullableString(activity.ManagementFile?.FileName); LegacyFileNum = GetNullableString(activity.ManagementFile?.LegacyFileNum); Properties = GetPropertiesAsString(activity); From deedb2e6ddc6c18ca29a7abea265136811c208e8 Mon Sep 17 00:00:00 2001 From: Herrera Date: Fri, 13 Mar 2026 16:35:52 -0700 Subject: [PATCH 2/2] - linting --- .../Management/ManagementActivityInvoicesReportModel.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs index 3cf51169f6..77075bfb3e 100644 --- a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs +++ b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs @@ -1,12 +1,11 @@ -using Pims.Core.Extensions; -using Pims.Dal.Entities; -using Pims.Dal.Helpers.Extensions; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics; using System.Globalization; using System.Linq; +using Pims.Core.Extensions; +using Pims.Dal.Entities; +using Pims.Dal.Helpers.Extensions; namespace Pims.Api.Areas.Reports.Models.Management {