v1.1.1.0

SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController-Ajax.cs

@@ -33,9 +33,9 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			// Sport.
 			public long SportId { get; set; }
 			public String SportName { get; set; }
-			// Region.
-			public long RegionId { get; set; }
-			public String RegionName { get; set; }
+			// Region - country.
+			public long RegionIdCountry { get; set; }
+			public String RegionNameCountry { get; set; }
 			// Common properties.
 			public String StatusCode { get; set; }
 			public String StatusDesc { get; set; }
@@ -57,9 +57,9 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			using (SaxSport sport = ReferenceMgr.GetSportById(organisation.SportIdPrimary))
 				data.SportName = sport?.Name ?? "";
 			// Region.
-			data.RegionId = SysId.ToLong(organisation.RegionIdPrimary);
+			data.RegionIdCountry = SysId.ToLong(organisation.RegionIdPrimary);
 			using (SaxRegion region = ReferenceMgr.GetRegionById(organisation.RegionIdPrimary))
-				data.RegionName = region?.Name ?? "";
+				data.RegionNameCountry = region?.Name ?? "";
 			// Common properties.
 			data.StatusCode = organisation.StatusCode;
 			data.StatusDesc = organisation.StatusDesc;
@@ -154,8 +154,8 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 						MemberCount = StringUtil.ToLong(values.GetString(colMemberCount.DataName)),
 						SportId = values.GetLong(colSportId.DataName),
 						SportName = values.GetString(colSportName.DataName),
-						RegionId = values.GetLong(colRegionId.DataName),
-						RegionName = values.GetString(colRegionName.DataName),
+						RegionIdCountry = values.GetLong(colRegionId.DataName),
+						RegionNameCountry = values.GetString(colRegionName.DataName),
 						StatusCode = values.GetString(colStatus.DataName),
 						StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName))
 					};
@@ -257,8 +257,8 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 				organisation.OrganisationCategory = model.OrganisationCategory;
 			if (model.OrganisationSportId != null)
 				organisation.SportIdPrimary = model.OrganisationSportId.ToSysId();
-			if (model.OrganisationRegionId != null)
-				organisation.RegionIdPrimary = model.OrganisationRegionId.ToSysId();
+			if (model.OrganisationRegionIdCountry != null)
+				organisation.RegionIdPrimary = model.OrganisationRegionIdCountry.ToSysId();
 			// Common properties.
 			if (model.OrganisationStatusCode != null)
 				organisation.Status = model.OrganisationStatus;