andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.2.0

Browse Source
This commit is contained in:
andy
2021-07-10 14:23:14 +01:00
parent 03ea1058be
commit 10907d3aff
97 changed files with 2048 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/Admin/Models/Model_Organisation.cs
+25 -4
View File
@@ -1,4 +1,5 @@
using Sarand.Net.Standard.Base.App;
using Microsoft.AspNetCore.Mvc.Rendering;
using Sarand.Net.Standard.Base.App;
using Sarand.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.Core;
using Sarand.Net.Standard.Base.Utils;
@@ -33,6 +34,9 @@ namespace Saxonite.Net.Core.Web.Admin.Models
public String Organisation { get; set; }
public String OrganisationTypeCode { get; set; }
public String OrganisationCategoryCode { get; set; }
public String OrganisationSportId { get; set; }
public String OrganisationRegionId { get; set; }
public String OrganisationStatusCategoryCode { get; set; }
}
public FilterData Filter { get; } = new FilterData();
public Sax.OrganisationType FilterOrganisationType
@@ -43,6 +47,25 @@ namespace Saxonite.Net.Core.Web.Admin.Models
{
get { return (Sax.OrganisationCategory)OrganisationCategoryCodes.GetTypeForCode(Filter.OrganisationCategoryCode); }
}
public SaxOrganisation.StatusCat FilterOrganisationStatusCategory
{
get { return EnumUtil.ParseEnum(Filter.OrganisationStatusCategoryCode, SaxOrganisation.StatusCat.Any); }
}
/// <summary>Organisation Status Categories for filter.</summary>
public IEnumerable<SelectListItem> OrganisationFilterStatusCategoriesForSelect
{
get
{
List<CodeDesc> statusCategories = new List<CodeDesc>();
statusCategories.Add(SaxOrganisation.StatusCat.Any.ToString(), Localiser["label.any"]);
statusCategories.Add(SaxOrganisation.StatusCat.AwaitingOnly.ToString(), "Awaiting");
statusCategories.Add(SaxOrganisation.StatusCat.ActiveOnly.ToString(), "Active");
statusCategories.Add(SaxOrganisation.StatusCat.InactiveOnly.ToString(), "Inactive");
statusCategories.Add(SaxOrganisation.StatusCat.NotDeleted.ToString(), "Not deleted");
statusCategories.Add(SaxOrganisation.StatusCat.DeletedOnly.ToString(), "Deleted");
return new SelectList(statusCategories, "Code", "Desc", SaxOrganisation.StatusCat.Any.ToString());
}
}
//-------------------------------------------------------------------
// Organisation properties.
@@ -62,9 +85,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
// Utilities.
public bool IsSportMandatory()
{
if (OrganisationCategory == Sax.OrganisationCategory.Club) return true;
if (OrganisationCategory == Sax.OrganisationCategory.Association) return true;
return false;
return SaxOrganisation.IsSportMandatory(OrganisationCategory);
}
//-------------------------------------------------------------------
SaxoniteCoreWebAdmin/Admin/Models/Model_OrganisationMembers.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
// User Account.
if (MemberUserAccountId != null)
{
SysId memberUserAccountId = new SysId(StringUtil.ToLong(MemberUserAccountId));
SysId memberUserAccountId = MemberUserAccountId.ToSysId();
if (!SysId.IsValid(memberUserAccountId))
responseData.SetControlError(nameof(MemberUserAccountId), Localiser["msg.validation.mandatory.value"]);
}