diff --git a/Basic/Types/Swarm/BasicApplicant.cs b/Basic/Types/Swarm/BasicApplicant.cs index 8044d9c3..4267d631 100644 --- a/Basic/Types/Swarm/BasicApplicant.cs +++ b/Basic/Types/Swarm/BasicApplicant.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics.Eventing.Reader; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -9,13 +10,39 @@ namespace Swarmops.Basic.Types.Swarm { public class BasicApplicant: IHasIdentity { + // public ctor - for use by database class + + BasicApplicant(int applicantId, int personId, int organizationId, DateTime createdDateTime, bool open, + DateTime grantedDateTime, int grantedByPersonId, int score1, int score2, int score3) + { + this.ApplicantId = applicantId; + this.PersonId = personId; + this.OrganizationId = organizationId; + this.Open = open; + this.CreatedDateTime = createdDateTime; + this.GrantedDateTime = grantedDateTime; + this.GrantedByPersonId = grantedByPersonId; + this.Score1 = score1; + this.Score2 = score2; + this.Score3 = score3; + } + private BasicApplicant(BasicApplicant original) + : this( + original.Identity, original.PersonId, original.OrganizationId, original.CreatedDateTime, original.Open, + original.GrantedDateTime, original.GrantedByPersonId, original.Score1, original.Score2, original.Score3) + { + // copy ctor + } public int ApplicantId { get; private set; } public int PersonId { get; private set; } public int OrganizationId { get; private set; } public DateTime CreatedDateTime { get; private set; } + public bool Open { get; protected set; } + public DateTime GrantedDateTime { get; protected set; } + public int GrantedByPersonId { get; protected set; } public int Score1 { get; protected set; } public int Score2 { get; protected set; } public int Score3 { get; protected set; } diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs index 313439dc..19c43ce2 100644 --- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs +++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs @@ -934,7 +934,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial string description = this.TextPurpose.Text; - FinancialAccount budget = FinancialAccount.FromIdentity (Int32.Parse (Request.Form["DropBudgets"])); + FinancialAccount budget = FinancialAccount.FromIdentity (Int32.Parse (Request.Form["ComboBudgets"])); // sanity check