v1.1.2.0

SaxoniteStandardBase/Base/Bus/SaxOrganisation.cs

@@ -66,7 +66,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 			// Data members.
 			private readonly DataProperties data = new DataProperties();
 			// Construction.
-			public Data ()
+			public Data()
 			{
 				Status = DefaultStatus;
 			}
@@ -107,7 +107,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 				set { CheckChanged(data.RegionIdPrimary, value); data.RegionIdPrimary = value; }
 			}
 			// Population.
-			internal void PopulateFrom (Data data)
+			internal void PopulateFrom(Data data)
 			{
 				Name = data.Name;
 				OrganisationType = data.OrganisationType;
@@ -118,7 +118,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 				RegionIdPrimary = data.RegionIdPrimary;
 				base.PopulateFrom(data);
 			}
-			public Data Clone ()
+			public Data Clone()
 			{
 				Data data = new Data();
 				data.PopulateFrom(this);
@@ -146,7 +146,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 
 		//-------------------------------------------------------------------
 		// Construction.
-		protected SaxOrganisation (SysId id) : base(id)
+		protected SaxOrganisation(SysId id) : base(id)
 		{
 			base.SetData(data);
 			Status = DefaultStatus;
@@ -156,6 +156,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 		// Status.
 		private static readonly List<SaStatus> validStatuses = new List<SaStatus>()
 		{
+			SaStatus.Awaiting,
 			SaStatus.Active,
 			SaStatus.OnHold,
 			SaStatus.Inactive,
@@ -163,7 +164,7 @@ namespace Saxonite.Net.Standard.Base.Bus
 		};
 		public static SaStatus DefaultStatus { get { return SaStatus.Active; } }
 		public static List<SaStatus> ValidStatuses { get { return new List<SaStatus>(validStatuses); } }
-		public static DataValue.TriStateType GetStatusTriState (SaStatus status)
+		public static DataValue.TriStateType GetStatusTriState(SaStatus status)
 		{
 			if (status == SaStatus.Active) return DataValue.TriStateType.Green;
 			if (status == SaStatus.OnHold) return DataValue.TriStateType.Amber;
@@ -174,15 +175,23 @@ namespace Saxonite.Net.Standard.Base.Bus
 
 		//-------------------------------------------------------------------
 		// Utilities.
-		public ItemId GetItemId ()
+		public ItemId GetItemId()
 		{
 			return new ItemId((short)Sax.DataItemType.Organisation, Id);
 		}
+		// Sport is mandatory for certain organisation categories.
+		public static bool IsSportMandatory(Sax.OrganisationCategory organisationCategory)
+		{
+			if (organisationCategory == Sax.OrganisationCategory.Club) return true;
+			if (organisationCategory == Sax.OrganisationCategory.Association) return true;
+			if (organisationCategory == Sax.OrganisationCategory.Education) return true;
+			return false;
+		}
 
 		//-------------------------------------------------------------------
 		// Properties.
-		public Data GetData () { return data.Clone(); }
-		public void SetData (Data data)
+		public Data GetData() { return data.Clone(); }
+		public void SetData(Data data)
 		{
 			String fn = GetType().Name + ".SetData";
 			// Properties that cannot be changed if previously specified.
@@ -240,9 +249,11 @@ namespace Saxonite.Net.Standard.Base.Bus
 		public enum StatusCat
 		{
 			Any,
-			NotDeleted,
+			AwaitingOnly,
 			ActiveOnly,
-			InctiveOnly,
+			InactiveOnly,
+			NotDeleted,
+			DeletedOnly,
 		}
 		/// <summary>
 		/// Item list parameters.
@@ -254,6 +265,8 @@ namespace Saxonite.Net.Standard.Base.Bus
 			public List<SysId> IdsExcluded { get; } = new List<SysId>();
 			public String NameFull { get; set; }
 			public String NamePartial { get; set; }
+			public Sax.OrganisationCategory OrganisationCategory { get; set; } = Sax.OrganisationCategory.Unknown;
+			public Sax.OrganisationType OrganisationType { get; set; } = Sax.OrganisationType.Unknown;
 			/// <summary>Partial match on a number of fields, including name, sport, address, etc.</summary>
 			public String OrganisationFilter { get; set; }
 			public List<SysId> SportIdsIncluded { get; } = new List<SysId>();