From c386aff65a28c5b4cfc12d2b13bddbf4b3cf7dc7 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 16 Jan 2017 01:45:40 +0100 Subject: [PATCH] Changed a few more DateTime constants; many more to go --- Logic/Swarm/Participation.cs | 5 +++-- Site/Automation/Json-PositionsTree.aspx.cs | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Logic/Swarm/Participation.cs b/Logic/Swarm/Participation.cs index f623a512..68a9acaf 100644 --- a/Logic/Swarm/Participation.cs +++ b/Logic/Swarm/Participation.cs @@ -9,6 +9,7 @@ using Swarmops.Logic.Security; using Swarmops.Logic.Structure; using Swarmops.Logic.Support; using System.IO; +using Swarmops.Common.ExtensionMethods; namespace Swarmops.Logic.Swarm { @@ -58,7 +59,7 @@ namespace Swarmops.Logic.Swarm { if (base.Expires != value) { - if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1)) + if (PersonId > 0 && OrganizationId > 0 && base.Expires.IsDefined()) { ChurnData.LogRetention (PersonId, OrganizationId, base.Expires); } @@ -203,7 +204,7 @@ namespace Swarmops.Logic.Swarm //Added LogChurn here to make SURE they always are logged with the membership. - if (PersonId > 0 && OrganizationId > 0 && base.Expires != new DateTime (1900, 1, 1)) + if (PersonId > 0 && OrganizationId > 0 && base.Expires.IsDefined()) { ChurnData.LogChurn (PersonId, OrganizationId); } diff --git a/Site/Automation/Json-PositionsTree.aspx.cs b/Site/Automation/Json-PositionsTree.aspx.cs index b2a64771..9c989019 100644 --- a/Site/Automation/Json-PositionsTree.aspx.cs +++ b/Site/Automation/Json-PositionsTree.aspx.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Globalization; using Swarmops.Common.Enums; +using Swarmops.Common.ExtensionMethods; using Swarmops.Common.Generics; using Swarmops.Logic.Financial; using Swarmops.Logic.Security; @@ -160,9 +161,8 @@ namespace Swarmops.Frontend.Automation if (assignments.Count > 0) { assignedName = assignments[0].Person.Canonical; - int expireYear = assignments[0].ExpiresDateTimeUtc.Year; - if (expireYear > 2000 && expireYear < 3000) // as in, "is defined" - { + if (assignments[0].ExpiresDateTimeUtc.IsDefined()) + { expires = assignments[0].ExpiresDateTimeUtc.ToString("yyyy-MMM-dd"); } if (_assignable)