Dev

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs

@@ -10,4 +10,5 @@ public class GrantApplicationLiteDto : AuditedEntityDto<Guid>
     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;
 }

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

applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260401221346_FundingAddOneTimeConsideration.cs

@@ -13,7 +13,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.AddColumn<decimal>(
                 name: "OneTimeConsideration",
                 table: "FundingHistories",
-                type: "numeric");
+                type: "numeric",
+                nullable: true);
         }
 
         /// <inheritdoc />

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationLinks/ApplicationLinksModal.cshtml

@@ -46,7 +46,9 @@
 
         <!-- Search input -->
         <div class="mb-3">
-            <label class="form-label" for="submissionSearch">Submission to link (Search Submission #, Applicant Name, Application ID, Organization Name)</label>
+            <label class="form-label" for="submissionSearch">
+                Submission # (Application Id) - Applicant Name/Organization Name (Applicant Id)
+            </label>
             <div class="search-input-container">
                 <input type="text" id="submissionSearch" class="form-control" placeholder="Search for Submission..." autocomplete="off">
             </div>

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) {