From 227b9ee742073331d94c5efca73fcae2b8e76876 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Thu, 2 Apr 2026 11:16:12 -0700 Subject: [PATCH 1/2] feature/AB#31226-Add UnityApplicationId to GrantApplicationLiteDto and update related components for application linking --- .../GrantApplications/GrantApplicationLiteDto.cs | 1 + .../GrantApplicationAppService.cs | 1 + .../ApplicationLinksModal.cshtml | 4 +++- .../Components/ApplicationLinksWidget/Default.js | 16 +++++++++++----- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs index 9a4381db8..0d9267bc8 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs @@ -10,4 +10,5 @@ public class GrantApplicationLiteDto : AuditedEntityDto public string ApplicantName { get; set; } = string.Empty; public string OrganizationName { get; set; } = string.Empty; public string UnityApplicantId { get; set; } = string.Empty; + public string UnityApplicationId { get; set; } = string.Empty; } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs index c587627aa..89761862d 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs @@ -1045,6 +1045,7 @@ from applicant in applicantGroup.DefaultIfEmpty() Id = applications.Id, ProjectName = applications.ProjectName, ReferenceNo = applications.ReferenceNo, + UnityApplicationId = applications.UnityApplicationId ?? string.Empty, ApplicantName = applicant != null ? (applicant.ApplicantName ?? GrantManagerConsts.UnknownValue) : GrantManagerConsts.UnknownValue, OrganizationName = applicant != null ? (applicant.OrgName ?? string.Empty) : string.Empty, UnityApplicantId = applicant != null ? (applicant.UnityApplicantId ?? string.Empty) : string.Empty diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationLinks/ApplicationLinksModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationLinks/ApplicationLinksModal.cshtml index 4757e953d..01839ffc8 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationLinks/ApplicationLinksModal.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationLinks/ApplicationLinksModal.cshtml @@ -46,7 +46,9 @@
- +
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationLinksWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationLinksWidget/Default.js index 12cba200c..fa97add6d 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationLinksWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationLinksWidget/Default.js @@ -635,16 +635,22 @@ $(function () { const refNo = (app.ReferenceNo || '').toLowerCase(); const applicantName = (app.ApplicantName || '').toLowerCase(); const orgName = (app.OrganizationName || '').toLowerCase(); + const applicationId = (app.UnityApplicationId || '').toString().toLowerCase(); return id.includes(inputValue) || refNo.includes(inputValue) || applicantName.includes(inputValue) - || orgName.includes(inputValue); + || orgName.includes(inputValue) + || applicationId.includes(inputValue); }) .map(app => { - - const idPart = app.UnityApplicantId ? ` - (${app.UnityApplicantId})` : ''; - const orgPart = app.OrganizationName ? ` - (${app.OrganizationName})` : ''; - return `Submission #${app.ReferenceNo} - ${app.ApplicantName}${idPart}${orgPart}`; + // Submission # (Application Id) - Applicant Name/Organization Name (Applicant Id) + const idPart = app.UnityApplicantId ? ` (${app.UnityApplicantId})` : ''; + const applicationIdPart = app.UnityApplicationId ? ` (${app.UnityApplicationId})` : ''; + const orgName = app.OrganizationName ? ` - ${app.OrganizationName}` : ''; + const orgPart = app.ApplicantName === '' ? orgName : ''; + const applicantPart = app.ApplicantName ? ` - ${app.ApplicantName}` : ''; + + return `${app.ReferenceNo}${applicationIdPart}${applicantPart}${orgPart}${idPart}`; }); if (suggestions.length > 0) { From b19c88851a5f698a750952d0f744004b12a78c12 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Thu, 2 Apr 2026 11:18:16 -0700 Subject: [PATCH 2/2] hotfix/AB#32532-OneTimeConsidertation-FixNullable --- .../20260401221346_FundingAddOneTimeConsideration.Designer.cs | 3 +++ .../20260401221346_FundingAddOneTimeConsideration.cs | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.Designer.cs index 40f4df1f8..e6ccefeca 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.Designer.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.Designer.cs @@ -2196,6 +2196,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("GrantCategory") .HasColumnType("text"); + b.Property("OneTimeConsideration") + .HasColumnType("numeric"); + b.Property("LastModificationTime") .HasColumnType("timestamp without time zone") .HasColumnName("LastModificationTime"); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.cs index f18f9a3fd..d79a790d0 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.cs @@ -13,7 +13,8 @@ protected override void Up(MigrationBuilder migrationBuilder) migrationBuilder.AddColumn( name: "OneTimeConsideration", table: "FundingHistories", - type: "numeric"); + type: "numeric", + nullable: true); } ///