diff --git a/Common/Common.csproj b/Common/Common.csproj index 6bb5c6ee..36fde797 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -32,6 +32,7 @@ + diff --git a/Database/Database-Participation.cs b/Database/Database-Participation.cs index 636f6946..32551ff6 100644 --- a/Database/Database-Participation.cs +++ b/Database/Database-Participation.cs @@ -5,6 +5,7 @@ using System.Data.Common; using MySql.Data.Types; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Swarm; +using Swarmops.Common; using Swarmops.Common.Enums; using Swarmops.Common.Interfaces; @@ -454,7 +455,7 @@ namespace Swarmops.Database int personId = reader.GetInt32 (1); int organizationId = reader.GetInt32 (2); bool active = reader.GetBoolean (3); - DateTime expires = DateTime.MaxValue; + DateTime expires = Constants.DateTimeHigh; try { expires = reader.GetDateTime(4); @@ -472,7 +473,7 @@ namespace Swarmops.Database } catch (MySqlConversionException) { - // as above, ignore exception and go with DateTime.MaxValue + // as above, ignore exception and go with Constants.DateTimeHigh } // bool terminatedAsInvalid = reader.GetBoolean(7); Ignore this field for now diff --git a/Logic/Financial/Payouts.cs b/Logic/Financial/Payouts.cs index 2b055ea6..a94277c8 100644 --- a/Logic/Financial/Payouts.cs +++ b/Logic/Financial/Payouts.cs @@ -5,6 +5,7 @@ using System.Linq.Expressions; using NBitcoin; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; +using Swarmops.Common; using Swarmops.Database; using Swarmops.Logic.Communications; using Swarmops.Logic.Communications.Payload; @@ -284,7 +285,7 @@ namespace Swarmops.Logic.Financial Salaries salaries = Salaries.ForOrganization (organization); List identityList = new List(); - DateTime payDay = DateTime.MaxValue; + DateTime payDay = Constants.DateTimeHigh; foreach (Salary salary in salaries) { diff --git a/Logic/Swarm/PositionAssignment.cs b/Logic/Swarm/PositionAssignment.cs index 69b7960f..4ea5840b 100644 --- a/Logic/Swarm/PositionAssignment.cs +++ b/Logic/Swarm/PositionAssignment.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using NBitcoin; using Swarmops.Basic.Types.Swarm; +using Swarmops.Common; using Swarmops.Common.Enums; using Swarmops.Database; using Swarmops.Logic.Security; @@ -83,7 +84,7 @@ namespace Swarmops.Logic.Swarm int positionAssignmentId = SwarmDb.GetDatabaseForWriting() .CreatePositionAssignment (position.OrganizationId, geographyId, position.Identity, person.Identity, createdByPersonId, createdByPositionId, - expiresDateTimeUtc == null ? new DateTime(2200,1,1) : (DateTime) expiresDateTimeUtc, assignmentNotes); // DateTime.MaxValue kills MySql layer + expiresDateTimeUtc == null ? Constants.DateTimeHigh : (DateTime) expiresDateTimeUtc, assignmentNotes); // DateTime.MaxValue kills MySql layer return FromIdentityAggressive (positionAssignmentId); } diff --git a/Site/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs b/Site/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs index 6dd4eede..bcfd4dfb 100644 --- a/Site/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; using Resources; +using Swarmops.Common; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; @@ -240,8 +241,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers // as determined by the ledger account Cash Advances - on targetDateTime. bool includeThisAdvance = false; - DateTime dateTimePaidBack = DateTime.MinValue; - DateTime dateTimePaidOut = DateTime.MaxValue; + DateTime dateTimePaidBack = Constants.DateTimeLow; + DateTime dateTimePaidOut = Constants.DateTimeHigh; if (!cashAdvance.PaidOut) diff --git a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs index 433e326a..2b490468 100644 --- a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs +++ b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs @@ -9,6 +9,7 @@ using System.Web.UI.WebControls; using Resources; using Swarmops.Basic.Types; using Swarmops.Basic.Types.Financial; +using Swarmops.Common; using Swarmops.Common.Enums; using Swarmops.Frontend; using Swarmops.Logic.Cache; @@ -976,8 +977,8 @@ namespace Swarmops.Site.Pages.Ledgers public ImportResults() { - this.EarliestTransaction = DateTime.MaxValue; - this.LatestTransaction = DateTime.MinValue; + this.EarliestTransaction = Constants.DateTimeHigh; + this.LatestTransaction = Constants.DateTimeLow; } }