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..77075bfb3e 100644 --- a/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs +++ b/source/backend/api/Areas/Reports/Models/Management/ManagementActivityInvoicesReportModel.cs @@ -16,6 +16,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 +133,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);