Skip to content

Commit

Permalink
Merge pull request #997 from bcgov/feature/ab#27621-indigenous-core-f…
Browse files Browse the repository at this point in the history
…ield

Feature/ab#27621 Add Indigenous core field using indigenousOrgInd
  • Loading branch information
jimmyPasta authored Jan 14, 2025
2 parents 18d1df5 + 4b18663 commit b00c109
Show file tree
Hide file tree
Showing 13 changed files with 1,050 additions and 1,004 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class CreateUpdateApplicantInfoDto : CustomDataFieldDto
public string? SubSector { get; set; }
public string? SectorSubSectorIndustryDesc { get; set; } = string.Empty;
public bool? RedStop { get; set; }

public string? IndigenousOrgInd { get; set; }
public string? ContactFullName { get; set; }
public string? ContactTitle { get; set; }
public string? ContactEmail { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ public class GrantApplicationApplicantDto : AuditedEntityDto<Guid>
public string OrganizationSize { get; set; } = string.Empty;
public string SectorSubSectorIndustryDesc { get; set; } = string.Empty;
public bool RedStop { get; set; } = false;
public string IndigenousOrgInd { get; set; } = string.Empty;
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ private async Task<Applicant> CreateNewApplicantAsync(IntakeMapping intakeMap)
SubSector = intakeMap.SubSector,
SectorSubSectorIndustryDesc = intakeMap.SectorSubSectorIndustryDesc,
ApproxNumberOfEmployees = intakeMap.ApproxNumberOfEmployees,
IndigenousOrgInd = intakeMap.IndigenousOrgInd ?? "N",
IndigenousOrgInd = intakeMap.IndigenousOrgInd,
OrgStatus = intakeMap.OrgStatus,
RedStop = false
RedStop = false,
};

return await applicantRepository.InsertAsync(applicant);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public async Task<ApplicationApplicantInfoDto> GetByApplicationIdAsync(Guid appl
SectorSubSectorIndustryDesc = applicantInfo.Applicant?.SectorSubSectorIndustryDesc ?? string.Empty,
SubSector = applicantInfo.Applicant?.SubSector ?? string.Empty,
RedStop = applicantInfo.Applicant?.RedStop ?? false,
IndigenousOrgInd = applicantInfo.Applicant?.IndigenousOrgInd ?? string.Empty,

SigningAuthorityBusinessPhone = applicantInfo.SigningAuthorityBusinessPhone ?? string.Empty,
SigningAuthorityCellPhone = applicantInfo.SigningAuthorityCellPhone ?? string.Empty,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ public async Task<GrantApplicationDto> UpdateProjectApplicantInfoAsync(Guid id,
applicant.Sector = input.Sector ?? "";
applicant.SubSector = input.SubSector ?? "";
applicant.SectorSubSectorIndustryDesc = input.SectorSubSectorIndustryDesc ?? "";
applicant.IndigenousOrgInd = input.IndigenousOrgInd ?? "";

_ = await _applicantRepository.UpdateAsync(applicant);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ private async Task<string> FormatApplicantJsonAsync(Applicant? applicant)
FiscalYearMonth = applicant.FiscalMonth,
BusinessNumber = applicant.BusinessNumber,
RedStop = applicant.RedStop,
IndigenousOrgInd = applicant.IndigenousOrgInd,
PhysicalAddressUnit = applicantPhysicalAgent?.Unit ?? "",
PhysicalAddressLine1 = applicantPhysicalAgent?.Street ?? "",
PhysicalAddressLine2 = applicantPhysicalAgent?.Street2 ?? "",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System.Collections.Generic;
using System.Collections.Immutable;

namespace Unity.GrantManager.GrantApplications;

public static class ApplicantInfoOptionsList
{
public static ImmutableDictionary<string, string> IndigenousList =>
ImmutableDictionary.CreateRange(new[]
{
new KeyValuePair<string, string>("Yes", "Yes"),
new KeyValuePair<string, string>("No", "No"),
});

}
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@
"ApplicantInfoView:ApplicantInfo.OrgBookStatus": "Org book status ",
"ApplicantInfoView:ApplicantInfo.OrganizationType": "Organization Type",
"ApplicantInfoView:ApplicantInfo.OrganizationSize": "Organization Size",
"ApplicantInfoView:ApplicantInfo.IndigenousOrgInd": "Indigenous",
"ApplicantInfoView:ApplicantInfo.Sector": "Sector",
"ApplicantInfoView:ApplicantInfo.SubSector": "Sub-sector",
"ApplicantInfoView:ApplicantInfo.RedStop": "Red-Stop",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class ApplicantResult
public string? FiscalYearMonth { get; set; } = string.Empty;
public string? BusinessNumber { get; set; } = string.Empty;
public bool? RedStop { get; set; }
public string? IndigenousOrgInd { get; set; } = string.Empty;
public string? PhysicalAddressUnit { get; set; } = string.Empty;
public string? PhysicalAddressLine1 { get; set; } = string.Empty;
public string? PhysicalAddressLine2 { get; set; } = string.Empty;
Expand Down
Loading

0 comments on commit b00c109

Please sign in to comment.