From d95d49d4c6fd46e259ee86a3d4583e94ca9b0c00 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 25 Oct 2022 11:55:32 +0100 Subject: [PATCH] v1.2.9.1 --- SaxoniteCoreWeb/Base/App/SaxLocaliser.cs | 6 + .../Base/Consoles/SaxActivityConsole_Web.cs | 4 +- .../Base/Controllers/SaxController_Base.cs | 5 +- SaxoniteCoreWeb/Base/Models/SaxModel_Base.cs | 18 +- .../Admin/Controllers/ImageController.cs | 6 +- .../OrganisationController-Ajax-Members.cs | 2 +- SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js | 2 +- .../Localisation/SaxOnlineProperties.resx | 36 + .../AccountController-Ajax-Contact.cs | 12 +- .../AccountController-Ajax-Eligibility.cs | 462 +++++++++++++ .../AccountController-Ajax-Organisations.cs | 6 +- .../AccountController-Ajax-Sports.cs | 8 +- ...ountController-Ajax-UserSportExperience.cs | 8 +- .../Online/Controllers/AccountController.cs | 24 + .../Controllers/ActivityController-Ajax.cs | 10 +- .../Controllers/ArticleController-Ajax.cs | 16 +- .../Online/Controllers/ArticleController.cs | 2 +- .../Online/Controllers/ImageController.cs | 6 +- .../OrganisationController-Ajax-Events.cs | 4 +- .../OrganisationController-Ajax-Members.cs | 16 +- ...ganisationController-Ajax-Opportunities.cs | 4 +- .../OrganisationController-Ajax.cs | 6 +- .../Controllers/OrganisationController.cs | 2 +- .../Online/Models/Model_Account.cs | 7 +- .../Online/Models/Model_UserEligibility.cs | 112 ++++ .../Online/Models/SaxModel_Online.cs | 10 +- .../Views/Account/Organisations.cshtml | 26 + .../Views/Account/Profile-Eligibility.cshtml | 168 +++++ .../Account/Profile-Organisations.cshtml | 5 +- .../Account/Profile-SportExperiences.cshtml | 1 + .../Views/Account/Profile-Sports.cshtml | 21 +- .../Views/Account/Profile.cshtml | 6 +- .../Views/Account/Sports.cshtml | 11 + .../Views/Shared/_Layout.cshtml | 2 + .../wwwroot/js/sax-account.js | 8 +- SaxoniteCoreWebOnline/wwwroot/js/sax-home.js | 2 +- SaxoniteCoreWebOnline/wwwroot/js/sax-main.js | 2 +- .../wwwroot/js/sax-pro-elg.js | 233 +++++++ .../js/{sax-usr-spt-exp.js => sax-pro-exp.js} | 29 +- .../js/{sax-usr-org.js => sax-pro-org.js} | 0 .../js/{sax-usr-spt.js => sax-pro-spt.js} | 87 ++- .../js/{sax-usr-pro.js => sax-pro-usr.js} | 0 SaxoniteStandardBase/Base/App/Sax-Config.cs | 4 +- SaxoniteStandardBase/Base/App/Sax-Version.cs | 6 +- SaxoniteStandardBase/Base/App/Sax.cs | 21 +- .../Base/App/SaxDbDfn_Core.cs | 132 ++-- SaxoniteStandardBase/Base/App/SaxInternals.cs | 1 + .../Base/App/SaxSystem-CodeTypes.cs | 14 +- .../Base/Bus/SaxUserEligibility.cs | 323 +++++++++ .../Base/Consoles/SaxActivityConsole.cs | 2 +- .../Base/Mgr/SaxAccountMgr-UserEligibility.cs | 253 +++++++ SaxoniteStandardBase/Base/Mgr/SaxItemMgr.cs | 1 + .../Dbas/Bus/SaxUserEligibility_Dbas.cs | 33 + .../Dbas/Internal/ActivityFeedback_Db.cs | 2 +- .../Dbas/Internal/ActivityIndex_Db.cs | 2 +- .../Dbas/Internal/Article_Db.cs | 2 +- .../Dbas/Internal/ItemAddress_Db.cs | 2 +- .../Dbas/Internal/ItemAssociation_Db.cs | 2 +- .../Dbas/Internal/ItemImage_Db.cs | 2 +- .../Dbas/Internal/ItemSport_Db.cs | 2 +- .../Dbas/Internal/OrganisationEvent_Db.cs | 2 +- .../Internal/OrganisationOpportunity_Db.cs | 2 +- .../Dbas/Internal/Organisation_Db.cs | 2 +- .../Dbas/Internal/Region_Db.cs | 2 +- .../Dbas/Internal/Sport_Db.cs | 2 +- .../Dbas/Internal/UserAccount_Db.cs | 2 +- .../Dbas/Internal/UserActivity_Db.cs | 2 +- .../Dbas/Internal/UserEligibility_Db.cs | 230 +++++++ .../Dbas/Internal/UserOnline_Db.cs | 2 +- .../Dbas/Internal/UserOrganisation_Db.cs | 2 +- .../Dbas/Internal/UserRole_Db.cs | 2 +- .../Dbas/Internal/UserSession_Db.cs | 2 +- .../Dbas/Internal/UserSportExperience_Db.cs | 2 +- .../Dbas/Internal/UserSport_Db.cs | 2 +- .../Mgr/SaxAccountMgr_Dbas-UserEligibility.cs | 630 ++++++++++++++++++ .../Resources/Database/SaxDbDfn_Core.xml | 379 +++++++++++ 76 files changed, 3242 insertions(+), 222 deletions(-) create mode 100644 SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Eligibility.cs create mode 100644 SaxoniteCoreWebOnline/Online/Models/Model_UserEligibility.cs create mode 100644 SaxoniteCoreWebOnline/Views/Account/Organisations.cshtml create mode 100644 SaxoniteCoreWebOnline/Views/Account/Profile-Eligibility.cshtml create mode 100644 SaxoniteCoreWebOnline/Views/Account/Sports.cshtml create mode 100644 SaxoniteCoreWebOnline/wwwroot/js/sax-pro-elg.js rename SaxoniteCoreWebOnline/wwwroot/js/{sax-usr-spt-exp.js => sax-pro-exp.js} (92%) rename SaxoniteCoreWebOnline/wwwroot/js/{sax-usr-org.js => sax-pro-org.js} (100%) rename SaxoniteCoreWebOnline/wwwroot/js/{sax-usr-spt.js => sax-pro-spt.js} (57%) rename SaxoniteCoreWebOnline/wwwroot/js/{sax-usr-pro.js => sax-pro-usr.js} (100%) create mode 100644 SaxoniteStandardBase/Base/Bus/SaxUserEligibility.cs create mode 100644 SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-UserEligibility.cs create mode 100644 SaxoniteStandardDbas/Dbas/Bus/SaxUserEligibility_Dbas.cs create mode 100644 SaxoniteStandardDbas/Dbas/Internal/UserEligibility_Db.cs create mode 100644 SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserEligibility.cs diff --git a/SaxoniteCoreWeb/Base/App/SaxLocaliser.cs b/SaxoniteCoreWeb/Base/App/SaxLocaliser.cs index 5ff65e8..168736a 100644 --- a/SaxoniteCoreWeb/Base/App/SaxLocaliser.cs +++ b/SaxoniteCoreWeb/Base/App/SaxLocaliser.cs @@ -237,6 +237,12 @@ namespace Saxonite.Net.Core.Web.Base.App return GetCodeTypeCaption(Sax.CodeType.RegionType, regionType); } + // Eligibility type. + public String GetEligibilityTypeCaption(Sax.EligibilityType regionType) + { + return GetCodeTypeCaption(Sax.CodeType.EligibilityType, regionType); + } + // User role. public String GetUserRoleCaption(Sax.UserRole userRole) { diff --git a/SaxoniteCoreWeb/Base/Consoles/SaxActivityConsole_Web.cs b/SaxoniteCoreWeb/Base/Consoles/SaxActivityConsole_Web.cs index 45867f5..4503c39 100644 --- a/SaxoniteCoreWeb/Base/Consoles/SaxActivityConsole_Web.cs +++ b/SaxoniteCoreWeb/Base/Consoles/SaxActivityConsole_Web.cs @@ -119,8 +119,8 @@ namespace Saxonite.Net.Core.Web.Base.Consoles Sax.DataItemType itemType = (Sax.DataItemType)values.GetLong(colItemType.DataName); ItemId itemId = new ItemId((short)itemType, new SysId(values.GetLong(colItemId.DataName))); DateTime effectiveOn = values.GetDate(colDataNameEffectiveOn); - ActivityData_Web activtyData = new ActivityData_Web(itemId, effectiveOn); - activityDataList.Add(activtyData); + ActivityData_Web activityData = new ActivityData_Web(itemId, effectiveOn); + activityDataList.Add(activityData); SaLogger.Info(fn + " Activity found - " + itemType.ToString() + ":" + SysId.ToString(itemId.Id) + ". Effective: " + DateUtil.Format(effectiveOn, "d-MMM-yyyy")); } } diff --git a/SaxoniteCoreWeb/Base/Controllers/SaxController_Base.cs b/SaxoniteCoreWeb/Base/Controllers/SaxController_Base.cs index ea91ac7..bb63793 100644 --- a/SaxoniteCoreWeb/Base/Controllers/SaxController_Base.cs +++ b/SaxoniteCoreWeb/Base/Controllers/SaxController_Base.cs @@ -117,6 +117,7 @@ namespace Saxonite.Net.Core.Web.Base.Controllers public List SportParticipationCodes { get { return Internals.SportParticipationCodes; } } public List SportOfficiatingCodes { get { return Internals.SportOfficiatingCodes; } } public List RegionTypeCodes { get { return Internals.RegionTypeCodes; } } + public List EligibilityTypeCodes { get { return Internals.EligibilityTypeCodes; } } public List UserRoleCodes { get { return Internals.UserRoleCodes; } } public List OrganisationTypeCodes { get { return Internals.OrganisationTypeCodes; } } public List OrganisationCategoryCodes { get { return Internals.OrganisationCategoryCodes; } } @@ -308,11 +309,11 @@ namespace Saxonite.Net.Core.Web.Base.Controllers if (SessionData == null || !SessionData.ValidUserSession) return false; SaxSessionDataConsole sessionDataConsole = SessionDataConsole; if (sessionDataConsole != null) - sessionDataConsole.RecordUserActive(UserAccountId, CreatedAt); + sessionDataConsole.RecordUserActive(SessionUserAccountId, CreatedAt); return true; } } - public SysId UserAccountId { get { return SessionData?.User?.UserAccountId ?? null; } } + public SysId SessionUserAccountId { get { return SessionData?.User?.UserAccountId ?? null; } } public DbUpdateInfo DbUpdateInfo { get { return SessionData?.DbUpdateInfo ?? new DbUpdateInfo(null, "", SaxSystem.ComputerName); } } // Referrer. public String Referer { get { return Request.Headers["Referer"].ToString(); } } diff --git a/SaxoniteCoreWeb/Base/Models/SaxModel_Base.cs b/SaxoniteCoreWeb/Base/Models/SaxModel_Base.cs index 2b2c9b7..e2b5b26 100644 --- a/SaxoniteCoreWeb/Base/Models/SaxModel_Base.cs +++ b/SaxoniteCoreWeb/Base/Models/SaxModel_Base.cs @@ -16,6 +16,7 @@ using Saxonite.Net.Standard.Base.Mgr; using System; using System.Collections.Generic; using System.Globalization; +using static Saxonite.Net.Standard.Base.App.Sax; namespace Saxonite.Net.Core.Web.Base.Models { @@ -60,12 +61,12 @@ namespace Saxonite.Net.Core.Web.Base.Models public String InstanceVersion { get { return !StringUtil.IsEmpty(App.AppConfig.Instance) ? App.AppConfig.Instance + " v" + Sax.Version.GetFullVersion() : "v" + Sax.Version.GetAppVersion(); } } public bool IncludeGoogleAnalytics { get; set; } = false; // Views can be registered to avoid multiple inclusions in a page. - private HashSet registeredViews = new HashSet(StringComparer.OrdinalIgnoreCase); + private HashSet registeredViews = new HashSet(StringComparer.OrdinalIgnoreCase); /// /// Views can be registered to avoid multiple inclusions in a page. /// Only generate view content if this method returns true. /// - public bool RegisterView (String viewName) + public bool RegisterView(String viewName) { #if DEBUG if (registeredViews.Contains(viewName)) @@ -93,6 +94,7 @@ namespace Saxonite.Net.Core.Web.Base.Models public List SportParticipationCodes { get { return Internals.SportParticipationCodes; } } public List SportOfficiatingCodes { get { return Internals.SportOfficiatingCodes; } } public List RegionTypeCodes { get { return Internals.RegionTypeCodes; } } + public List EligibilityTypeCodes { get { return Internals.EligibilityTypeCodes; } } public List UserRoleCodes { get { return Internals.UserRoleCodes; } } public List OrganisationTypeCodes { get { return Internals.OrganisationTypeCodes; } } public List OrganisationCategoryCodes { get { return Internals.OrganisationCategoryCodes; } } @@ -397,6 +399,18 @@ namespace Saxonite.Net.Core.Web.Base.Models get { return new SelectList(SaxSystem.GetCodesOfType(Sax.CodeType.Title), "Code", "Desc"); } } + /// List of eligibility types for dropdown. + public IEnumerable EligibilityTypesForSelect + { + get + { + List values = new List(); + foreach (TypeCodeDesc eligibilityType in Internals.EligibilityTypeCodes) + values.Add(new SelectListItem(Localiser.GetEligibilityTypeCaption((Sax.EligibilityType)eligibilityType.Type), eligibilityType.Code)); + return values; + } + } + /// List of Organisation Types for dropdown. public IEnumerable OrganisationTypesForSelect { diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/ImageController.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/ImageController.cs index 105993f..61aaea8 100644 --- a/SaxoniteCoreWebAdmin/Admin/Controllers/ImageController.cs +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/ImageController.cs @@ -46,7 +46,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers String userAccountIdParam = "";// ToDo Decrypt from uaie value. SysId userAccountId = userAccountIdParam.ToSysId(); if (!SysId.IsValid(userAccountId)) - userAccountId = UserAccountId; + userAccountId = SessionUserAccountId; return GetAccountContactImage(userAccountId, Sax.ImageType.Avatar); } @@ -68,7 +68,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers // Response should not be cached. Response.Headers[HeaderNames.CacheControl] = "no-cache, no-store, must-revalidate, max-age=0"; Response.Headers[HeaderNames.Expires] = "-1"; - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; return GetAccountContactImage(userAccountId, Sax.ImageType.Avatar_Upload); } @@ -191,7 +191,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers // Validate session and referrer. if (!ValidReferer || !ValidUserSession) return Forbid(); - ItemId userItemId = new ItemId((short)Sax.DataItemType.UserAccount, UserAccountId); + ItemId userItemId = new ItemId((short)Sax.DataItemType.UserAccount, SessionUserAccountId); // Extract encrypted parameters. NameValueCollection parameters = ExtractSessionParams(iie); diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController-Ajax-Members.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController-Ajax-Members.cs index f0b0e6a..cf3ba8b 100644 --- a/SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController-Ajax-Members.cs +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController-Ajax-Members.cs @@ -48,7 +48,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers data.Id = SysId.ToString(userOrganisation.Id); // User. data.UserAccountId = SysId.ToString(userAccount.Id); - if (userAccount.Id.Equals(UserAccountId)) data.Self = true; + if (userAccount.Id.Equals(SessionUserAccountId)) data.Self = true; data.EmailAddress = userAccount.EmailAddress; data.DisplayName = userAccount.GetDisplayName(); data.UserStatusCode = userAccount.StatusCode; diff --git a/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js b/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js index 37ff9b9..aacb0e2 100644 --- a/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js +++ b/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js @@ -139,7 +139,7 @@ { if (e.keyCode == 8 || e.keyCode == 46) { - $(this).datepicker('setDate', null); + $(this).datepicker('setDate', null).datepicker('hide').change(); } }); } diff --git a/SaxoniteCoreWebOnline/Localisation/SaxOnlineProperties.resx b/SaxoniteCoreWebOnline/Localisation/SaxOnlineProperties.resx index 2a00ae0..6a46d71 100644 --- a/SaxoniteCoreWebOnline/Localisation/SaxOnlineProperties.resx +++ b/SaxoniteCoreWebOnline/Localisation/SaxOnlineProperties.resx @@ -138,6 +138,18 @@ My Details + + Eligibility + + + Add Eligibility + + + Remove Eligibility + + + Update Eligibility + My Organisations @@ -183,6 +195,9 @@ Update Member + + My Eligibility + Solum Forti @@ -339,6 +354,9 @@ Effective + + Eligibility + Email @@ -354,6 +372,15 @@ Experience + + Expires + + + Expires on + + + Expiry + Facebook @@ -393,6 +420,9 @@ Image + + Info + Remember Me @@ -429,6 +459,12 @@ Month + + My Organisations + + + My Sports + Name diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Contact.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Contact.cs index 75bc3fd..44ae0eb 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Contact.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Contact.cs @@ -74,7 +74,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Utilites. private ItemId GetUserItemId(SysId userAccountId) { - return new ItemId((short)Sax.DataItemType.UserAccount, UserAccountId); + return new ItemId((short)Sax.DataItemType.UserAccount, userAccountId); } //------------------------------------------------------------------- @@ -122,11 +122,11 @@ namespace Saxonite.Net.Core.Web.Online.Controllers responseData.ImageContentTypes = SaxItemImage.GetValidContentTypes(Sax.DataItemType.UserAccount); // Retrieve user details. - SaxUserAccount userAccount = AccountMgr.GetUserAccountById(UserAccountId); + SaxUserAccount userAccount = AccountMgr.GetUserAccountById(SessionUserAccountId); disposableItems.Add(userAccount); if (userAccount == null) { - SaLogger.Warn(fn + " Failed to retrieve user account for Id: " + SysId.ToString(UserAccountId)); + SaLogger.Warn(fn + " Failed to retrieve user account for Id: " + SysId.ToString(SessionUserAccountId)); return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); } @@ -218,7 +218,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers return Json(responseData.SetControlError("AccountContactImage", Localiser["msg.upload.image.resize.failed"])); // Image belongs to the user's account. - ItemId userItemId = GetUserItemId(UserAccountId); + ItemId userItemId = GetUserItemId(SessionUserAccountId); // Store uploaded image as 'Upload' Avatar - awaiting confirmation that the contact details are to be saved. SaxItemImage itemImage = ItemDataMgr.GetItemImage(userItemId, Sax.ImageType.Avatar_Upload, SaxItemImage.StatusCat.Any); @@ -291,11 +291,11 @@ namespace Saxonite.Net.Core.Web.Online.Controllers return Json(responseData); // Retrieve user details. - SaxUserAccount userAccount = AccountMgr.GetUserAccountById(UserAccountId); + SaxUserAccount userAccount = AccountMgr.GetUserAccountById(SessionUserAccountId); disposableItems.Add(userAccount); if (userAccount == null) { - SaLogger.Warn(fn + " Failed to retrieve user account for Id: " + SysId.ToString(UserAccountId)); + SaLogger.Warn(fn + " Failed to retrieve user account for Id: " + SysId.ToString(SessionUserAccountId)); return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); } if (!userAccount.EmailAddress.EqualsCI(SessionData.User.EmailAddress)) diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Eligibility.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Eligibility.cs new file mode 100644 index 0000000..85a5cba --- /dev/null +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Eligibility.cs @@ -0,0 +1,462 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using Saxonite.Net.Core.Web.Online.Models; +using Saxonite.Net.Core.Web.Base.App; +using Saxonite.Net.Core.Web.Base.Controllers; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; +using Saxonite.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Utils; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; +using Saxonite.Net.Standard.Base.App; +using MailKit; +using Org.BouncyCastle.Asn1.Mozilla; + +namespace Saxonite.Net.Core.Web.Online.Controllers +{ + //======================================================================= + // Online Account Controller - User Eligibility - Ajax actions. + //======================================================================= + partial class AccountController + { + //------------------------------------------------------------------- + // Data definitions. + private class UserEligibilityResponseListData : AjaxResponse_Data.ItemData_Base + { + public String UserAccountId { get; set; } + public String RegionName { get; set; } + public String EligibilityTypeDesc { get; set; } + public String Info { get; set; } + public String ExpiresOnFmt { get; set; } + } + private class UserEligibilityResponseItemData : UserEligibilityResponseListData + { + public String RegionId { get; set; } + public String EligibilityType { get; set; } + public String ExpiresOnFrm { get; set; } + } + private void PopulateUserEligibilityResponseListData(SaxModel_Online model, SaxUserEligibility userEligibility, UserEligibilityResponseListData data) + { + data.Id = model.EncryptId(userEligibility.Id); + data.UserAccountId = model.EncryptId(userEligibility.UserAccountId); + data.RegionName = model.GetRegionCaption(userEligibility.RegionId); + data.EligibilityTypeDesc = Localiser.GetEligibilityTypeCaption(userEligibility.EligibilityType); + data.Info = userEligibility.Info; + data.ExpiresOnFmt = model.FormatDateForDisplay(userEligibility.ExpiresOn); + } + private void PopulateUserEligibilityResponseItemData(SaxModel_Online model, SaxUserEligibility userEligibility, UserEligibilityResponseItemData data) + { + PopulateUserEligibilityResponseListData(model, userEligibility, data); + data.RegionId = model.GetEncryptedRegionId(userEligibility.RegionId); + data.EligibilityType = EligibilityTypeCodes.GetCodeForType(userEligibility.EligibilityType); + data.ExpiresOnFrm = model.FormatDateForForm(userEligibility.ExpiresOn); + data.CreatedOnFmt = model.FormatDateForDisplay(userEligibility.CreateStamp.On); + data.StatusCode = userEligibility.StatusCode; + data.StatusDesc = userEligibility.StatusDesc; + } + + //------------------------------------------------------------------- + // Account - Get User Eligibility list. + //------------------------------------------------------------------- + private class EligibilityTypeData + { + public String Code { get; set; } + public String Desc { get; set; } + /// Does the eligibility type allow a date range. + public bool? Dates { get; set; } = null; + } + private class AjaxResponse_UserEligibilityListData : AjaxResponse_Data + { + // Construction. + public AjaxResponse_UserEligibilityListData(SaxModel_Online model) : base(model) { } + // Eligibility list. + public List Eligibilities { get; } = new List(); + // Eligibility types. + public List Types { get; } = new List(); + } + // Ajax request. + [HttpPost] + [Route("Account/Ajax/GetUserEligibilities")] + [Route("Account/Ajax/GetUserEligibilityList")] + public IActionResult GetUserEligibilities(Model_UserEligibility model) + { + String fn = GetType().Name + ".GetUserEligibilities"; + AjaxResponse_UserEligibilityListData responseData = new AjaxResponse_UserEligibilityListData(model); + String messageTitle = Localiser["account.caption.profile.eligibility"]; + + // Validate session and referrer. + if (!ValidReferer) return Forbid(); + if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); + RefreshModel(model); + + // Eligibility types. + foreach (Sax.EligibilityType eligibilityType in EnumUtil.GetValues()) + { + EligibilityTypeData typeData = new EligibilityTypeData(); + typeData.Code = model.EligibilityTypeCodes.GetCodeForType(eligibilityType); + if (StringUtil.IsBlank(typeData.Code)) continue; + typeData.Desc = Localiser.GetEligibilityTypeCaption(eligibilityType); + if (SaxUserEligibility.AllowsApplicablePeriod(eligibilityType)) + typeData.Dates = true; + responseData.Types.Add(typeData); + } + + // User account. + SysId userAccountId = StringUtil.ToSysId(model.UserAccount.Id); + if (!SysId.IsValid(userAccountId)) + userAccountId = SessionUserAccountId; + + // Item filter. + SaxUserEligibility.Params prmUserEligibility = new SaxUserEligibility.Params(); + prmUserEligibility.UserAccountIdsIncluded.Add(userAccountId); + prmUserEligibility.StatusCat = SaxUserEligibility.StatusCat.NotDeleted; + prmUserEligibility.SortColumns.Add(AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.EligibilityType)); + model.Paging.ItemTotal = (ulong)AccountMgr.GetUserEligibilityCount(prmUserEligibility); + model.PopulatePagingTo(prmUserEligibility.ResultsPaging); + + // Item columns. + ColumnDfn colId = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.Id); + ColumnDfn colUserAccountId = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.UserAccountId); + ColumnDfn colRegionName = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.Region_Name); + ColumnDfn colEligibilityType = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.EligibilityType); + ColumnDfn colInfo = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.Info); + ColumnDfn colExpires = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.ExpiresOn); + ColumnDfn colStatus = AccountMgr.GetUserEligibilityColumnDfn(SaxUserEligibility.Column.Status); + List columns = new List() + { + colId,colUserAccountId, + colRegionName, colEligibilityType, + colInfo, colExpires, + colStatus, + }; + + // Sort columns. + prmUserEligibility.SortColumns.Add(colRegionName); + + // Query items. + using (DbResultSet resultSet = AccountMgr.ExecuteUserEligibilityQuery(columns, prmUserEligibility)) + { + while (resultSet != null && resultSet.HasRows && resultSet.NextRecord()) + { + NamedValue.Map values = resultSet.GetRecordValues(); + Sax.EligibilityType eligibilityType = (Sax.EligibilityType)values.GetLong(colEligibilityType.DataName); + UserEligibilityResponseListData userEligibilityData = new UserEligibilityResponseListData() + { + Id = model.EncryptId(new SysId(values.GetLong(colId.DataName))), + UserAccountId = model.EncryptId(new SysId(values.GetLong(colUserAccountId.DataName))), + RegionName = values.GetString(colRegionName.DataName), + EligibilityTypeDesc = Localiser.GetEligibilityTypeCaption(eligibilityType), + Info = values.GetString(colInfo.DataName), + ExpiresOnFmt = model.FormatDateForDisplay(values.GetDate(colExpires.DataName)), + StatusCode = values.GetString(colStatus.DataName), + StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName)) + }; + responseData.Eligibilities.Add(userEligibilityData); + } + } + if (model.Paging.IsPaged) + model.Paging.ItemCount = (ushort)responseData.Eligibilities.Count; + + // Complete response. + responseData.SetPaging(model); + responseData.Success = true; + return Json(responseData); + } + + //------------------------------------------------------------------- + // Get User Eligibility ajax request. + //------------------------------------------------------------------- + private class AjaxResponse_UserEligibility : AjaxResponse_Data + { + // Construction. + public AjaxResponse_UserEligibility(SaxModel_Online model) : base(model) { } + // Eligibility details. + public UserEligibilityResponseItemData Eligibility { get; } = new UserEligibilityResponseItemData(); + } + //------------------------------------------------------------------- + [HttpPost] + [Route("Account/Ajax/GetUserEligibility")] + public IActionResult Ajax_GetUserEligibility(Model_UserEligibility model) + { + String fn = GetType().Name + ".Ajax_GetUserEligibility"; + String messageTitle = Localiser["account.caption.profile.eligibility"]; + AjaxResponse_UserEligibility responseData = new AjaxResponse_UserEligibility(model); + + // Validate session and referrer. + if (!ValidReferer) return Forbid(); + if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); + RefreshModel(model); + + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + + // Identify item. + SysId userEligibilityId = model.ExtractSysId(model.Eligibility.Id); + if (!SysId.IsValid(userEligibilityId)) + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"])); + + // Retrieve item. + SaxUserEligibility userEligibility = AccountMgr.GetUserEligibilityById(userEligibilityId); + disposableItems.Add(userEligibility); + if (userEligibility == null) + { + SaLogger.Warn(fn + " Failed to retrieve User Eligibility for Id: '" + model.Eligibility.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Construct response. + PopulateUserEligibilityResponseItemData(model, userEligibility, responseData.Eligibility); + responseData.Success = true; + } + return Json(responseData); + } + + //------------------------------------------------------------------- + // Store User Eligibility ajax request. + //------------------------------------------------------------------- + private class AjaxResponse_StoreUserEligibility : AjaxResponse_Data + { + // Construction. + public AjaxResponse_StoreUserEligibility(SaxModel_Online model) : base(model) { } + // Eligibility details. + public UserEligibilityResponseItemData Eligibility { get; } = new UserEligibilityResponseItemData(); + } + //------------------------------------------------------------------- + [HttpPost] + [Route("Account/Ajax/StoreUserEligibility")] + public IActionResult Ajax_StoreUserEligibility(Model_UserEligibility model) + { + String fn = GetType().Name + ".Ajax_StoreUserEligibility"; + String messageTitle = Localiser["account.caption.profile.eligibility"]; + AjaxResponse_StoreUserEligibility responseData = new AjaxResponse_StoreUserEligibility(model); + + // Validate session and referrer. + if (!ValidReferer) return Forbid(); + if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); + RefreshModel(model); + + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + + // Validate item properties. + model.ValidateEligibilityDetails(responseData); + if (responseData.HasControlErrors()) + return Json(responseData); + + // User account. + SysId userAccountId = StringUtil.ToSysId(model.UserAccount.Id); + if (!SysId.IsValid(userAccountId)) + userAccountId = SessionUserAccountId; + + // Validate User Eligibility Id against 'Exists' flag. + SysId userEligibilityId = model.ExtractSysId(model.Eligibility.Id); + bool eligibilityExists = StringUtil.ToBool(model.Eligibility.Exists); + if (eligibilityExists && !SysId.IsValid(userEligibilityId)) + { + SaLogger.Warn(fn + " Id not specified for existing User Eligibility."); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + if (!eligibilityExists && SysId.IsValid(userEligibilityId)) + { + SaLogger.Warn(fn + " Id specified for new User Eligibility: '" + model.Eligibility.Id + "'"); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + + // Retrieve existing item. + SaxUserEligibility userEligibility = AccountMgr.GetUserEligibilityById(userEligibilityId); + disposableItems.Add(userEligibility); + if (userEligibility == null && SysId.IsValid(userEligibilityId)) + { + SaLogger.Warn(fn + " Failed to retrieve User Eligibility for Id: '" + model.Eligibility.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Validate user eligibility properties. + if (userEligibility != null) + { + if (!userEligibility.UserAccountId.Equals(userAccountId)) + { + SaLogger.Warn(fn + " Inconsistent User Account Id specified for User Eligibility. Expected: " + userEligibility.UserAccountId + ". Found: " + userAccountId); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + } + + // Region. + SysId regionId = model.Eligibility.RegionId != null ? model.DecryptId(model.Eligibility.RegionId) : userEligibility != null ? userEligibility.RegionId : null; + if (!SysId.IsValid(regionId)) + { + // Shouldn't get here. + SaLogger.Warn(fn + " Region Id not supplied for " + (eligibilityExists ? "existing" : "new") + " eligibility."); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + SaxRegion.Data region = Internals.GetRegion(regionId); + + // Eligibility type. + Sax.EligibilityType eligibilityType = userEligibility != null ? userEligibility.EligibilityType : model.Eligibility.getEligibilityType(); + if (eligibilityType <= 0) + { + // Shouldn't get here. + SaLogger.Warn(fn + " Eligibility type not specified for " + (eligibilityExists ? "existing" : "new") + " eligibility."); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + + // Check for duplicate data. + // ToDo Should include date range in checking for duplicate eligibility? + { + // First check without region. + SaxUserEligibility.Params prmUserEligibility = new SaxUserEligibility.Params(); + if (userEligibility != null) + prmUserEligibility.IdsExcluded.Add(userEligibility.Id); + prmUserEligibility.UserAccountIdsIncluded.Add(userAccountId); + prmUserEligibility.EligibilityTypesIncluded.Add(eligibilityType); + prmUserEligibility.StatusCat = SaxUserEligibility.StatusCat.NotDeleted; + long eligibilityCount = AccountMgr.GetUserEligibilityCount(prmUserEligibility); + // Selected Eligibility types have a limit on the number of instances allowed. + if (eligibilityCount >= SaxUserEligibility.GetMaxInstances(eligibilityType)) + return Json(responseData.SetMessage(messageTitle, Localiser["msg.validation.duplicate.value"])); + // Now include region - only allow one eligibility of each type. + prmUserEligibility.RegionIdsIncluded.Add(regionId); + eligibilityCount = AccountMgr.GetUserEligibilityCount(prmUserEligibility); + if (eligibilityCount >= 1) + return Json(responseData.SetMessage(messageTitle, Localiser["msg.validation.duplicate.value"])); + } + + // If eligibility doesn't exist for the user, it may have been previously deleted. + if (userEligibility == null) + { + SaxUserEligibility.Params prmUserEligibility = new SaxUserEligibility.Params(); + prmUserEligibility.UserAccountIdsIncluded.Add(userAccountId); + prmUserEligibility.RegionIdsIncluded.Add(regionId); + prmUserEligibility.EligibilityTypesIncluded.Add(eligibilityType); + prmUserEligibility.StatusCat = SaxUserEligibility.StatusCat.Any; + userEligibility = AccountMgr.GetUserEligibility(prmUserEligibility); + if (userEligibility != null) + { + disposableItems.Add(userEligibility); + if (userEligibility.Status == SaStatus.Deleted) + { + SaLogger.Info(fn + " Resurrecting User Eligibility with status: " + userEligibility.StatusDesc + ". Id: " + SysId.ToString(userEligibility.Id)); + userEligibility.Status = SaxUserEligibility.DefaultStatus; + } + else + return Json(responseData.SetMessage(messageTitle, Localiser["msg.validation.duplicate.value"])); + } + else + { + userEligibility = AccountMgr.CreateUserEligibility(userAccountId, regionId, eligibilityType); + disposableItems.Add(userEligibility); + } + } + + // Populate item properties. + if (model.Eligibility.Info != null) + userEligibility.Info = model.Eligibility.Info; + if (model.Eligibility.ExpiresOn != null) + userEligibility.ExpiresOn = model.ParseDateFromForm(model.Eligibility.ExpiresOn); + + // Store item. + if (!SysId.IsValid(userEligibility.Id)) + { + if (!AccountMgr.InsertUserEligibility(userEligibility, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to insert user eligibility: " + AccountMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"])); + } + } + else + { + if (!AccountMgr.UpdateUserEligibility(userEligibility, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to update user eligibility [Id:" + SysId.ToString(userEligibility.Id) + "]: " + AccountMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"])); + } + } + + // Construct response. + PopulateUserEligibilityResponseItemData(model, userEligibility, responseData.Eligibility); + responseData.Success = true; + } + return Json(responseData); + } + + //------------------------------------------------------------------- + // Remove User Eligibility ajax request. + //------------------------------------------------------------------- + private class AjaxResponse_RemoveUserEligibility : AjaxResponse_Data + { + // Construction. + public AjaxResponse_RemoveUserEligibility(SaxModel_Online model) : base(model) { } + } + //------------------------------------------------------------------- + [HttpPost] + [Route("Account/Ajax/RemoveUserEligibility")] + public IActionResult Ajax_RemoveUserEligibility(Model_UserEligibility model) + { + String fn = GetType().Name + ".Ajax_RemoveUserEligibility"; + String messageTitle = Localiser["account.caption.profile.eligibility"]; + AjaxResponse_UserEligibility responseData = new AjaxResponse_UserEligibility(model); + + // Validate session and referrer. + if (!ValidReferer) return Forbid(); + if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); + RefreshModel(model); + + // User account. + SysId userAccountId = StringUtil.ToSysId(model.UserAccount.Id); + if (!SysId.IsValid(userAccountId)) + userAccountId = SessionUserAccountId; + + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + + // User Eligibility Id. + SysId userEligibilityId = model.ExtractSysId(model.Eligibility.Id); + if (!SysId.IsValid(userEligibilityId)) + { + SaLogger.Warn(fn + " Id not specified to remove User Eligibility."); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + + // Retrieve existing item. + SaxUserEligibility userEligibility = AccountMgr.GetUserEligibilityById(userEligibilityId); + disposableItems.Add(userEligibility); + if (userEligibility == null) + { + SaLogger.Warn(fn + " Failed to retrieve User Eligibility for Id: '" + model.Eligibility.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Validate user eligibility properties. + if (!userEligibility.UserAccountId.Equals(userAccountId)) + { + SaLogger.Warn(fn + " Inconsistent User Account Id specified for User Eligibility. Expected: " + userEligibility.UserAccountId + ". Found: " + userAccountId); + return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); + } + + // Delete item. + if (!AccountMgr.DeleteUserEligibility(userEligibility, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to delete user eligibility [Id:" + SysId.ToString(userEligibility.Id) + "]: " + AccountMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"])); + } + + // Construct response. + PopulateUserEligibilityResponseItemData(model, userEligibility, responseData.Eligibility); + responseData.Success = true; + } + return Json(responseData); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Organisations.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Organisations.cs index 1208ddf..fef0b9e 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Organisations.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Organisations.cs @@ -166,7 +166,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Query organisations that user is a member of. SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationStatusCat = SaxOrganisation.StatusCat.ActiveOnly; prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.StatusCat = SaxUserOrganisation.StatusCat.ActiveOnly; @@ -294,7 +294,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers disposableItems.Add(address); // Check whether user is a member of this organisation. - SaxUserOrganisation userOrganisation = AccountMgr.GetUserOrganisationByUserOrganisation(UserAccountId, organisationId); + SaxUserOrganisation userOrganisation = AccountMgr.GetUserOrganisationByUserOrganisation(SessionUserAccountId, organisationId); disposableItems.Add(userOrganisation); if (userOrganisation != null) { @@ -402,7 +402,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Check whether user is a member of this organisation. - SaxUserOrganisation userOrganisation = AccountMgr.GetUserOrganisationByUserOrganisation(UserAccountId, organisationId); + SaxUserOrganisation userOrganisation = AccountMgr.GetUserOrganisationByUserOrganisation(SessionUserAccountId, organisationId); disposableItems.Add(userOrganisation); if (userOrganisation == null) { diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Sports.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Sports.cs index b415bbe..97dd1e8 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Sports.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-Sports.cs @@ -54,7 +54,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers data.SportAbout = userSport.About; data.SportParticipationCode = SportParticipationCodes.GetCodeForType(userSport.Participation); data.SportOfficiatingCode = SportOfficiatingCodes.GetCodeForType(userSport.Officiating); - data.CreatedOnFmt = DateUtil.Format(userSport.CreateStamp.On, "d-MMM-yyyy"); + data.CreatedOnFmt = model.FormatDateForDisplay(userSport.CreateStamp.On); data.StatusCode = userSport.StatusCode; data.StatusDesc = userSport.StatusDesc; } @@ -85,7 +85,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Item filter. SaxUserSport.Params prmUserSport = new SaxUserSport.Params(); - prmUserSport.UserAccountIdsIncluded.Add(UserAccountId); + prmUserSport.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserSport.StatusCat = SaxUserSport.StatusCat.NotDeleted; model.Paging.ItemTotal = (ulong)AccountMgr.GetUserSportCount(prmUserSport); model.PopulatePagingTo(prmUserSport.ResultsPaging); @@ -267,7 +267,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers if (userSport == null) { SaxUserSport.Params prmUserSport = new SaxUserSport.Params(); - prmUserSport.UserAccountIdsIncluded.Add(UserAccountId); + prmUserSport.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserSport.SportIdsIncluded.Add(sportId); prmUserSport.StatusCat = SaxUserSport.StatusCat.Any; userSport = AccountMgr.GetUserSport(prmUserSport); @@ -287,7 +287,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } else { - userSport = AccountMgr.CreateUserSport(UserAccountId, sportId); + userSport = AccountMgr.CreateUserSport(SessionUserAccountId, sportId); disposableItems.Add(userSport); } } diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-UserSportExperience.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-UserSportExperience.cs index ae8581d..f7d58ed 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-UserSportExperience.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-UserSportExperience.cs @@ -129,7 +129,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers SysId userSportId = model.ExtractSysId(model.UserSportId); SaxUserSport userSport = AccountMgr.GetUserSportById(userSportId); disposableItems.Add(userSport); - if (userSport == null || !userSport.UserAccountId.Equals(UserAccountId)) + if (userSport == null || !userSport.UserAccountId.Equals(SessionUserAccountId)) return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); // Sport details. @@ -226,7 +226,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers disposableItems.Add(userSportExperience); SaxUserSport userSport = AccountMgr.GetUserSportById(userSportExperience?.UserSportId ?? null); disposableItems.Add(userSport); - if (userSportExperience == null || userSport == null || !userSport.UserAccountId.Equals(UserAccountId)) + if (userSportExperience == null || userSport == null || !userSport.UserAccountId.Equals(SessionUserAccountId)) return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); // Populate data to response. @@ -285,7 +285,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers disposableItems.Add(userSportExperience); userSport = AccountMgr.GetUserSportById(userSportExperience?.UserSportId ?? null); disposableItems.Add(userSport); - if (userSportExperience == null || userSport == null || !userSport.UserAccountId.Equals(UserAccountId)) + if (userSportExperience == null || userSport == null || !userSport.UserAccountId.Equals(SessionUserAccountId)) return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); } else @@ -295,7 +295,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers SysId userSportId = model.ExtractSysId(model.UserSportId); userSport = AccountMgr.GetUserSportById(userSportId); disposableItems.Add(userSport); - if (userSport == null || !userSport.UserAccountId.Equals(UserAccountId)) + if (userSport == null || !userSport.UserAccountId.Equals(SessionUserAccountId)) return Json(responseData.SetGoHome(messageTitle, Localiser["msg.something.gone.wrong"])); // Create User Sport Experience. userSportExperience = AccountMgr.CreateUserSportExperience(userSport.Id); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/AccountController.cs b/SaxoniteCoreWebOnline/Online/Controllers/AccountController.cs index f8c5170..ebdab01 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/AccountController.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/AccountController.cs @@ -47,6 +47,30 @@ namespace Saxonite.Net.Core.Web.Online.Controllers return View(model); } + //------------------------------------------------------------------- + [HttpGet] + public IActionResult Sports() + { + // Validate session. + if (!ValidUserSession) + return RedirectToAction("", ""); + + Model_Account model = new Model_Account(Localiser); + return View(model); + } + + //------------------------------------------------------------------- + [HttpGet] + public IActionResult Organisations() + { + // Validate session. + if (!ValidUserSession) + return RedirectToAction("", ""); + + Model_Account model = new Model_Account(Localiser); + return View(model); + } + //------------------------------------------------------------------- } //======================================================================= diff --git a/SaxoniteCoreWebOnline/Online/Controllers/ActivityController-Ajax.cs b/SaxoniteCoreWebOnline/Online/Controllers/ActivityController-Ajax.cs index 78f19ca..e180920 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/ActivityController-Ajax.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/ActivityController-Ajax.cs @@ -116,7 +116,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers Organisation = model.GetOrganisationName(organisationEvent.OrganisationId); if (controller.ItemDataMgr.ItemHasActiveImage(organisation?.GetItemId() ?? null, Sax.ImageType.OrganisationLogo)) OrganisationLogoUrl = controller.GetOrganisationLogoLink(organisation.Id, false); - EventAt = DateUtil.Format(organisationEvent.EventAt, "d-MMM-yy"); + EventAt = model.FormatDateForDisplay(organisationEvent.EventAt); if (organisationEvent.EventAt.Hour > 0 || organisationEvent.EventAt.Minute > 0) EventAt += DateUtil.Format(organisationEvent.EventAt, " HH:ss"); Summary = organisationEvent.Summary; @@ -182,7 +182,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers SaxSessionData_Online sessionData = SessionData_Online; // User context. - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; SaxActivityConsole.IndexContext indexContext = new SaxActivityConsole.IndexContext(userAccountId); if (SysId.IsValid(userAccountId)) indexContext.UserAccountIdsOwner.Add(userAccountId); @@ -389,8 +389,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers responseData.Opportunity = new ActivityResponseData_Opportunity(this, model, opportunity, organisation); } - // Record activty viewing. - if (!ActivityConsole.RecordUserActivityViewed(UserAccountId, new ItemId((short)itemType, itemId), DbUpdateInfo)) + // Record activity viewing. + if (!ActivityConsole.RecordUserActivityViewed(SessionUserAccountId, new ItemId((short)itemType, itemId), DbUpdateInfo)) { SaLogger.Warn(fn + " Failed to record Activity Viewing: " + ActivityConsole.ErrorStateMessage + "." + GetLogSuffix()); return Json(responseData); @@ -435,7 +435,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Record activity reaction. - if (!ActivityConsole.RecordUserActivityReaction(UserAccountId, new ItemId((short)itemType, itemId), model.GetActivityReaction(), DbUpdateInfo)) + if (!ActivityConsole.RecordUserActivityReaction(SessionUserAccountId, new ItemId((short)itemType, itemId), model.GetActivityReaction(), DbUpdateInfo)) { SaLogger.Warn(fn + " Failed to record Activity Reaction: " + ActivityConsole.ErrorStateMessage + "." + GetLogSuffix()); return Json(responseData); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs index bebcf5c..c8363fa 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs @@ -87,8 +87,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers PopulateFeedbackResponseListData(activityFeedback, data); data.RegionCaptionPrimary = model.GetRegionCaption(article.RegionIdPrimary); data.SportCaptionPrimary = model.GetSportCaption(article.SportIdPrimary); - data.CreatedOnFmt = DateUtil.Format(article.CreateStamp.On, "d-MMM-yyyy"); - data.PublishedOnFmt = DateUtil.Format(article.PublishedAt, "d-MMM-yyyy"); + data.CreatedOnFmt = model.FormatDateForDisplay(article.CreateStamp.On); + data.PublishedOnFmt = model.FormatDateForDisplay(article.PublishedAt); data.StatusCode = article.StatusCode; data.StatusDesc = article.StatusDesc; } @@ -173,14 +173,14 @@ namespace Saxonite.Net.Core.Web.Online.Controllers if (!ValidReferer) return Forbid(); if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); SaxSessionData_Online sessionData = SessionData_Online; - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; RefreshModel(model); // Record disposable items as they are created so all can be disposed when needed. using (DisposableCollection disposableItems = new DisposableCollection()) { // User account. - SaxUserAccount userAccount = AccountMgr.GetUserAccountById(UserAccountId); + SaxUserAccount userAccount = AccountMgr.GetUserAccountById(userAccountId); disposableItems.Add(userAccount); // Organisations that the user has rights to author articles for. @@ -292,8 +292,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers Summary = values.GetString(colSummary.DataName), RegionCaptionPrimary = model.GetRegionCaption(values.GetString(colRegionIdPrimary.DataName).ToSysId()), SportCaptionPrimary = model.GetSportCaption(values.GetString(colSportIdPrimary.DataName).ToSysId()), - CreatedOnFmt = DateUtil.Format(values.GetDateTime(colCreatedOn.DataName), "d-MMM-yyyy"), - PublishedOnFmt = DateUtil.Format(values.GetDateTime(colPublishedOn.DataName), "d-MMM-yyyy"), + CreatedOnFmt = model.FormatDateForDisplay(values.GetDateTime(colCreatedOn.DataName)), + PublishedOnFmt = model.FormatDateForDisplay(values.GetDateTime(colPublishedOn.DataName)), StatusCode = values.GetString(colStatus.DataName), StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName)) }; @@ -338,7 +338,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Validate session and referrer. if (!ValidReferer) return Forbid(); if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; RefreshModel(model); // Record disposable items as they are created so all can be disposed when needed. @@ -552,7 +552,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers return Json(responseData); // Validate User & Organisation. - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; SysId organisationId = model.ExtractSysId(model.ArticleOrganisationId); if (SysId.IsValid(organisationId)) { diff --git a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController.cs b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController.cs index 48ff84f..953eab5 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController.cs @@ -34,7 +34,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers return RedirectToAction("", ""); // User must either be a Journalist or have Article Admin rights with at least one organisation. - List organisations = AccountMgr.GetOrganisationsForAnyUserRole(UserAccountId, new [] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.ArticleAdmin }); + List organisations = AccountMgr.GetOrganisationsForAnyUserRole(SessionUserAccountId, new [] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.ArticleAdmin }); if (organisations.Count < 1 && !UserIsJournalist) return RedirectToAction("", ""); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/ImageController.cs b/SaxoniteCoreWebOnline/Online/Controllers/ImageController.cs index 0d4e489..6e93d50 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/ImageController.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/ImageController.cs @@ -59,7 +59,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers String userAccountIdParam = "";// ToDo Decrypt from uaie value. SysId userAccountId = userAccountIdParam.ToSysId(); if (!SysId.IsValid(userAccountId)) - userAccountId = UserAccountId; + userAccountId = SessionUserAccountId; return GetAccountContactImage(userAccountId, Sax.ImageType.Avatar); } @@ -81,7 +81,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Response should not be cached. Response.Headers[HeaderNames.CacheControl] = "no-cache, no-store, must-revalidate, max-age=0"; Response.Headers[HeaderNames.Expires] = "-1"; - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; return GetAccountContactImage(userAccountId, Sax.ImageType.Avatar_Upload); } @@ -206,7 +206,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Validate session and referrer. if (!ValidReferer) return Forbid(); if (!ValidUserSession) return Forbid(); - ItemId userItemId = new ItemId((short)Sax.DataItemType.UserAccount, UserAccountId); + ItemId userItemId = new ItemId((short)Sax.DataItemType.UserAccount, SessionUserAccountId); // Extract encrypted parameters. NameValueCollection parameters = ExtractOnlineParams(iie); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Events.cs b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Events.cs index 26635d3..1d890d8 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Events.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Events.cs @@ -116,7 +116,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers if (!ValidReferer) return Forbid(); if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); RefreshModel(model); - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; // Record disposable items as they are created so all can be disposed when needed. using (DisposableCollection disposableItems = new DisposableCollection()) @@ -370,7 +370,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Ensure that the user has the correct role to update Events for this organisation. - if (!AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisationId, new[] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.ScheduleAdmin })) + if (!AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisationId, new[] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.ScheduleAdmin })) { SaLogger.Warn(fn + " User doesn't have 'Event Admin' role for Organisation Id: " + organisationId); return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Members.cs b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Members.cs index 3362403..910b8a2 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Members.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Members.cs @@ -44,7 +44,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers { data.Id = model.EncryptId(userOrganisation.Id); data.UserAccountId = model.EncryptId(userOrganisation.UserAccountId); - if (userOrganisation.UserAccountId.Equals(UserAccountId)) data.CurrentUser = true; + if (userOrganisation.UserAccountId.Equals(SessionUserAccountId)) data.CurrentUser = true; data.EmailAddress = userAccount.EmailAddress; data.DisplayName = userAccount.GetDisplayName(); data.RoleCodes.Clear(); @@ -133,7 +133,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers responseData.MemberRoles.Add(memberRole.Code, Localiser.GetOrganisationRoleCaption((Sax.OrganisationRole)memberRole.Type)); // Session User roles. - responseData.User.CanManage = AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); + responseData.User.CanManage = AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); // Item filter. SaxUserOrganisation.Params prmMember = new SaxUserOrganisation.Params(); @@ -183,7 +183,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers StatusCode = values.GetString(colUserStatus.DataName), StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colUserStatus.DataName)) }; - if (model.ExtractSysId(memberData.UserAccountId).Equals(UserAccountId)) memberData.CurrentUser = true; + if (model.ExtractSysId(memberData.UserAccountId).Equals(SessionUserAccountId)) memberData.CurrentUser = true; String memberRoleCodes = values.GetString(colOrganisationRoleCodes.DataName); foreach (String memberRoleCode in StringListUtil.Split(memberRoleCodes, SaxUserOrganisation.UserOrgnisationRoleDelim)) { @@ -259,7 +259,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Session User roles. - bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); + bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); // Validate user account. SaxUserAccount userAccount = AccountMgr.GetUserAccountById(userOrganisation.UserAccountId); @@ -369,7 +369,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Ensure that the user has the correct role to update Members for this organisation. - bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisationId, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); + bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisationId, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); if (!userCanManageMembers) { SaLogger.Warn(fn + " User doesn't have 'Member Admin' role for Organisation Id: " + organisationId); @@ -395,7 +395,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Validate roles for current user. - if (userOrganisation.UserAccountId.Equals(UserAccountId)) + if (userOrganisation.UserAccountId.Equals(SessionUserAccountId)) { // User is modifying their own organisation member. if (userOrganisation.CanManageOrganisation && !model.OrganisationRoleCodes.Any(item => item.Type == (int)Sax.OrganisationRole.Admin)) @@ -562,7 +562,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Ensure that the user has the correct role to update Members for this organisation. - bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); + bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); if (!userCanManageMembers) { SaLogger.Warn(fn + " User doesn't have 'Member Admin' role for Organisation Id: " + organisation.Id); @@ -678,7 +678,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Ensure that the user has the correct role to update Members for this organisation. - bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); + bool userCanManageMembers = AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisation.Id, new List { Sax.OrganisationRole.Admin, Sax.OrganisationRole.MemberAdmin }); if (!userCanManageMembers) { SaLogger.Warn(fn + " User doesn't have 'Member Admin' role for Organisation Id: " + organisation.Id); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Opportunities.cs b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Opportunities.cs index c2db68f..e4b6051 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Opportunities.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax-Opportunities.cs @@ -106,7 +106,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers if (!ValidReferer) return Forbid(); if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData); RefreshModel(model); - SysId userAccountId = UserAccountId; + SysId userAccountId = SessionUserAccountId; // Record disposable items as they are created so all can be disposed when needed. using (DisposableCollection disposableItems = new DisposableCollection()) @@ -357,7 +357,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Ensure that the user has the correct role to update Opportunities for this organisation. - if (!AccountMgr.UserHasAnyOrganisationRole(UserAccountId, organisationId, new[] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.OpportunityAdmin })) + if (!AccountMgr.UserHasAnyOrganisationRole(SessionUserAccountId, organisationId, new[] { Sax.OrganisationRole.Admin, Sax.OrganisationRole.OpportunityAdmin })) { SaLogger.Warn(fn + " User doesn't have 'Opportunity Admin' role for Organisation Id: " + organisationId); return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"])); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax.cs b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax.cs index 6a6b0de..573d021 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController-Ajax.cs @@ -153,7 +153,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Organisation filter SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationStatusCat = SaxOrganisation.StatusCat.ActiveOnly; prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); @@ -228,7 +228,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Organisation filter SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationStatusCat = SaxOrganisation.StatusCat.ActiveOnly; prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); @@ -303,7 +303,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Organisation filter SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationStatusCat = SaxOrganisation.StatusCat.ActiveOnly; prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); diff --git a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController.cs b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController.cs index d14c756..fd7b579 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/OrganisationController.cs @@ -138,7 +138,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers // Filter to identify suitable organisations that user is a member of and has the appropriate rights. SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationStatusCat = SaxOrganisation.StatusCat.ActiveOnly; prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.AddRange(requiredRoles); diff --git a/SaxoniteCoreWebOnline/Online/Models/Model_Account.cs b/SaxoniteCoreWebOnline/Online/Models/Model_Account.cs index 6260857..433d0aa 100644 --- a/SaxoniteCoreWebOnline/Online/Models/Model_Account.cs +++ b/SaxoniteCoreWebOnline/Online/Models/Model_Account.cs @@ -29,10 +29,7 @@ namespace Saxonite.Net.Core.Web.Online.Models // Page includes. AdditionalFiles_CSS.Add("css/sax-account.css"); AdditionalFiles_JS.Add("js/sax-account.js"); - AdditionalFiles_JS.Add("js/sax-usr-pro.js"); - AdditionalFiles_JS.Add("js/sax-usr-spt.js"); - AdditionalFiles_JS.Add("js/sax-usr-spt-exp.js"); - AdditionalFiles_JS.Add("js/sax-usr-org.js"); + AdditionalFiles_JS.Add("js/sax-pro-usr.js"); } //------------------------------------------------------------------- @@ -82,7 +79,7 @@ namespace Saxonite.Net.Core.Web.Online.Models public ModelData_Organisation Organisation { get; } //------------------------------------------------------------------- - // Validate modela data. + // Validate model data. //------------------------------------------------------------------- // Validate contact details. public bool ValidateContactDetails(SaxController_Base.AjaxResponse_Data responseData) diff --git a/SaxoniteCoreWebOnline/Online/Models/Model_UserEligibility.cs b/SaxoniteCoreWebOnline/Online/Models/Model_UserEligibility.cs new file mode 100644 index 0000000..8f93be7 --- /dev/null +++ b/SaxoniteCoreWebOnline/Online/Models/Model_UserEligibility.cs @@ -0,0 +1,112 @@ +using Microsoft.AspNetCore.Http; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Utils; +using Saxonite.Base.App; +using Saxonite.Net.Core.Web.Base.App; +using Saxonite.Net.Core.Web.Base.Controllers; +using Saxonite.Net.Core.Web.Base.Models; +using Saxonite.Net.Standard.Base.App; +using Saxonite.Net.Standard.Base.Bus; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; + +namespace Saxonite.Net.Core.Web.Online.Models +{ + //======================================================================= + public class Model_UserEligibility : SaxModel_Online + { + //------------------------------------------------------------------- + // Construction. + public Model_UserEligibility(SaxLocaliser localiser) : + base(localiser) + { + } + + //------------------------------------------------------------------- + // User properties. + public class UserAccountData + { + public String Id { get; set; } + } + public UserAccountData UserAccount { get; } = new UserAccountData(); + + // Eligibility properties. + public class EligibilityData + { + /// User Experience Id. + public String Id { get; set; } + /// Flag to indicate whether item is being updated. + public String Exists { get; set; } + /// User Experience Region Id. + public String RegionId { get; set; } + /// User Experience Type. + public String Type { get; set; } + /// User Experience Info. + public String Info { get; set; } + public Sax.EligibilityType getEligibilityType() + { + if (Type != null) + return (Sax.EligibilityType)SaxSystem.GetCodesOfType(Sax.CodeType.EligibilityType).GetTypeForCode(Type); + return Sax.EligibilityType.Unknown; + } + /// User Experience Expiry date. + public String ExpiresOn { get; set; } + } + public EligibilityData Eligibility { get; } = new EligibilityData(); + + //------------------------------------------------------------------- + // Validate model data. + //------------------------------------------------------------------- + // Validate eligibility details. + public bool ValidateEligibilityDetails(SaxController_Base.AjaxResponse_Data responseData) + { + // Eligibility type. + String controlName = "EligibilityType"; + if (Eligibility.Type == null || Eligibility.getEligibilityType() <= 0) + { + responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]); + } + + // Eligibility Region - mandatory for new eligibility. + controlName = "EligibilityRegion"; + SysId eligibilityRegionId = ExtractSysId(Eligibility.RegionId); + if ((Eligibility.RegionId == null || !SysId.IsValid(eligibilityRegionId)) && !StringUtil.ToBool(Eligibility.Exists)) + { + responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]); + } + else if (Eligibility.RegionId != null) + { + SaxRegion.Data eligibilityRegion = Internals.GetRegion(eligibilityRegionId); + if (eligibilityRegion == null) + responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]); + } + + // Eligibility info. + controlName = "EligibilityInfo"; + if (Eligibility.Info != null) + { + responseData.SetControlValue(controlName, Eligibility.Info); + if (StringUtil.GetLength(Eligibility.Info) > GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserEligibility_Info)) + responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserEligibility_Info)]); + } + + // Eligibility Expiry date. + controlName = "EligibilityExpiry"; + if (Eligibility.ExpiresOn != null) + { + if (!StringUtil.IsBlank(Eligibility.ExpiresOn) && !DateUtil.IsValid(ParseDateFromForm(Eligibility.ExpiresOn))) + { + responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]); + } + } + return !responseData.HasControlErrors(); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebOnline/Online/Models/SaxModel_Online.cs b/SaxoniteCoreWebOnline/Online/Models/SaxModel_Online.cs index aff697b..d6e2477 100644 --- a/SaxoniteCoreWebOnline/Online/Models/SaxModel_Online.cs +++ b/SaxoniteCoreWebOnline/Online/Models/SaxModel_Online.cs @@ -42,7 +42,7 @@ namespace Saxonite.Net.Core.Web.Online.Models //------------------------------------------------------------------- // Session. public SaxSessionData_Online SessionData_Online { get { return SessionData as SaxSessionData_Online; } } - public SysId UserAccountId { get { return SessionData_Online?.User?.UserAccountId ?? null; } } + public SysId SessionUserAccountId { get { return SessionData_Online?.User?.UserAccountId ?? null; } } //------------------------------------------------------------------- // Menu options. @@ -61,7 +61,7 @@ namespace Saxonite.Net.Core.Web.Online.Models if (userCanManage.OrganisationMembers == null && ValidUserSession) { SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.MemberAdmin); @@ -78,7 +78,7 @@ namespace Saxonite.Net.Core.Web.Online.Models if (userCanManage.OrganisationOpportunities == null && ValidUserSession) { SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.OpportunityAdmin); @@ -95,7 +95,7 @@ namespace Saxonite.Net.Core.Web.Online.Models if (userCanManage.OrganisationSchedule == null && ValidUserSession) { SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.ScheduleAdmin); @@ -112,7 +112,7 @@ namespace Saxonite.Net.Core.Web.Online.Models if (userCanManage.OrganisationArticles == null && ValidUserSession) { SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params(); - prmUserOrganisation.UserAccountIdsIncluded.Add(UserAccountId); + prmUserOrganisation.UserAccountIdsIncluded.Add(SessionUserAccountId); prmUserOrganisation.OrganisationMembersOnly = true; prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.Admin); prmUserOrganisation.OrganisationRolesAny.Add(Sax.OrganisationRole.ArticleAdmin); diff --git a/SaxoniteCoreWebOnline/Views/Account/Organisations.cshtml b/SaxoniteCoreWebOnline/Views/Account/Organisations.cshtml new file mode 100644 index 0000000..f3b5ae6 --- /dev/null +++ b/SaxoniteCoreWebOnline/Views/Account/Organisations.cshtml @@ -0,0 +1,26 @@ +@model Model_Account +@inject SaxLocaliser Localiser +@{ + ViewData["Title"] = "Profile - Organisations"; +} + + + + + + + + diff --git a/SaxoniteCoreWebOnline/Views/Account/Profile-Eligibility.cshtml b/SaxoniteCoreWebOnline/Views/Account/Profile-Eligibility.cshtml new file mode 100644 index 0000000..6fa4acf --- /dev/null +++ b/SaxoniteCoreWebOnline/Views/Account/Profile-Eligibility.cshtml @@ -0,0 +1,168 @@ +@model Model_Account +@inject SaxLocaliser Localiser + +
+ +
+ +
+
+
@Localiser["caption.my.eligibility"]
+
+ @* Burger menu *@ +
    +
  • + +
      +
    • @(Localiser["label.add"])
      • +
    +
    • +
+ @* Filter item templates *@ +
+ @* Burger dropdown item template - ul is ignored *@ +
    +
  • ...
    • +
+
+
+
+
+ +
+ @* User Eligibility list. *@ +
+
+ + @* Item templates *@ +
+ @* User Eligibility template *@ +
+
+
+
+ @* Burger menu *@ +
    +
  • + +
      +
      • +
    +
    +
    +
    +
    +
    +
    @Localiser["label.expires"]: 
    +
    +
    +
    + @* User Eligibility Burger dropdown template - ul is ignored *@ +
      +
    • ...
      • +
    +
    + + @* User Eligibility Id form. *@ + @using (Html.BeginForm(FormMethod.Post, new { @id = "frmUserEligibilityId", @class = "sax-form", @onSubmit = "return false;" })) + { + @Html.Hidden("Eligibility.Id", "", new { @id = "", @class = "UserEligibilityId sax-hidden" }) + } + +
    + + @* User Eligibility dialog *@ +
    + +
    + @using (Html.BeginForm(FormMethod.Post, new { @id = "frmUserEligibility", @class = "sax-form", @onSubmit = "return false;" })) + { + + + + @* Region *@ +
    +
    +
    +
    + +
    +
    +
    +
    + @Html.Hidden("Eligibility.RegionId", "", new { @id = "ifEligibilityRegionId", @class = "EligibilityRegionId" }) +
    +
    +
    +
    +
    +
    +
    + + @* Eligibility Type *@ +
    +
    +
    +
    + +
    +
    +
    +
    + @Html.DropDownList("Eligibility.Type", Model.EligibilityTypesForSelect, "", new { @id = "ifEligibilityType", @class = "EligibilityType sax-select", @readonly = "readonly", @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserAccount_EmailAddress) }) +
    +
    +
    +
    +
    + + @* Info *@ +
    +
    +
    +
    + +
    +
    +
    +
    + @Html.TextArea("Eligibility.Info", "", new { @id = "ifEligibilityInfo", @class = "EligibilityInfo sax-textarea", @rows = 4, @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserEligibility_Info) }) +
    +
    +
    +
    +
    + + @* Expiry *@ +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
     @Localiser["label.expires.on"]
    +
    @Html.TextBox("Eligibility.ExpiresOn", "", new { @id = "ifEligibilityExpiresOn", @class = "sax-input sax-calendar EligibilityExpiresOn", @readonly = "readonly" })
    +
    +
    +
    +
    +
    +
    + + } +
    +
    + +
    + + + diff --git a/SaxoniteCoreWebOnline/Views/Account/Profile-Organisations.cshtml b/SaxoniteCoreWebOnline/Views/Account/Profile-Organisations.cshtml index 083d723..e3b4bd1 100644 --- a/SaxoniteCoreWebOnline/Views/Account/Profile-Organisations.cshtml +++ b/SaxoniteCoreWebOnline/Views/Account/Profile-Organisations.cshtml @@ -46,8 +46,7 @@
    • -
        -
      +
      @@ -135,3 +134,5 @@ + + diff --git a/SaxoniteCoreWebOnline/Views/Account/Profile-SportExperiences.cshtml b/SaxoniteCoreWebOnline/Views/Account/Profile-SportExperiences.cshtml index f0af5f9..c74be06 100644 --- a/SaxoniteCoreWebOnline/Views/Account/Profile-SportExperiences.cshtml +++ b/SaxoniteCoreWebOnline/Views/Account/Profile-SportExperiences.cshtml @@ -250,3 +250,4 @@ + diff --git a/SaxoniteCoreWebOnline/Views/Account/Profile-Sports.cshtml b/SaxoniteCoreWebOnline/Views/Account/Profile-Sports.cshtml index 47e037f..0f0d730 100644 --- a/SaxoniteCoreWebOnline/Views/Account/Profile-Sports.cshtml +++ b/SaxoniteCoreWebOnline/Views/Account/Profile-Sports.cshtml @@ -30,8 +30,7 @@
      -
      -
      +
      @* Item templates *@ @@ -68,12 +67,12 @@ - + @using (Html.BeginForm(FormMethod.Post, new { @id = "frmProfileSportId", @class = "sax-form", @onSubmit = "return false;" })) + { + @Html.HiddenFor(model => model.UserSportId, new { @id = "", @class = "UserSportId" }) + } -@using (Html.BeginForm(FormMethod.Post, new { @id = "frmProfileSportId", @class = "sax-form", @onSubmit = "return false;" })) -{ - @Html.HiddenFor(model => model.UserSportId, new { @id = "", @class = "UserSportId" }) -} +
      @@ -95,7 +94,7 @@
      -
      +
      @@ -157,3 +156,9 @@
      + + + diff --git a/SaxoniteCoreWebOnline/Views/Account/Profile.cshtml b/SaxoniteCoreWebOnline/Views/Account/Profile.cshtml index 6a7d6f1..6bce985 100644 --- a/SaxoniteCoreWebOnline/Views/Account/Profile.cshtml +++ b/SaxoniteCoreWebOnline/Views/Account/Profile.cshtml @@ -14,11 +14,15 @@ + + + @@ -28,8 +32,6 @@ sax.dlg.title.selectRegionCountry = '@Localiser.GetJavascriptText("reference.caption.country.select")'; sax.dlg.title.selectRegionProvince = '@Localiser.GetJavascriptText("reference.caption.province.select")'; sax.dlg.title.imageUpload = '@Localiser.GetJavascriptText("account.caption.image.upload")'; - sax.dlg.title.addUserSport = '@Localiser.GetJavascriptText("account.caption.profile.sport.add")'; - sax.dlg.title.updateUserSport = '@Localiser.GetJavascriptText("account.caption.profile.sport.update")'; sax.dlg.title.selectRegion = '@Localiser.GetJavascriptText("reference.caption.region.select")'; sax.dlg.title.selectSport = '@Localiser.GetJavascriptText("reference.caption.sport.select")'; sax.msg.uploadFileSelect = '@Localiser.GetJavascriptText("msg.upload.file.select")'; diff --git a/SaxoniteCoreWebOnline/Views/Account/Sports.cshtml b/SaxoniteCoreWebOnline/Views/Account/Sports.cshtml new file mode 100644 index 0000000..53dc0ab --- /dev/null +++ b/SaxoniteCoreWebOnline/Views/Account/Sports.cshtml @@ -0,0 +1,11 @@ +@model Model_Account +@inject SaxLocaliser Localiser +@{ + ViewData["Title"] = "Profile - Sports"; +} + + + + + + diff --git a/SaxoniteCoreWebOnline/Views/Shared/_Layout.cshtml b/SaxoniteCoreWebOnline/Views/Shared/_Layout.cshtml index c4ce7d9..e9c98e9 100644 --- a/SaxoniteCoreWebOnline/Views/Shared/_Layout.cshtml +++ b/SaxoniteCoreWebOnline/Views/Shared/_Layout.cshtml @@ -129,6 +129,8 @@
      @Localiser["account.caption.profile"]
      +
      @Localiser["label.my.sports"]
      +
      @Localiser["label.my.organisations"]
      @if (Model.ArticlesAllowed) {
      @Localiser["article.caption.articles"]
      diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-account.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-account.js index e45fbc3..6bc953f 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-account.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-account.js @@ -4,19 +4,19 @@ (function (win, doc, undef) { + //-------------------------------------------------------------- "use strict"; sax.classFileDrag = 'sax-file-drag'; let $pnl = sax.$pnl, $dlg = sax.$dlg, $frm = sax.$frm; sax.profile = { contact: {}, sports: {}, organisations: {} }; - //-------------------------------------------------------------- sax.refreshProfile = function () { setTimeout(sax.refreshProfileContactInfo, 50); + setTimeout(sax.refreshProfileEligibilityInfo, 50); setTimeout(sax.refreshProfileSportsInfo, 50); setTimeout(sax.refreshProfileOrganisationsInfo, 50); } - //-------------------------------------------------------------- sax.showDataRefreshingMsg = function ($section) { @@ -29,7 +29,7 @@ } sax.closeEditPanels = function () { - if (sax.page.profileContactChanged || sax.page.profileSportsChanged || sax.page.profileOrganisationsChanged) + if (sax.page.profileContactChanged || sax.page.profileEligibilityChanged || sax.page.profileSportsChanged || sax.page.profileOrganisationsChanged) { sax.doAlert(sax.msg.changesMade); return false; @@ -55,13 +55,11 @@ $select.val(value).scrollTop(0); sax.setItemsSelectedInfo($select); } - //-------------------------------------------------------------- $(function () { setTimeout(sax.refreshProfile, 200); }); - //-------------------------------------------------------------- }(window, window.document)); diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-home.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-home.js index 5146f1a..0e664d6 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-home.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-home.js @@ -40,7 +40,7 @@ } sax.populateItem = function (activity) { - sax.debug('populateItem', activity); + //sax.debug('populateItem', activity); let item = activity.item; let $item = activity.$item; if (!item) return; diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js index b5e499e..e658b2f 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js @@ -133,7 +133,7 @@ { if (e.keyCode == 8 || e.keyCode == 46) { - $(this).datepicker('setDate', null); + $(this).datepicker('setDate', null).datepicker('hide').change(); } }); } diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-elg.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-elg.js new file mode 100644 index 0000000..6481fe5 --- /dev/null +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-elg.js @@ -0,0 +1,233 @@ +/* + * Profile Eligibility scripts. + */ + +(function (win, doc, undef) +{ + //-------------------------------------------------------------- + "use strict"; + let ue = sax.mdl.userEligibility = { ajax: {}, data: {}, $pnl: {}, $dlg: {}, $frm: {} }; + let $pnl = ue.$pnl, $dlg = ue.$dlg, $frm = ue.$frm; + //-------------------------------------------------------------- + sax.refreshProfileEligibilityInfo = function (delay) + { + ue.init(); + $pnl.usrElg.removeClass('sax-edit').addClass('sax-populating'); + $('.sax-property', $pnl.usrElg).hide(); + sax.showDataRefreshingMsg($pnl.usrElg); + ue.refreshUserEligibilities(ue.displayUserEligibilities); + } + ue.refreshUserEligibilities = function (callbackFn) + { + delete sax.page.profileEligibilityChanged; + ue.ajax.listItems = ue.ajax.listItems || { url: sax.url.base + 'Account/Ajax/GetUserEligibilities', formId: 'frmNavigate', noWaitIcon: true }; + ue.ajax.listItems.callbackFn = callbackFn; + sax.doAjaxRequest(ue.ajax.listItems, 50); + } + ue.displayUserEligibilities = function (response) + { + //sax.debug('displayUserEligibilities', response); + ue.clearItem(); + if (!response || !response.success) return; + ue.data.types = response.types; + $('.sax-message', $pnl.usrElg).stop(true, false).fadeOut(200).empty(); + let items = response.eligibilities; + if (!items) return; + let $items = $('.sax-panel-results.UserEligibilities', $pnl.usrElg).empty(); + for (let itemIdx = 0; itemIdx < items.length; itemIdx++) + $items.append(ue.populateItem(ue.getItemTemplate(), items[itemIdx])); + $items.show(); + sax.showNoInfoMsg($pnl.usrElg); + $pnl.usrElg.removeClass('sax-populating'); + } + ue.populateItem = function ($item, item) + { + if (!item) return; + $item.prop('id', item.id); + let fnUpd = function (evt) { ue.updateItem(item, $item); } + let fnRmv = function (evt) { ue.removeItem(item,$item); } + $('.sax-header .sax-caption', $item).on('click', fnUpd); + $('.sax-content', $item).on('dblclick', fnUpd); + + let $bgr = $('.sax-burger', $item); + let $mnu = $('ul.sax-dropdown-menu', $bgr).empty(); + $mnu.append(ue.getItemMenuOption(sax.lbl.edit, fnUpd, 'sax-edit')); + $mnu.append(ue.getItemMenuOption(sax.lbl.remove, fnRmv, 'sax-remove')); + $bgr.toggle(!!$('.sax-dropdown-menu .sax-dropdown-item', $item).length); + + $('.EligibilityRegionName', $item).text(item.regionName); + $('.EligibilityType', $item).text(item.eligibilityTypeDesc); + $('.EligibilityExpiry', $item).toggle(!!item.expiresOnFmt).find('.EligibilityExpiresOn').text(item.expiresOnFmt); + return $item; + } + //-------------------------------------------------------------- + ue.getHeaderDropdownTemplate = function () + { + return $('.sax-panel-item-template .sax-dropdown-menu.UserEligibilities li.sax-dropdown-item', $pnl.section).clone(); + } + ue.getItemTemplate = function () + { + return $('.sax-panel-item-template .sax-panel-item.UserEligibility', $pnl.usrElg).clone(); + } + ue.getItemDropdownTemplate = function () + { + return $('.sax-panel-item-template .sax-dropdown-menu.UserEligibility li.sax-dropdown-item', $pnl.section).clone(); + } + ue.getHeaderMenuOption = function (lbl, fn, cls) + { + return ue.getMenuOption(ue.getHeaderDropdownTemplate(), lbl, fn, cls); + } + ue.getItemMenuOption = function (lbl, fn, cls) + { + return ue.getMenuOption(ue.getItemDropdownTemplate(), lbl, fn, cls); + } + ue.getMenuOption = function ($opt, lbl, fn, cls) + { + return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls); + } + //-------------------------------------------------------------- + ue.addItem = function () + { + ue.clearItem(); + sax.openDialog($dlg.usrElg.dialog('option', 'title', sax.dlg.title.addUserEligibility), 640, 480); + } + ue.clearItem = function () + { + delete ue.data.item; + delete ue.data.$item; + let frm = $frm.usrElg; + $('.UserEligibilityId,.EligibilityExists,.EligibilityRegionId,input.sax-input,textarea.sax-textarea,select.sax-select', frm).val(''); + $('.SelectEligibilityRegion', frm).show(); + $('.sax-select.EligibilityType', frm).prop('disabled', false); + ue.$chkExpires.prop("checked", false); + sax.clearControlErrors(frm); + } + ue.updateItem = function (item, $item) + { + //sax.debug('updateItem', item); + ue.data.item = item; + ue.data.$item = $item; + $('.UserEligibilityId', $frm.usrElgId).val(item.id); + ue.ajax.getItem = ue.ajax.getItem || { url: sax.url.base + 'Account/Ajax/GetUserEligibility', formId: 'frmUserEligibilityId', callbackFn: ue.doUpdateItem }; + sax.doAjaxRequest(ue.ajax.getItem, 50); + } + ue.doUpdateItem = function (response) + { + sax.debug('doUpdateItem', response); + if (!response.success) return; + ue.clearItem(); + let frm = $frm.usrElg; + let item = response.eligibility; + $('.UserEligibilityId', frm).val(item.id); + ue.$hdnExists.val(1); + $('.EligibilityRegionId', frm).val(item.regionId); + $('.sax-input.EligibilityRegionName', frm).val(item.regionName); + $('.SelectEligibilityRegion', frm).hide(); + ue.$selType.val(item.eligibilityType).prop('disabled', true).change(); + $('.sax-textarea.EligibilityInfo', frm).val(item.info); + ue.$chkExpires.prop("checked", !!item.expiresOnFrm); + ue.$dpExpiresOn.val(item.expiresOnFrm); + sax.openDialog($dlg.usrElg.dialog('option', 'title', sax.dlg.title.updateUserEligibility), 640, 480); + } + //-------------------------------------------------------------- + ue.selectEligibilityRegion = function () + { + //sax.debug('selectEligibilityRegion'); + let frm = $frm.usrElg; + if (ue.$hdnExists.val()) return; + sax.mdl.selectRegion.fn.selectRegion({ caption: sax.dlg.title.selectRegion, regionId: $('#ifEligibilityRegionId', frm).val(), fnCallback: ue.storeEligibilityRegion }) + } + ue.storeEligibilityRegion = function (eligibility) + { + sax.clearControlError($('#ifEligibilityRegionId').val(eligibility ? eligibility.id : '')); + $('#ifEligibilityRegionName').val(eligibility ? eligibility.name : ''); + } + //-------------------------------------------------------------- + ue.onChangeType = function () + { + $('.sax-form-control.EligibilityExpiry').toggle(ue.typeAllowsDates(ue.$selType.val())); + } + ue.typeAllowsDates = function (tc) + { + for (const t of ue.data.types || []) + if (t.code == tc) return !!t.dates; + return false; + } + //-------------------------------------------------------------- + ue.onToggleExpiry = function () + { + if (ue.$chkExpires.prop("checked")) + ue.$dpExpiresOn.focus(); + else + ue.$dpExpiresOn.val(''); + } + ue.onChangeExpiresOn = function () + { + ue.$chkExpires.prop("checked", !!$(this).val()); + } + //-------------------------------------------------------------- + ue.storeItem = function () + { + sax.clearControlErrors(); + let frm = $frm.usrElg; + $('.sax-select.EligibilityType', frm).prop('disabled', false); + ue.ajax.storeItem = ue.ajax.storeItem || { url: sax.url.base + 'Account/Ajax/StoreUserEligibility', formId: 'frmUserEligibility', callbackFn: ue.onStoreItem }; + sax.doAjaxRequest(ue.ajax.storeItem, 50); + } + ue.onStoreItem = function (response) + { + sax.refreshControlValues(response.controlValues); + let frm = $frm.usrElg; + $('.sax-select.EligibilityType', frm).prop('disabled', !!ue.$hdnExists.val()); + if (!response || !response.success) return; + $dlg.usrElg.dialog('close'); + sax.refreshProfileEligibilityInfo(); + } + //-------------------------------------------------------------- + ue.removeItem = function (item, $item) + { + sax.debug('removeItem',item); + ue.data.item = item; + ue.data.$item = $item; + let fn = function () + { + $('.UserEligibilityId', $frm.usrElgId).val(item.id); + sax.ajax.removeItem = sax.ajax.removeItem || { url: sax.url.base + 'Account/Ajax/RemoveUserEligibility', formId: 'frmUserEligibilityId', callbackFn: ue.onItemRemoved }; + sax.doAjaxRequest(sax.ajax.removeItem, 50); + } + sax.doConfirm(sax.dlg.title.removeUserEligibility, sax.msg.removeUserEligibility, fn); + } + ue.onItemRemoved = function (response) + { + if (!response.success) return; + if (ue.data.$item) + ue.data.$item.remove(); + ue.clearItem(); + } + //-------------------------------------------------------------- + ue.init = function () + { + if ($pnl.usrElg) return; + $pnl.usrElg = $('.sax-panel-section.ProfileEligibility'); + $('.sax-action.sax-add', $pnl.usrElg).on('click', function (evt) { ue.addItem(); }); + + $frm.usrElgId = $('#frmUserEligibilityId', $pnl.usrElg); + var opt = sax.dlgOpts(); + opt.buttons[sax.dlg.btn.ok] = function () { ue.storeItem(); }; + opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); }; + $dlg.usrElg = $('#dlgUserEligibility', $pnl.usrElg).dialog(opt); + $frm.usrElg = $('#frmUserEligibility', $dlg.usrElg); + $frm.usrElg.on('dblclick', '.EligibilityRegionName.sax-input', ue.selectEligibilityRegion); + $frm.usrElg.on('click', '.SelectEligibilityRegion.sax-button', ue.selectEligibilityRegion); + ue.$hdnExists = $('.sax-hidden.EligibilityExists', $frm.usrElg); + ue.$selType = $('.sax-select.EligibilityType', $frm.usrElg).on('change', ue.onChangeType); + ue.$chkExpires = $('.sax-checkbox.EligibilityExpires', $frm.usrElg).on('change', ue.onToggleExpiry); + ue.$dpExpiresOn = $('.sax-input.EligibilityExpiresOn', $frm.usrElg).on('change', ue.onChangeExpiresOn); + sax.initCalendars('#frmUserEligibility .sax-calendar', { changeMonth: true, changeYear: true, yearRange: '-99:+12', autoClose: true }); + ue.$dpExpiresOn.datepicker({ onSelect: function () { ue.onChangeExpiresOn(); }, onClose: function () { ue.onChangeExpiresOn(); } }); + sax.allowClearCalendar('#frmUserEligibility .sax-calendar'); + } + //-------------------------------------------------------------- +}(window, window.document)); + +/* The End */ \ No newline at end of file diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt-exp.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-exp.js similarity index 92% rename from SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt-exp.js rename to SaxoniteCoreWebOnline/wwwroot/js/sax-pro-exp.js index 072501c..414d75b 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt-exp.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-exp.js @@ -1,15 +1,15 @@ /* - * Account page scripts. + * Sport Experience scripts. */ - (function (win, doc, undef) { + //-------------------------------------------------------------- "use strict"; let se = sax.sportExperience = { fn: {}, ajax: {}, data: {}, $pnl: {}, $frm: {}, $dlg: {} }; - //-------------------------------------------------------------- sax.showSportExperience = function (usrSpt) { + se.init(); //sax.debug('showSportExperience', usrSpt); $('.sax-header .SportName', se.$pnl.sportExp).text(usrSpt.sportName); $('.sax-panel-section').slideUp(750, function () { se.$pnl.sportExp.slideDown(750); }); @@ -55,7 +55,6 @@ } $list.show(); } - //-------------------------------------------------------------- se.fn.getItemActionTemplate = function () { @@ -69,7 +68,6 @@ { return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls); } - //-------------------------------------------------------------- sax.addSportExperience = function () { @@ -111,6 +109,7 @@ $('.sax-textarea.ExperienceAwards', frm).val(item.awards); sax.openDialog(se.$dlg.sportExp, 560, 600); } + //-------------------------------------------------------------- se.fn.storeSportExperience = function () { //sax.debug('storeSportExperience'); @@ -131,31 +130,29 @@ se.$pnl.sportExp.slideUp(750, function () { $('.sax-panel-section').slideDown(750); }); sax.refreshProfileSportsInfo(50); } - //-------------------------------------------------------------- - $(function () + se.init=function () { + if (se.$pnl.sportExp) return; se.$pnl.sportExp = $('.sax-panel.ProfileSportExperience'); se.$pnl.hdr = $('.sax-header', se.$pnl.sportExp); se.$pnl.results = $('.sax-panel-results.ProfileSportExperiences', se.$pnl.sportExp); - sax.initCalendars('#dlgSportExperience .sax-calendar', { changeMonth: true, changeYear: true, yearRange: '-99:+00' }); - se.$dpPeriodFrom = $('#dlgSportExperience .sax-calendar.ExperiencePeriodFrom'); - se.$dpPeriodTo = $('#dlgSportExperience .sax-calendar.ExperiencePeriodTo'); - se.$dpPeriodFrom.datepicker({ onSelect: function () { $(this).change(); } }); - sax.allowClearCalendar('#dlgSportExperience .sax-calendar.ExperiencePeriodTo'); + se.$frm.sportExpId = $('#frmSportExperienceId'); var opt = sax.dlgOpts(); opt.buttons[sax.dlg.btn.ok] = function () { se.fn.storeSportExperience(); }; opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); }; se.$dlg.sportExp = $('#dlgSportExperience').dialog(opt); - se.$frm.sportExpId = $('#frmSportExperienceId'); se.$frm.sportExp = $('#frmSportExperience', se.$dlg.sportExp); $('input,textarea', se.$frm.sportExp).on('input', function () { sax.clearControlError(this); }).on('change', function () { sax.clearControlError(this); }); $('select', se.$frm.sportExp).on('change', function () { sax.clearControlError(this); }); - }); - + sax.initCalendars('#frmSportExperience .sax-calendar', { changeMonth: true, changeYear: true, yearRange: '-99:+00' }); + se.$dpPeriodFrom = $('.sax-calendar.ExperiencePeriodFrom', se.$frm.sportExp); + se.$dpPeriodTo = $('.sax-calendar.ExperiencePeriodTo', se.$frm.sportExp); + se.$dpPeriodFrom.datepicker({ onSelect: function () { $(this).change(); } }); + sax.allowClearCalendar('#frmSportExperience .sax-calendar.ExperiencePeriodTo'); + } //-------------------------------------------------------------- - }(window, window.document)); /* The End */ \ No newline at end of file diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-org.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-org.js similarity index 100% rename from SaxoniteCoreWebOnline/wwwroot/js/sax-usr-org.js rename to SaxoniteCoreWebOnline/wwwroot/js/sax-pro-org.js diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-spt.js similarity index 57% rename from SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt.js rename to SaxoniteCoreWebOnline/wwwroot/js/sax-pro-spt.js index fe19d48..80a51d5 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-spt.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-spt.js @@ -4,20 +4,20 @@ (function (win, doc, undef) { + //-------------------------------------------------------------- "use strict"; let ps = sax.mdl.profileSports = { ajax: {}, data: {}, $pnl: {}, $dlg: {}, $frm: {} }; let $pnl = ps.$pnl, $dlg = ps.$dlg, $frm = ps.$frm; - ps.data = {}; - //-------------------------------------------------------------- sax.refreshProfileSportsInfo = function (delay) { + ps.init(); $pnl.proSpt.removeClass('sax-edit').addClass('sax-populating'); $('.sax-property', $pnl.proSpt).hide(); sax.showDataRefreshingMsg($pnl.proSpt); - sax.refreshProfileSports(ps.onRefreshProfileSportsInfo); + ps.refreshProfileSports(ps.onRefreshProfileSportsInfo); } - sax.refreshProfileSports = function (callbackFn) + ps.refreshProfileSports = function (callbackFn) { //sax.debug('refreshProfileSports'); delete sax.page.profileSportsChanged; @@ -34,26 +34,32 @@ let items = response.sports; if (!items) return; let $items = $('.sax-panel-results.ProfileSports', $pnl.proSpt).empty(); - let $tmpl = $('.sax-panel-item-template .sax-panel-item.ProfileSport', $pnl.proSpt); for (let itemIdx = 0; itemIdx < items.length; itemIdx++) - { - let item = items[itemIdx]; - sax.profile.sports.Ids.push(item.sportId); - let $item = $tmpl.clone(); - $('.sax-header .sax-action.sax-edit', $item).on('click', function (evt) { ps.updateProfileSport(item); }); - $('.sax-content', $item).on('dblclick', function (evt) { ps.updateProfileSport(item); }); - $('.sax-header .sax-action.sax-experience', $item).on('click', function (evt) { sax.showSportExperience(item); }); - $('.SportName', $item).text(item.sportName); - $('.SportParticipationValue', $item).text(item.sportParticipation); - $('.SportParticipation', $item).toggle(!!item.sportParticipation); - $('.SportOfficiatingValue', $item).text(item.sportOfficiating); - $('.SportOfficiating', $item).toggle(!!item.sportOfficiating); - $items.append($item); - } + $items.append(ps.populateItem(ps.getItemTemplate(), items[itemIdx])); $items.show(); sax.showNoInfoMsg($pnl.proSpt); $pnl.proSpt.removeClass('sax-populating'); } + ps.populateItem = function ($item, item) + { + if (!item) return; + sax.profile.sports.Ids.push(item.sportId); + $('.sax-header .sax-action.sax-edit', $item).on('click', function (evt) { ps.updateProfileSport(item); }); + $('.sax-content', $item).on('dblclick', function (evt) { ps.updateProfileSport(item); }); + $('.sax-header .sax-action.sax-experience', $item).on('click', function (evt) { sax.showSportExperience(item); }); + $('.SportName', $item).text(item.sportName); + $('.SportParticipationValue', $item).text(item.sportParticipation); + $('.SportParticipation', $item).toggle(!!item.sportParticipation); + $('.SportOfficiatingValue', $item).text(item.sportOfficiating); + $('.SportOfficiating', $item).toggle(!!item.sportOfficiating); + return $item; + } + //-------------------------------------------------------------- + ps.getItemTemplate = function () + { + return $('.sax-panel-item-template .sax-panel-item.ProfileSport', $pnl.proSpt).clone(); + } + //-------------------------------------------------------------- ps.addProfileSport = function () { //sax.debug('addProfileSport'); @@ -69,9 +75,9 @@ } ps.updateProfileSport = function (item) { - //sax.debug('updateProfileSport', item); - $('#frmProfileSportId .UserSportId').val(item.id); - ps.ajax.profileSport = ps.ajax.profileSport || { url: sax.url.base + 'Account/Ajax/GetProfileSport', formId: 'frmProfileSportId', callbackFn: ps.doUpdateProfileSport }; + //sax.debug('updateProfileSport', item, $frm.proSptId); + $('.UserSportId', $frm.proSptId).val(item.id); + ps.ajax.profileSport = ps.ajax.profileSport || { url: sax.url.base + 'Account/Ajax/GetProfileSport', formId: $frm.proSptId.prop('id'), callbackFn: ps.doUpdateProfileSport }; sax.doAjaxRequest(ps.ajax.profileSport, 50); } ps.doUpdateProfileSport = function (response) @@ -79,33 +85,37 @@ //sax.debug('doUpdateProfileSport', response); ps.clearProfileSport(); let dlg = $dlg.proSpt; + let frm = $frm.proSpt; let item = response.sport; - $('.UserSportId', dlg).val(item.id); - $('.ProfileSportExists', dlg).val(1); - $('#ifProfileSportId', dlg).val(item.sportId); - $('#ifProfileSport', dlg).val(item.sportName); - $('#ifProfileSportAbout', dlg).val(item.sportAbout); - $('#cbProfileSportParticipation', dlg).val(item.sportParticipationCode); - $('#cbProfileSportOfficiating', dlg).val(item.sportOfficiatingCode); - $('.SelectSport', dlg).hide(); + $('.UserSportId', frm).val(item.id); + $('.ProfileSportExists', frm).val(1); + $('#ifProfileSportId', frm).val(item.sportId); + $('#ifProfileSport', frm).val(item.sportName); + $('#ifProfileSportAbout', frm).val(item.sportAbout); + $('#cbProfileSportParticipation', frm).val(item.sportParticipationCode); + $('#cbProfileSportOfficiating', frm).val(item.sportOfficiatingCode); + $('.SelectSport', frm).hide(); sax.openDialog(dlg.dialog('option', 'title', sax.dlg.title.updateUserSport), 640, 480); } - sax.selectUserSport = function (sport) + //-------------------------------------------------------------- + ps.selectUserSport = function (sport) { //sax.debug('selectUserSport'); + if ($('.UserSportId', $frm.proSpt).val() > 0) return; let excludeIds = $.grep(sax.profile.sports.Ids, function (value) { return !sport || value != sport.id; }); - sax.mdl.selectSport.fn.selectSport({ caption: sax.dlg.title.selectSport, sportId: $('#frmProfileSport #ifProfileSportId').val(), excludeIds: excludeIds, fnCallback: ps.onSelectUserSport }) + sax.mdl.selectSport.fn.selectSport({ caption: sax.dlg.title.selectSport, sportId: $('#ifProfileSportId', $frm.proSpt).val(), excludeIds: excludeIds, fnCallback: ps.onSelectUserSport }) } ps.onSelectUserSport = function (sport) { sax.clearControlError($('#ifProfileSportId').val(sport ? sport.id : '')); $('#ifProfileSport').val(sport ? sport.name : ''); } + //-------------------------------------------------------------- ps.storeProfileSport = function () { //sax.debug('storeProfileSport'); sax.clearControlErrors(); - ps.ajax.storeProfileSport = ps.ajax.storeProfileSport || { url: sax.url.base + 'Account/Ajax/StoreProfileSport', formId: 'frmProfileSport', callbackFn: ps.onStoreProfileSport }; + ps.ajax.storeProfileSport = ps.ajax.storeProfileSport || { url: sax.url.base + 'Account/Ajax/StoreProfileSport', formId: $frm.proSpt.prop('id'), callbackFn: ps.onStoreProfileSport }; sax.doAjaxRequest(ps.ajax.storeProfileSport, 50); } ps.onStoreProfileSport = function (response) @@ -115,18 +125,21 @@ $dlg.proSpt.dialog('close'); sax.refreshProfileSportsInfo(); } - //-------------------------------------------------------------- - $(function () + ps.init = function () { + if ($pnl.proSpt) return; $pnl.proSpt = $('.sax-panel-section.ProfileSports'); $('.sax-action.sax-add', $pnl.proSpt).on('click', function (evt) { ps.addProfileSport(); }); + $frm.proSptId = $('#frmProfileSportId', $pnl.proSpt); var opt = sax.dlgOpts(); opt.buttons[sax.dlg.btn.ok] = function () { ps.storeProfileSport(); }; opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); }; $dlg.proSpt = $('#dlgProfileSport').dialog(opt); - }); - + $frm.proSpt = $('#frmProfileSport', $dlg.proSpt); + $frm.proSpt.on('dblclick', '.ProfileSport.sax-input', ps.selectUserSport); + $frm.proSpt.on('click', '.SelectSport.sax-button', ps.selectUserSport); + } //-------------------------------------------------------------- }(window, window.document)); diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-usr-pro.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-pro-usr.js similarity index 100% rename from SaxoniteCoreWebOnline/wwwroot/js/sax-usr-pro.js rename to SaxoniteCoreWebOnline/wwwroot/js/sax-pro-usr.js diff --git a/SaxoniteStandardBase/Base/App/Sax-Config.cs b/SaxoniteStandardBase/Base/App/Sax-Config.cs index 1941c58..2f0a3a8 100644 --- a/SaxoniteStandardBase/Base/App/Sax-Config.cs +++ b/SaxoniteStandardBase/Base/App/Sax-Config.cs @@ -22,7 +22,7 @@ namespace Saxonite.Net.Standard.Base.App } public static class Activation { - public static int EmailLinkExpiresMins_Default { get; } = 60; + public static int EmailLinkExpiresMins_Default { get; } = 60 * 6; public static int EmailLinkExpiresMins_Min { get; } = 30; public static int EmailLinkExpiresMins_Max { get; } = 60 * 24; } @@ -30,7 +30,7 @@ namespace Saxonite.Net.Standard.Base.App { public static class PasswordRequest { - public static int EmailLinkExpiresMins_Default { get; } = 60; + public static int EmailLinkExpiresMins_Default { get; } = 60 * 3; public static int EmailLinkExpiresMins_Min { get; } = 30; public static int EmailLinkExpiresMins_Max { get; } = 60 * 24; } diff --git a/SaxoniteStandardBase/Base/App/Sax-Version.cs b/SaxoniteStandardBase/Base/App/Sax-Version.cs index d7419ea..e94fdf6 100644 --- a/SaxoniteStandardBase/Base/App/Sax-Version.cs +++ b/SaxoniteStandardBase/Base/App/Sax-Version.cs @@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App //------------------------------------------------------------------- public static class Version { - private static String version { get; } = "1.2.9.0"; + private static String version { get; } = "1.2.9.1"; // Retrieve version. public static String GetFullVersion () { return version; } public static String GetAppVersion () @@ -43,10 +43,12 @@ namespace Saxonite.Net.Standard.Base.App // 1.2.9 12-Oct-2022 // - Online Sports Experience update bug resolved. // - Sports Experience Awards. + // - Profile Sports and Organisations on separate pages. + // - User Eligibility. // 1.2.8 16-Jul-2022 Online Organisations - Select Region // - Fix problem with selecting organisation region. // - Admin - Organisation associations, in progress. - // 1.2.7 9-Jun-2022 Online Activty list images + // 1.2.7 9-Jun-2022 Online Activity list images // - Organisation logo and article thumbnail in article list. // 1.2.6 16-May-2022 Image resizing // - Profile and article images resized to maximum width/height. diff --git a/SaxoniteStandardBase/Base/App/Sax.cs b/SaxoniteStandardBase/Base/App/Sax.cs index 4e1bef0..6895b72 100644 --- a/SaxoniteStandardBase/Base/App/Sax.cs +++ b/SaxoniteStandardBase/Base/App/Sax.cs @@ -23,6 +23,7 @@ namespace Saxonite.Net.Standard.Base.App SportParticipation, SportOfficiating, RegionType, + EligibilityType, UserRole, Title, ImageType, @@ -76,8 +77,9 @@ namespace Saxonite.Net.Standard.Base.App UserOrganisation = 102, UserSport = 103, UserSportExperience = 104, + UserEligibility = 105, Organisation = 120, - // Activty data. + // Activity data. ActivityIndex = 200, UserActivity = 202, Article = 210, @@ -116,13 +118,26 @@ namespace Saxonite.Net.Standard.Base.App /// Country - self-governing political entity, eg. Country, State (not US state) Country = 30, /// Nation, eg. Home Nation. - Nation = 70, + Nation = 50, /// STate - major subdivision of country, eg. US state. - State = 80, + State = 70, /// Province - eg. GB County. Province = 90 } + //------------------------------------------------------------------- + public enum EligibilityType + { + Unknown = 0, + /* Do not change the numeric values - tied to database. */ + Birth = 10, + Naturalised = 20, + Parent = 100, + Grandparent = 110, + Passport = 200, + Visa = 210, + } + //------------------------------------------------------------------- /// User roles public enum UserRole diff --git a/SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs b/SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs index 087d6c4..854615f 100644 --- a/SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs +++ b/SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Base.App { @@ -31,6 +31,7 @@ namespace Saxonite.Base.App Sport, UserAccount, UserActivity, + UserEligibility, UserOnline, UserOrganisation, UserRole, @@ -313,6 +314,21 @@ namespace Saxonite.Base.App UserActivity_UpdateOn, UserActivity_UpdateBy, UserActivity_UpdateHost, + UserEligibility_Id, + UserEligibility_UserAccountId, + UserEligibility_RegionId, + UserEligibility_EligibilityType, + UserEligibility_Info, + UserEligibility_ExpiresOn, + UserEligibility_Notes, + UserEligibility_Flags, + UserEligibility_Status, + UserEligibility_CreateOn, + UserEligibility_CreateBy, + UserEligibility_CreateHost, + UserEligibility_UpdateOn, + UserEligibility_UpdateBy, + UserEligibility_UpdateHost, UserOnline_UserAccountId, UserOnline_OnlineAt, UserOrganisation_Id, @@ -395,8 +411,8 @@ namespace Saxonite.Base.App //------------------------------------------------------------------- // Data members. - private static readonly int tableCount = 20; - private static readonly int columnCount = 347; + private static readonly int tableCount = 21; + private static readonly int columnCount = 362; private static ulong maxTextLen = 0; //------------------------------------------------------------------- @@ -556,6 +572,7 @@ namespace Saxonite.Base.App "Sport", "UserAccount", "UserActivity", + "UserEligibility", "UserOnline", "UserOrganisation", "UserRole", @@ -857,29 +874,29 @@ namespace Saxonite.Base.App new ColumnDfn(14,"UpdateOn",9,93,false,23), new ColumnDfn(14,"UpdateBy",4,4,false,10), new ColumnDfn(14,"UpdateHost",0,12,false,100), + new ColumnDfn(15,"Id",5,-5,true,19), new ColumnDfn(15,"UserAccountId",4,4,false,10), - new ColumnDfn(15,"OnlineAt",9,93,false,16), - new ColumnDfn(16,"Id",5,-5,true,19), + new ColumnDfn(15,"RegionId",4,4,false,10), + new ColumnDfn(15,"EligibilityType",3,5,false,5), + new ColumnDfn(15,"Info",0,-9,false,2000), + new ColumnDfn(15,"ExpiresOn",9,93,false,16), + new ColumnDfn(15,"Notes",0,-9,false,2000), + new ColumnDfn(15,"Flags",3,5,false,5), + new ColumnDfn(15,"Status",0,12,false,3), + new ColumnDfn(15,"CreateOn",9,93,false,23), + new ColumnDfn(15,"CreateBy",4,4,false,10), + new ColumnDfn(15,"CreateHost",0,12,false,100), + new ColumnDfn(15,"UpdateOn",9,93,false,23), + new ColumnDfn(15,"UpdateBy",4,4,false,10), + new ColumnDfn(15,"UpdateHost",0,12,false,100), new ColumnDfn(16,"UserAccountId",4,4,false,10), - new ColumnDfn(16,"OrganisationId",4,4,false,10), - new ColumnDfn(16,"OrganisationRoleCodes",0,12,false,256), - new ColumnDfn(16,"OrganisationRoleCount",2,-6,false,3), - new ColumnDfn(16,"AdminComment",0,-9,false,2000), - new ColumnDfn(16,"Notes",0,-9,false,2000), - new ColumnDfn(16,"Flags",3,5,false,5), - new ColumnDfn(16,"Status",0,12,false,3), - new ColumnDfn(16,"CreateOn",9,93,false,23), - new ColumnDfn(16,"CreateBy",4,4,false,10), - new ColumnDfn(16,"CreateHost",0,12,false,100), - new ColumnDfn(16,"UpdateOn",9,93,false,23), - new ColumnDfn(16,"UpdateBy",4,4,false,10), - new ColumnDfn(16,"UpdateHost",0,12,false,100), + new ColumnDfn(16,"OnlineAt",9,93,false,16), new ColumnDfn(17,"Id",5,-5,true,19), new ColumnDfn(17,"UserAccountId",4,4,false,10), - new ColumnDfn(17,"UserRoleCode",0,12,false,16), - new ColumnDfn(17,"LastLoginAt",9,93,false,16), - new ColumnDfn(17,"LastInvalidLoginAt",9,93,false,16), - new ColumnDfn(17,"InvalidLoginCount",3,5,false,5), + new ColumnDfn(17,"OrganisationId",4,4,false,10), + new ColumnDfn(17,"OrganisationRoleCodes",0,12,false,256), + new ColumnDfn(17,"OrganisationRoleCount",2,-6,false,3), + new ColumnDfn(17,"AdminComment",0,-9,false,2000), new ColumnDfn(17,"Notes",0,-9,false,2000), new ColumnDfn(17,"Flags",3,5,false,5), new ColumnDfn(17,"Status",0,12,false,3), @@ -889,43 +906,34 @@ namespace Saxonite.Base.App new ColumnDfn(17,"UpdateOn",9,93,false,23), new ColumnDfn(17,"UpdateBy",4,4,false,10), new ColumnDfn(17,"UpdateHost",0,12,false,100), + new ColumnDfn(18,"Id",5,-5,true,19), new ColumnDfn(18,"UserAccountId",4,4,false,10), - new ColumnDfn(18,"ActivityIndexIds",0,-9,false,0), - new ColumnDfn(18,"UserSessionData",0,-9,false,0), + new ColumnDfn(18,"UserRoleCode",0,12,false,16), + new ColumnDfn(18,"LastLoginAt",9,93,false,16), + new ColumnDfn(18,"LastInvalidLoginAt",9,93,false,16), + new ColumnDfn(18,"InvalidLoginCount",3,5,false,5), + new ColumnDfn(18,"Notes",0,-9,false,2000), new ColumnDfn(18,"Flags",3,5,false,5), + new ColumnDfn(18,"Status",0,12,false,3), new ColumnDfn(18,"CreateOn",9,93,false,23), + new ColumnDfn(18,"CreateBy",4,4,false,10), + new ColumnDfn(18,"CreateHost",0,12,false,100), new ColumnDfn(18,"UpdateOn",9,93,false,23), - new ColumnDfn(19,"Id",5,-5,true,19), + new ColumnDfn(18,"UpdateBy",4,4,false,10), + new ColumnDfn(18,"UpdateHost",0,12,false,100), new ColumnDfn(19,"UserAccountId",4,4,false,10), - new ColumnDfn(19,"SportId",4,4,false,10), - new ColumnDfn(19,"About",0,-9,false,2000), - new ColumnDfn(19,"Participation",3,5,false,5), - new ColumnDfn(19,"Officiating",3,5,false,5), - new ColumnDfn(19,"UserSportData",0,-9,false,0), - new ColumnDfn(19,"Notes",0,-9,false,2000), + new ColumnDfn(19,"ActivityIndexIds",0,-9,false,0), + new ColumnDfn(19,"UserSessionData",0,-9,false,0), new ColumnDfn(19,"Flags",3,5,false,5), - new ColumnDfn(19,"Status",0,12,false,3), new ColumnDfn(19,"CreateOn",9,93,false,23), - new ColumnDfn(19,"CreateBy",4,4,false,10), - new ColumnDfn(19,"CreateHost",0,12,false,100), new ColumnDfn(19,"UpdateOn",9,93,false,23), - new ColumnDfn(19,"UpdateBy",4,4,false,10), - new ColumnDfn(19,"UpdateHost",0,12,false,100), new ColumnDfn(20,"Id",5,-5,true,19), - new ColumnDfn(20,"UserSportId",5,-5,false,19), - new ColumnDfn(20,"PeriodFrom",9,93,false,16), - new ColumnDfn(20,"PeriodTo",9,93,false,16), - new ColumnDfn(20,"OrganisationId",4,4,false,10), - new ColumnDfn(20,"OrganisationName",0,-9,false,200), - new ColumnDfn(20,"Summary",0,-9,false,2000), - new ColumnDfn(20,"Team",0,-9,false,64), - new ColumnDfn(20,"League",0,-9,false,64), - new ColumnDfn(20,"Speciality",0,-9,false,64), - new ColumnDfn(20,"SpecialitiesOther",0,-9,false,1000), - new ColumnDfn(20,"RegionIdNation",4,4,false,10), - new ColumnDfn(20,"RegionIdProvince",4,4,false,10), - new ColumnDfn(20,"Awards",0,-9,false,2000), - new ColumnDfn(20,"UserSportExperienceData",0,-9,false,0), + new ColumnDfn(20,"UserAccountId",4,4,false,10), + new ColumnDfn(20,"SportId",4,4,false,10), + new ColumnDfn(20,"About",0,-9,false,2000), + new ColumnDfn(20,"Participation",3,5,false,5), + new ColumnDfn(20,"Officiating",3,5,false,5), + new ColumnDfn(20,"UserSportData",0,-9,false,0), new ColumnDfn(20,"Notes",0,-9,false,2000), new ColumnDfn(20,"Flags",3,5,false,5), new ColumnDfn(20,"Status",0,12,false,3), @@ -935,6 +943,30 @@ namespace Saxonite.Base.App new ColumnDfn(20,"UpdateOn",9,93,false,23), new ColumnDfn(20,"UpdateBy",4,4,false,10), new ColumnDfn(20,"UpdateHost",0,12,false,100), + new ColumnDfn(21,"Id",5,-5,true,19), + new ColumnDfn(21,"UserSportId",5,-5,false,19), + new ColumnDfn(21,"PeriodFrom",9,93,false,16), + new ColumnDfn(21,"PeriodTo",9,93,false,16), + new ColumnDfn(21,"OrganisationId",4,4,false,10), + new ColumnDfn(21,"OrganisationName",0,-9,false,200), + new ColumnDfn(21,"Summary",0,-9,false,2000), + new ColumnDfn(21,"Team",0,-9,false,64), + new ColumnDfn(21,"League",0,-9,false,64), + new ColumnDfn(21,"Speciality",0,-9,false,64), + new ColumnDfn(21,"SpecialitiesOther",0,-9,false,1000), + new ColumnDfn(21,"RegionIdNation",4,4,false,10), + new ColumnDfn(21,"RegionIdProvince",4,4,false,10), + new ColumnDfn(21,"Awards",0,-9,false,2000), + new ColumnDfn(21,"UserSportExperienceData",0,-9,false,0), + new ColumnDfn(21,"Notes",0,-9,false,2000), + new ColumnDfn(21,"Flags",3,5,false,5), + new ColumnDfn(21,"Status",0,12,false,3), + new ColumnDfn(21,"CreateOn",9,93,false,23), + new ColumnDfn(21,"CreateBy",4,4,false,10), + new ColumnDfn(21,"CreateHost",0,12,false,100), + new ColumnDfn(21,"UpdateOn",9,93,false,23), + new ColumnDfn(21,"UpdateBy",4,4,false,10), + new ColumnDfn(21,"UpdateHost",0,12,false,100), }; //------------------------------------------------------------------- diff --git a/SaxoniteStandardBase/Base/App/SaxInternals.cs b/SaxoniteStandardBase/Base/App/SaxInternals.cs index f42d0d1..4017c07 100644 --- a/SaxoniteStandardBase/Base/App/SaxInternals.cs +++ b/SaxoniteStandardBase/Base/App/SaxInternals.cs @@ -95,6 +95,7 @@ namespace Saxonite.Net.Standard.Base.App public List SportParticipationCodes { get { return GetCodesOfType(Sax.CodeType.SportParticipation); } } public List SportOfficiatingCodes { get { return GetCodesOfType(Sax.CodeType.SportOfficiating); } } public List RegionTypeCodes { get { return GetCodesOfType(Sax.CodeType.RegionType); } } + public List EligibilityTypeCodes { get { return GetCodesOfType(Sax.CodeType.EligibilityType); } } public List UserRoleCodes { get { return GetCodesOfType(Sax.CodeType.UserRole); } } public List OrganisationTypeCodes { get { return GetCodesOfType(Sax.CodeType.OrganisationType); } } public List OrganisationCategoryCodes { get { return GetCodesOfType(Sax.CodeType.OrganisationCategory); } } diff --git a/SaxoniteStandardBase/Base/App/SaxSystem-CodeTypes.cs b/SaxoniteStandardBase/Base/App/SaxSystem-CodeTypes.cs index 3681b92..2c17e64 100644 --- a/SaxoniteStandardBase/Base/App/SaxSystem-CodeTypes.cs +++ b/SaxoniteStandardBase/Base/App/SaxSystem-CodeTypes.cs @@ -20,6 +20,7 @@ namespace Saxonite.Net.Standard.Base.App private static readonly List sportParticipationCodes = new List(); private static readonly List sportOfficiatingCodes = new List(); private static readonly List regionTypeCodes = new List(); + private static readonly List eligibilityTypeCodes = new List(); private static readonly List userRoleCodes = new List(); private static readonly List titleCodes = new List(); private static readonly List imageTypeCodes = new List(); @@ -55,6 +56,8 @@ namespace Saxonite.Net.Standard.Base.App return new List(sportOfficiatingCodes); case Sax.CodeType.RegionType: return new List(regionTypeCodes); + case Sax.CodeType.EligibilityType: + return new List(eligibilityTypeCodes); case Sax.CodeType.UserRole: return new List(userRoleCodes); case Sax.CodeType.Title: @@ -105,7 +108,7 @@ namespace Saxonite.Net.Standard.Base.App dataItemTypeCodes.Add(Sax.DataItemType.UserOrganisation, "UserOrganisation", "User Organisation"); dataItemTypeCodes.Add(Sax.DataItemType.UserSport, "UserSport", "User Sport"); dataItemTypeCodes.Add(Sax.DataItemType.Organisation, "Organisation", "Organisation"); - // Activty data. + // Activity data. dataItemTypeCodes.Add(Sax.DataItemType.ActivityIndex, "ActivityIndex", "Activity Index"); dataItemTypeCodes.Add(Sax.DataItemType.UserActivity, "UserActivity", "User Activity"); dataItemTypeCodes.Add(Sax.DataItemType.Article, "Article", "Article"); @@ -155,6 +158,15 @@ namespace Saxonite.Net.Standard.Base.App regionTypeCodes.Add(Sax.RegionType.State, "STAT", "State"); regionTypeCodes.Add(Sax.RegionType.Province, "PROV", "Province"); + //--------------------------------------------------------------- + // Eligibility types. + eligibilityTypeCodes.Add(Sax.EligibilityType.Birth, "BTH", "Birth"); + eligibilityTypeCodes.Add(Sax.EligibilityType.Naturalised, "NLD", "Naturalised"); + eligibilityTypeCodes.Add(Sax.EligibilityType.Parent, "PRT", "Parent"); + eligibilityTypeCodes.Add(Sax.EligibilityType.Grandparent, "GRD", "Grandparent"); + eligibilityTypeCodes.Add(Sax.EligibilityType.Passport, "PST", "Passport"); + eligibilityTypeCodes.Add(Sax.EligibilityType.Visa, "VSA", "Visa"); + //--------------------------------------------------------------- // User roles. userRoleCodes.Add(Sax.UserRole.Journalist, "JRNLST", "Journalist"); diff --git a/SaxoniteStandardBase/Base/Bus/SaxUserEligibility.cs b/SaxoniteStandardBase/Base/Bus/SaxUserEligibility.cs new file mode 100644 index 0000000..254fcae --- /dev/null +++ b/SaxoniteStandardBase/Base/Bus/SaxUserEligibility.cs @@ -0,0 +1,323 @@ +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Core; +using Saxonite.Base.App; +using Saxonite.Net.Standard.Base.App; +using System; +using System.Collections.Generic; +using System.Text; +using static Saxonite.Net.Standard.Base.App.Sax.Config.Security; + +namespace Saxonite.Net.Standard.Base.Bus +{ + //======================================================================= + // User Eligibility. + //======================================================================= + public abstract class SaxUserEligibility : SacsHierarchyItem + { + //------------------------------------------------------------------- + // Columns. + public enum Column + { + Pos, + Id, + // User. + UserAccountId, + User_EmailAddress, + User_DisplayName, + User_Title, + User_FirstName, + User_LastName, + // Region. + RegionId, + Region_Type, + Region_Type_Desc, + Region_CountryIso2Code, + Region_Name, + Region_ParentId, + // Eligibility. + EligibilityType, + EligibilityType_Desc, + Info, + ExpiresOn, + // Associated data. + // Common. + Notes, + Flags, + Status, + Status_Desc, + Status_Ind, + CreateOn_Date, + UpdateOn_Date, + } + + //------------------------------------------------------------------- + /// Properties other than common. + public class DataProperties + { + public SysId UserAccountId { get; set; } + public SysId RegionId { get; set; } + public String Info { get; set; } + public Sax.EligibilityType EligibilityType { get; set; } + public DateTime ExpiresOn { get; set; } = DateTime.MinValue; + } + + //------------------------------------------------------------------- + // Data. + public new class Data : SacsHierarchyItem.Data + { + // Data members. + private readonly DataProperties data = new DataProperties(); + // Construction. + public Data() + { + Status = DefaultStatus; + } + // Properties. + public SysId UserAccountId + { + get { return data.UserAccountId; } + set { CheckChanged(data.UserAccountId, value); data.UserAccountId = value; } + } + public SysId RegionId + { + get { return data.RegionId; } + set { CheckChanged(data.RegionId, value); data.RegionId = value; } + } + public Sax.EligibilityType EligibilityType + { + get { return data.EligibilityType; } + set { CheckChanged((int)data.EligibilityType, (int)value); data.EligibilityType = value; } + } + public String Info + { + get { return data.Info; } + set { CheckChanged(data.Info, value); data.Info = value; } + } + public DateTime ExpiresOn + { + get { return data.ExpiresOn; } + set { CheckChanged(data.ExpiresOn, value); data.ExpiresOn = value; } + } + // Population. + internal void PopulateFrom(Data data) + { + UserAccountId = data.UserAccountId; + RegionId = data.RegionId; + EligibilityType = data.EligibilityType; + Info = data.Info; + ExpiresOn = data.ExpiresOn; + base.PopulateFrom(data); + } + public Data Clone() + { + Data data = new Data(); + data.PopulateFrom(this); + return data; + } + } + + //------------------------------------------------------------------- + // Error field - identify properties with validation error. + public new class ErrField : SacsHierarchyItem.ErrField + { + // Identifies the field that has invalid data. + public ValidValue UserAccountId { get; set; } = ValidValue.Valid; + public ValidValue RegionId { get; set; } = ValidValue.Valid; + public ValidValue EligibilityType { get; set; } = ValidValue.Valid; + public ValidValue Info { get; set; } = ValidValue.Valid; + public ValidValue ExpiresOn { get; set; } = ValidValue.Valid; + } + + //------------------------------------------------------------------- + // Data members. + private readonly Data data = new Data(); + + //------------------------------------------------------------------- + // Construction. + protected SaxUserEligibility(SysId id, SysId userAccountId, SysId regionId, Sax.EligibilityType eligibilityType) : base(id) + { + base.SetData(data); + UserAccountId = userAccountId; + RegionId = regionId; + EligibilityType = eligibilityType; + Status = DefaultStatus; + } + + //------------------------------------------------------------------- + // Status. + private static readonly List validStatuses = new List() + { + SaStatus.Active, + SaStatus.Inactive, + SaStatus.Deleted, + }; + public static SaStatus DefaultStatus { get { return SaStatus.Active; } } + public static List ValidStatuses { get { return new List(validStatuses); } } + public static DataValue.TriStateType GetStatusTriState(SaStatus status) + { + if (status == SaStatus.Active) return DataValue.TriStateType.Green; + if (status == SaStatus.Inactive) return DataValue.TriStateType.Red; + if (status == SaStatus.Deleted) return DataValue.TriStateType.Purple; + return DataValue.TriStateType.Unknown; + } + + //------------------------------------------------------------------- + // Utilities. + public ItemId GetItemId() + { + return new ItemId((short)Sax.DataItemType.UserEligibility, Id); + } + + /// Maximum number of instances per user, regardless of region. + public static int GetMaxInstances(Sax.EligibilityType eligibilityType) + { + switch (eligibilityType) + { + case Sax.EligibilityType.Birth: return 1; + case Sax.EligibilityType.Naturalised: return 1; + case Sax.EligibilityType.Parent: return 2; + case Sax.EligibilityType.Grandparent: return 4; + case Sax.EligibilityType.Passport: return 9; + case Sax.EligibilityType.Visa: return 9; + } + return 9; + } + + /// Does the eligibility allow a date range. + public static bool AllowsApplicablePeriod(Sax.EligibilityType eligibilityType) + { + switch (eligibilityType) + { + //case Sax.EligibilityType.Birth: + //case Sax.EligibilityType.Naturalised: + //case Sax.EligibilityType.Parent: + //case Sax.EligibilityType.Grandparent: + case Sax.EligibilityType.Passport: + case Sax.EligibilityType.Visa: + return true; + } + return false; + } + + //------------------------------------------------------------------- + // Properties. + public Data GetData() { return data.Clone(); } + public void SetData(Data data) + { + String fn = GetType().Name + ".SetData"; + // Properties that cannot be changed if previously specified. + if (SysId.IsValid(Id) && SysId.ToInt(Id) != SysId.ToInt(data.Id)) + throw new NotSupportedException(fn + " Id cannot be changed"); + if (SysId.IsValid(UserAccountId) && SysId.ToInt(UserAccountId) != SysId.ToInt(data.UserAccountId)) + throw new NotSupportedException(fn + " User Account Id cannot be changed"); + if (SysId.IsValid(RegionId) && SysId.ToInt(RegionId) != SysId.ToInt(data.RegionId)) + throw new NotSupportedException(fn + " Region Id cannot be changed"); + if (EligibilityType == 0 && (int)EligibilityType != (int)EligibilityType) + throw new NotSupportedException(fn + " User Eligibility cannot be changed"); + this.data.PopulateFrom(data); + } + + /// User Account Id. NB Can only be set where previously invalid. + public SysId UserAccountId + { + get { return data.UserAccountId; } + set + { + if (SysId.IsValid(UserAccountId) && SysId.ToInt(UserAccountId) != SysId.ToInt(data.UserAccountId)) + throw new NotSupportedException("EligibilityType.UserAccountId cannot be changed"); + data.UserAccountId = value; + } + } + + /// Region Id. NB Can only be set where previously invalid. + public SysId RegionId + { + get { return data.RegionId; } + set + { + if (SysId.IsValid(RegionId) && SysId.ToInt(RegionId) != SysId.ToInt(data.RegionId)) + throw new NotSupportedException("EligibilityType.RegionId cannot be changed"); + data.RegionId = value; + } + } + + /// User Eligibility. Can only be populated on construction. + public Sax.EligibilityType EligibilityType + { + get { return data.EligibilityType; } + protected set { data.EligibilityType = value; } + } + + public String Info + { + get { return data.Info; } + set { data.Info = value; } + } + + public DateTime ExpiresOn + { + get { return data.ExpiresOn; } + set { data.ExpiresOn = value; } + } + + //------------------------------------------------------------------- + // Flags - positions 1-16 available. + + //------------------------------------------------------------------- + // A s s o c i a t e d D a t a + //------------------------------------------------------------------- + + //------------------------------------------------------------------- + // P a r a m s + //------------------------------------------------------------------- + // List parameters. + public enum StatusCat + { + Any, + ActiveOnly, + InactiveOnly, + NotDeleted, + DeletedOnly, + } + /// + /// Item list parameters. + /// + public new class Params : SacsHierarchyItem.Params + { + // List filtering. + public List IdsIncluded { get; } = new List(); + public List IdsExcluded { get; } = new List(); + public List UserAccountIdsIncluded { get; } = new List(); + public List RegionIdsIncluded { get; } = new List(); + public List EligibilityTypesIncluded { get; } = new List(); + public DateTime ValidOn { get; set; } + // Common properties. + public String NotesPartial { get; set; } + public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted; + } + + //------------------------------------------------------------------- + } + //======================================================================= + // Item list extension methods. + public static class SaxEligibilityTypeList + { + //------------------------------------------------------------------- + /// Retrieve the first entry in the list matching the specified Region. + public static List GetEligibilityTypesByStatus(this List values, SysId regionId) + { + return values.FindAll(item => item.RegionId == regionId); + } + + //------------------------------------------------------------------- + /// Retrieve the first entry in the list matching the specified Eligibility. + public static SaxUserEligibility GetEligibilityTypeByEligibility(this List values, Sax.EligibilityType EligibilityType) + { + return values.Find(item => item.EligibilityType == EligibilityType); + } + + //------------------------------------------------------------------- + } + + //======================================================================= +} diff --git a/SaxoniteStandardBase/Base/Consoles/SaxActivityConsole.cs b/SaxoniteStandardBase/Base/Consoles/SaxActivityConsole.cs index f539c05..e341a10 100644 --- a/SaxoniteStandardBase/Base/Consoles/SaxActivityConsole.cs +++ b/SaxoniteStandardBase/Base/Consoles/SaxActivityConsole.cs @@ -80,7 +80,7 @@ namespace Saxonite.Net.Standard.Base.Consoles // Author. public SysId UserAccountIdAuthor { get; set; } public String Author { get; set; } - // Activty details. + // Activity details. public String Caption { get; protected set; } public String Blurb { get; protected set; } // Thumbnail. diff --git a/SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-UserEligibility.cs b/SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-UserEligibility.cs new file mode 100644 index 0000000..487e988 --- /dev/null +++ b/SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-UserEligibility.cs @@ -0,0 +1,253 @@ +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; +using Sarand.Net.Standard.Base.Utils; +using Saxonite.Base.App; +using Saxonite.Net.Standard.Base.App; +using Saxonite.Net.Standard.Base.Bus; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Saxonite.Net.Standard.Base.Mgr +{ + //======================================================================= + partial class SaxAccountMgr + { + //******************************************************************* + // Account Mgr - User Eligibility + //******************************************************************* + // Utilities. + public bool UserRegionHasEligibility(SysId userAccountId, SysId regionId, DateTime validOn, SaxUserEligibility.StatusCat statusCat = SaxUserEligibility.StatusCat.ActiveOnly) + { + if (!SysId.IsValid(userAccountId) || !SysId.IsValid(regionId)) return false; + SaxUserEligibility.Params prmEligibilityType = new SaxUserEligibility.Params(); + prmEligibilityType.UserAccountIdsIncluded.Add(userAccountId); + prmEligibilityType.RegionIdsIncluded.Add(regionId); + prmEligibilityType.ValidOn = validOn; + prmEligibilityType.StatusCat = statusCat; + return GetUserEligibilityCount(prmEligibilityType) > 0; + } + /// + /// Retrievethe eligibility entries for the specified user. + /// - Optional region can be supplied to restrict results. + /// - Optional valid on date can be supplied to restrict results. + /// - Eligibility status defaults to active. + /// + /// User account + /// + /// + /// + public List GetUserEligibility(SysId userAccountId, SysId regionId = null, DateTime? validOn = null, SaxUserEligibility.StatusCat statusCat = SaxUserEligibility.StatusCat.ActiveOnly) + { + if (!SysId.IsValid(userAccountId)) return new List(); + SaxUserEligibility.Params prmEligibilityType = new SaxUserEligibility.Params(); + prmEligibilityType.UserAccountIdsIncluded.Add(userAccountId); + if (SysId.IsValid(regionId)) + prmEligibilityType.RegionIdsIncluded.Add(regionId); + if (DateUtil.IsValid(validOn)) + prmEligibilityType.ValidOn = (DateTime)validOn; + prmEligibilityType.StatusCat = statusCat; + return GetUserEligibilityList(prmEligibilityType); + } + + //------------------------------------------------------------------- + // Create item. + public abstract SaxUserEligibility CreateUserEligibility(SysId userAccountId, SysId regionId, Sax.EligibilityType userEligibility); + + //------------------------------------------------------------------- + // Item exists. + public bool UserEligibilityExistsById(SysId id) + { + ClearErrorState(); + if (!SysId.IsValid(id)) return false; + SaxUserEligibility.Params prmEligibilityType = new SaxUserEligibility.Params(); + prmEligibilityType.IdsIncluded.Add(id); + prmEligibilityType.StatusCat = SaxUserEligibility.StatusCat.Any; + return GetUserEligibilityCount(prmEligibilityType) == 1; + } + + //------------------------------------------------------------------- + // Retrieve individual items. + public abstract SaxUserEligibility GetUserEligibility(SaxUserEligibility.Params prmEligibilityType); + public SaxUserEligibility GetUserEligibilityById(SysId id) + { + ClearErrorState(); + if (!SysId.IsValid(id)) return null; + SaxUserEligibility.Params prmEligibilityType = new SaxUserEligibility.Params(); + prmEligibilityType.IdsIncluded.Add(id); + prmEligibilityType.StatusCat = SaxUserEligibility.StatusCat.Any; + return GetUserEligibility(prmEligibilityType); + } + + //------------------------------------------------------------------- + // Validate item data. + public bool IsValidUserEligibility(SaxUserEligibility userEligibility) + { + ClearErrorState(); + if (userEligibility == null) return SetErrorState(ErrorMessage.ItemNotSpecified); + return IsValidUserEligibilityData(userEligibility.GetData(), new SaxUserEligibility.ErrField()); + } + public virtual bool IsValidUserEligibilityData(SaxUserEligibility.Data data, SaxUserEligibility.ErrField errField) + { + ClearErrorState(); + + // User Account. + if (errField.UserAccountId != SacsHierarchyItem.ValidValue.Ignore && !SysId.IsValid(data.UserAccountId)) + { + errField.UserAccountId = SacsHierarchyItem.ValidValue.Invalid; + return SetErrorState("User Account Id must be specified"); + } + + // Region. + if (errField.RegionId != SacsHierarchyItem.ValidValue.Ignore && !SysId.IsValid(data.RegionId)) + { + errField.RegionId = SacsHierarchyItem.ValidValue.Invalid; + return SetErrorState("Region Id must be specified"); + } + + // Eligibility Type. + if (errField.EligibilityType != SacsHierarchyItem.ValidValue.Ignore && (int)data.EligibilityType < 1) + { + errField.EligibilityType = SacsHierarchyItem.ValidValue.Invalid; + return SetErrorState("User Eligibility must be specified"); + } + + // Info. + if (errField.Info != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Info, "info", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserEligibility_Info))) + { + errField.Info = SacsHierarchyItem.ValidValue.Invalid; + return false; + } + + // Expires on. + if (errField.ExpiresOn != SacsHierarchyItem.ValidValue.Ignore) + { + } + + //--------------------------------------------------------------- + // Common properties. + if (errField.Notes != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Notes, "notes", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserEligibility_Notes))) + { + errField.Notes = SacsHierarchyItem.ValidValue.Invalid; + return false; + } + if (errField.Status != SacsHierarchyItem.ValidValue.Ignore) + { + if (!IsValidValue(data.StatusCode, "status", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserEligibility_Status), true, true)) + { + errField.Status = SacsHierarchyItem.ValidValue.Invalid; + return false; + } + if (!SaxUserEligibility.ValidStatuses.Contains(data.Status)) + { + errField.Status = SacsHierarchyItem.ValidValue.Invalid; + return SetErrorState(ErrorMessage.InvalidStatus); + } + } + + //--------------------------------------------------------------- + // User & Eligibility combination must be unique. + if (errField.UserAccountId != SacsHierarchyItem.ValidValue.Ignore && errField.RegionId != SacsHierarchyItem.ValidValue.Ignore && errField.EligibilityType != SacsHierarchyItem.ValidValue.Ignore) + { + if (SysId.IsValid(data.UserAccountId) && SysId.IsValid(data.RegionId) && data.EligibilityType > 0) + { + SaxUserEligibility.Params prmEligibilityType = new SaxUserEligibility.Params(); + if (SysId.IsValid(data.Id)) + prmEligibilityType.IdsExcluded.Add(data.Id); + prmEligibilityType.UserAccountIdsIncluded.Add(data.UserAccountId); + prmEligibilityType.RegionIdsIncluded.Add(data.RegionId); + prmEligibilityType.EligibilityTypesIncluded.Add(data.EligibilityType); + prmEligibilityType.StatusCat = SaxUserEligibility.StatusCat.Any; + if (GetUserEligibilityCount(prmEligibilityType) > 0) + { + errField.EligibilityType = SacsHierarchyItem.ValidValue.Invalid; + return SetErrorState("Eligibility must be unique for user, region and type"); + } + } + } + + //--------------------------------------------------------------- + return true; + } + + //------------------------------------------------------------------- + // Item database interface. + public abstract bool InsertUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo); + public abstract bool UpdateUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo); + public virtual bool UserEligibilityCanBeDeleted(SaxUserEligibility userEligibility) + { + ClearErrorState(); + return true; + } + public abstract bool DeleteUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo); + + //------------------------------------------------------------------- + // Item list. + public abstract ColumnDfn GetUserEligibilityColumnDfn(SaxUserEligibility.Column columnId, String caption = "", int width = 0); + public abstract List GetUserEligibilityQueryFilter(SaxUserEligibility.Params prmEligibilityType); + public abstract long GetUserEligibilityCount(SaxUserEligibility.Params prmEligibilityType); + public abstract List GetUserEligibilityList(SaxUserEligibility.Params prmEligibilityType); + public abstract DbResultSet ExecuteUserEligibilityQuery(List columns, SaxUserEligibility.Params prmEligibilityType); + + //------------------------------------------------------------------- + /// + /// Extract and format result set data value where specific handling is required. + /// Where response is an invalid data value, format value using column.FormatValue(values). + /// + public virtual DataValue GetUserEligibilityDataValue(ColumnDfn column, NamedValue.Map values) + { + DataValue value = new DataValue(); + switch ((SaxUserEligibility.Column)column.Id) + { + //----------------------------------------------------------- + // Eligibility Type. + case SaxUserEligibility.Column.EligibilityType_Desc: + { + Sax.EligibilityType eligibilityType = (Sax.EligibilityType)values.GetValue(column.DataName).AsLong(); + value = new DataValue(EligibilityTypeCodes.GetDescForType(eligibilityType)); + } + break; + + //----------------------------------------------------------- + // Region Type. + case SaxUserEligibility.Column.Region_Type_Desc: + { + Sax.RegionType regionType = (Sax.RegionType)values.GetValue(column.DataName).AsLong(); + value = new DataValue(RegionTypeCodes.GetDescForType(regionType)); + } + break; + + //----------------------------------------------------------- + // Notes. + case SaxUserEligibility.Column.Notes: + { + value = new DataValue(SacsHierarchyItem.FormatForDisplay(values.GetValue(column.DataName).ToString(), 200)); + } + break; + + //----------------------------------------------------------- + // Status. + case SaxUserEligibility.Column.Status_Desc: + case SaxUserEligibility.Column.Status_Ind: + { + String statusCode = values.GetValue(column.DataName).ToString(); + SaStatus status = SacsSystem.GetStatusForCode(statusCode); + if (column.Id == (int)SaxUserEligibility.Column.Status_Desc) + value = new DataValue(SacsSystem.GetStatusDesc(status)); + else if (column.Id == (int)SaxUserEligibility.Column.Status_Ind) + value = new DataValue(SaxUserEligibility.GetStatusTriState(status)); + } + break; + + //----------------------------------------------------------- + } + return value; + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteStandardBase/Base/Mgr/SaxItemMgr.cs b/SaxoniteStandardBase/Base/Mgr/SaxItemMgr.cs index 48146f8..81be8a2 100644 --- a/SaxoniteStandardBase/Base/Mgr/SaxItemMgr.cs +++ b/SaxoniteStandardBase/Base/Mgr/SaxItemMgr.cs @@ -71,6 +71,7 @@ namespace Saxonite.Net.Standard.Base.Mgr public List SportParticipationCodes { get { return Internals.SportParticipationCodes; } } public List SportOfficiatingCodes { get { return Internals.SportOfficiatingCodes; } } public List RegionTypeCodes { get { return Internals.RegionTypeCodes; } } + public List EligibilityTypeCodes { get { return Internals.EligibilityTypeCodes; } } public List UserRoleCodes { get { return Internals.UserRoleCodes; } } public List OrganisationTypeCodes { get { return Internals.OrganisationTypeCodes; } } public List OrganisationCategoryCodes { get { return Internals.OrganisationCategoryCodes; } } diff --git a/SaxoniteStandardDbas/Dbas/Bus/SaxUserEligibility_Dbas.cs b/SaxoniteStandardDbas/Dbas/Bus/SaxUserEligibility_Dbas.cs new file mode 100644 index 0000000..42e992c --- /dev/null +++ b/SaxoniteStandardDbas/Dbas/Bus/SaxUserEligibility_Dbas.cs @@ -0,0 +1,33 @@ +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Dbas; +using Saxonite.Net.Standard.Base.App; +using Saxonite.Net.Standard.Base.Bus; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Saxonite.Net.Standard.Dbas.Bus +{ + //======================================================================= + public class SaxUserEligibility_Dbas : SaxUserEligibility + { + //------------------------------------------------------------------- + // Data members. + private ISacsDatabase database; + + //------------------------------------------------------------------- + // Construction. + public SaxUserEligibility_Dbas (ISacsDatabase database, SysId id, SysId userAccountId, SysId regionId, Sax.EligibilityType eligibilityType, UInt16 flags) : + base(id, userAccountId, regionId, eligibilityType) + { + this.database = database; + Flags = flags; + } + + //------------------------------------------------------------------- + // Associated data. + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteStandardDbas/Dbas/Internal/ActivityFeedback_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ActivityFeedback_Db.cs index 5444663..8c3f18c 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ActivityFeedback_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ActivityFeedback_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/ActivityIndex_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ActivityIndex_Db.cs index 2c95c83..5c1a344 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ActivityIndex_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ActivityIndex_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/Article_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/Article_Db.cs index e4d8764..609a851 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/Article_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/Article_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/ItemAddress_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ItemAddress_Db.cs index 0cdeb82..9a16e0c 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ItemAddress_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ItemAddress_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/ItemAssociation_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ItemAssociation_Db.cs index ebd17d8..4c4d866 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ItemAssociation_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ItemAssociation_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/ItemImage_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ItemImage_Db.cs index 58d7da5..c7b5b1c 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ItemImage_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ItemImage_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/ItemSport_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/ItemSport_Db.cs index 8e6e322..e1198f7 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/ItemSport_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/ItemSport_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/OrganisationEvent_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/OrganisationEvent_Db.cs index 79f6953..d220bdc 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/OrganisationEvent_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/OrganisationEvent_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/OrganisationOpportunity_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/OrganisationOpportunity_Db.cs index 9876a90..434f251 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/OrganisationOpportunity_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/OrganisationOpportunity_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/Organisation_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/Organisation_Db.cs index a0c5c68..427fd4c 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/Organisation_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/Organisation_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:45 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/Region_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/Region_Db.cs index c2e702e..f8556bd 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/Region_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/Region_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/Sport_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/Sport_Db.cs index 2531ef2..a70d8a6 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/Sport_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/Sport_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserAccount_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserAccount_Db.cs index 1888c2a..67a41f8 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserAccount_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserAccount_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserActivity_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserActivity_Db.cs index 42df408..691fd40 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserActivity_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserActivity_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserEligibility_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserEligibility_Db.cs new file mode 100644 index 0000000..8a82fcb --- /dev/null +++ b/SaxoniteStandardDbas/Dbas/Internal/UserEligibility_Db.cs @@ -0,0 +1,230 @@ +using Microsoft.Data.SqlClient; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; +using Sarand.Net.Standard.Base.Utils; +using Saxonite.Net.Standard.Dbas.Data; +using System; +using System.Collections.Generic; +using System.Data.Common; +using System.Linq; + +//--------------------------------------------------------------------------- +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 +//--------------------------------------------------------------------------- +namespace Saxonite.Net.Standard.Dbas.Internal +{ + internal class UserEligibility_Db : SaxDbDataItem + { + //------------------------------------------------------------------- + // Column definitions. + public class ColumnsData + { + public ColumnDataInt64 _Id { get; } = new ColumnDataInt64("Id", true); + public ColumnDataInt32 _UserAccountId { get; } = new ColumnDataInt32("UserAccountId"); + public ColumnDataInt32 _RegionId { get; } = new ColumnDataInt32("RegionId"); + public ColumnDataInt16 _EligibilityType { get; } = new ColumnDataInt16("EligibilityType"); + public ColumnDataString _Info { get; } = new ColumnDataString("Info"); + public ColumnDataDateTime _ExpiresOn { get; } = new ColumnDataDateTime("ExpiresOn"); + public ColumnDataString _Notes { get; } = new ColumnDataString("Notes"); + public ColumnDataInt16 _Flags { get; } = new ColumnDataInt16("Flags"); + public ColumnDataString _Status { get; } = new ColumnDataString("Status"); + public ColumnDataDateTime _CreateOn { get; } = new ColumnDataDateTime("CreateOn"); + public ColumnDataInt32 _CreateBy { get; } = new ColumnDataInt32("CreateBy"); + public ColumnDataString _CreateHost { get; } = new ColumnDataString("CreateHost"); + public ColumnDataDateTime _UpdateOn { get; } = new ColumnDataDateTime("UpdateOn"); + public ColumnDataInt32 _UpdateBy { get; } = new ColumnDataInt32("UpdateBy"); + public ColumnDataString _UpdateHost { get; } = new ColumnDataString("UpdateHost"); + } + + //------------------------------------------------------------------- + // Data members. + protected static List fields { get; } = new List() + { + "Id", + "UserAccountId", + "RegionId", + "EligibilityType", + "Info", + "ExpiresOn", + "Notes", + "Flags", + "Status", + "CreateOn", + "CreateBy", + "CreateHost", + "UpdateOn", + "UpdateBy", + "UpdateHost", + }; + protected static List fieldsId { get; } = new List() + { + "Id", + }; + protected static List fieldsPrimary { get; } = new List() + { + "Id", + }; + protected static List fieldsIgnoreOnUpdate { get; } = new List() + { + "CreateOn", + "CreateBy", + "CreateHost", + }; + + //------------------------------------------------------------------- + // Construction. + internal UserEligibility_Db (IDatabaseInfo dbInfo) : base(dbInfo) + { + } + + //------------------------------------------------------------------- + // Properties. + public override String SchemaName { get; } = "dbo"; + public override String TableName { get; } = "UserEligibility"; + public String TableNameFmt { get { return (!String.IsNullOrEmpty(SchemaName) ? "[" + SchemaName + "]." : "") + "[" + TableName + "]"; } } + public static List Fields { get { return new List(fields); } } + public static List FieldsId { get { return new List(fieldsId); } } + public static List FieldsNonId { get { return fields.FindAll(item => !fieldsId.ContainsCI(item)); } } + // Columns. + public ColumnsData Cols { get; } = new ColumnsData(); + public Int64 _Id { get { return Cols._Id.Value; } set { Cols._Id.Value = value; } } + public Int32 _UserAccountId { get { return Cols._UserAccountId.Value; } set { Cols._UserAccountId.Value = value; } } + public Int32 _RegionId { get { return Cols._RegionId.Value; } set { Cols._RegionId.Value = value; } } + public Int16 _EligibilityType { get { return Cols._EligibilityType.Value; } set { Cols._EligibilityType.Value = value; } } + public String _Info { get { return Cols._Info.Value; } set { Cols._Info.Value = value; } } + public DateTime _ExpiresOn { get { return Cols._ExpiresOn.Value; } set { Cols._ExpiresOn.Value = value; } } + public String _Notes { get { return Cols._Notes.Value; } set { Cols._Notes.Value = value; } } + public Int16 _Flags { get { return Cols._Flags.Value; } set { Cols._Flags.Value = value; } } + public String _Status { get { return Cols._Status.Value; } set { Cols._Status.Value = value; } } + public DateTime _CreateOn { get { return Cols._CreateOn.Value; } set { Cols._CreateOn.Value = value; } } + public Int32 _CreateBy { get { return Cols._CreateBy.Value; } set { Cols._CreateBy.Value = value; } } + public String _CreateHost { get { return Cols._CreateHost.Value; } set { Cols._CreateHost.Value = value; } } + public DateTime _UpdateOn { get { return Cols._UpdateOn.Value; } set { Cols._UpdateOn.Value = value; } } + public Int32 _UpdateBy { get { return Cols._UpdateBy.Value; } set { Cols._UpdateBy.Value = value; } } + public String _UpdateHost { get { return Cols._UpdateHost.Value; } set { Cols._UpdateHost.Value = value; } } + // Existing columns - confirmed on database if table exists. + public List ExistingColumnNames { get { return GetExistingColumnNames(Fields); } } + public List ExistingColumnNamesNonId { get { return GetExistingColumnNames(FieldsNonId); } } + + //------------------------------------------------------------------- + // Population. + public override void PopulateFrom (DbCommand dbCommand, String tableAlias, String filter) + { + dbCommand.CommandText = + "SELECT " + ExistingColumnNames.Concat(", ", (!String.IsNullOrEmpty(tableAlias) ? tableAlias + "." : "") + "[", "]") + " " + + "FROM " + TableNameFmt + (!String.IsNullOrEmpty(tableAlias) ? " " + tableAlias : "") + " " + + (!String.IsNullOrEmpty(filter) ? "WHERE " + filter : ""); + Log(GetType().Name + ".PopulateFrom", dbCommand.CommandText); + using (DbDataReader dbDataReader = dbCommand.ExecuteReader()) + { + dbDataReader.Read(); + PopulateFrom(dbDataReader); + } + } + public override void PopulateFrom (DbDataReader dbDataReader) + { + _Id = GetFieldInt64(dbDataReader, "Id", _Id); + _UserAccountId = GetFieldInt32(dbDataReader, "UserAccountId", _UserAccountId); + _RegionId = GetFieldInt32(dbDataReader, "RegionId", _RegionId); + _EligibilityType = GetFieldInt16(dbDataReader, "EligibilityType", _EligibilityType); + _Info = GetFieldString(dbDataReader, "Info", _Info); + _ExpiresOn = GetFieldDateTime(dbDataReader, "ExpiresOn", _ExpiresOn); + _Notes = GetFieldString(dbDataReader, "Notes", _Notes); + _Flags = GetFieldInt16(dbDataReader, "Flags", _Flags); + _Status = GetFieldString(dbDataReader, "Status", _Status); + _CreateOn = GetFieldDateTime(dbDataReader, "CreateOn", _CreateOn); + _CreateBy = GetFieldInt32(dbDataReader, "CreateBy", _CreateBy); + _CreateHost = GetFieldString(dbDataReader, "CreateHost", _CreateHost); + _UpdateOn = GetFieldDateTime(dbDataReader, "UpdateOn", _UpdateOn); + _UpdateBy = GetFieldInt32(dbDataReader, "UpdateBy", _UpdateBy); + _UpdateHost = GetFieldString(dbDataReader, "UpdateHost", _UpdateHost); + } + + //------------------------------------------------------------------- + // Insert command. + public override bool ExecuteInsertCommand (DbCommand dbCommand) + { + List columnNames = ExistingColumnNamesNonId; + // Avoid insert if Identity field is already valid. + if (_Id != 0) throw new Exception("Invalid for Insert - item already has a valid Id"); + // Construct query. + String query = + "INSERT INTO " + TableNameFmt + " " + + "("+columnNames.Concat(",","[","]")+") "; + query += "Output Inserted.Id "; + if (dbCommand is SqlCommand) + query += "VALUES (" + columnNames.Concat(",", "@", "") + ") "; + else query += "VALUES (" + StringListUtil.CreateList("?", columnNames.Count).Concat(",") + ") "; + dbCommand.CommandText = query; + Log(GetType().Name + ".ExecuteInsertCommand", dbCommand.CommandText); + // Populate parameters. + dbCommand.Parameters.Clear(); + if (columnNames.ContainsCI("UserAccountId")) AddCommandParameter(dbCommand, "@UserAccountId", _UserAccountId); + if (columnNames.ContainsCI("RegionId")) AddCommandParameter(dbCommand, "@RegionId", _RegionId); + if (columnNames.ContainsCI("EligibilityType")) AddCommandParameter(dbCommand, "@EligibilityType", _EligibilityType); + if (columnNames.ContainsCI("Info")) AddCommandParameter(dbCommand, "@Info", _Info); + if (columnNames.ContainsCI("ExpiresOn")) AddCommandParameter(dbCommand, "@ExpiresOn", _ExpiresOn); + if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes); + if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags); + if (columnNames.ContainsCI("Status")) AddCommandParameter(dbCommand, "@Status", _Status); + if (columnNames.ContainsCI("CreateOn")) AddCommandParameter(dbCommand, "@CreateOn", _CreateOn); + if (columnNames.ContainsCI("CreateBy")) AddCommandParameter(dbCommand, "@CreateBy", _CreateBy); + if (columnNames.ContainsCI("CreateHost")) AddCommandParameter(dbCommand, "@CreateHost", _CreateHost); + if (columnNames.ContainsCI("UpdateOn")) AddCommandParameter(dbCommand, "@UpdateOn", _UpdateOn); + if (columnNames.ContainsCI("UpdateBy")) AddCommandParameter(dbCommand, "@UpdateBy", _UpdateBy); + if (columnNames.ContainsCI("UpdateHost")) AddCommandParameter(dbCommand, "@UpdateHost", _UpdateHost); + // Execute insert command. + bool commandSuccess = false; + int executeNonQuery = dbCommand.ExecuteNonQuery(); + if (executeNonQuery == 1) + { + dbCommand.CommandText = "SELECT Max(Id) FROM " + TableNameFmt + ";"; + _Id = Convert.ToInt64(dbCommand.ExecuteScalar()); + commandSuccess = (_Id > 0); + } + return commandSuccess; + } + + //------------------------------------------------------------------- + // Update command. + public override bool ExecuteUpdateCommand (DbCommand dbCommand) + { + // Avoid update if Identity field isn't valid. + if (_Id == 0) throw new Exception("Invalid for Update - item has an invalid Id"); + // Columns to update. + List columnNames = ExistingColumnNamesNonId.Where(item => !fieldsPrimary.ContainsCI(item) && !fieldsIgnoreOnUpdate.ContainsCI(item)).ToList(); + // Construct query. + String query = "UPDATE " + TableNameFmt + " SET "; + if (dbCommand is SqlCommand) + { + query += StringPairList.CreateFrom(columnNames.Bracket("[","]"),columnNames).Concat("=@").Concat(", ") + " "; + query += "WHERE Id=@Id;"; + } + else + { + query += columnNames.Concat(", ", "", "=?") + " "; + query += "WHERE Id=?;"; + } + dbCommand.CommandText = query; + Log(GetType().Name + ".ExecuteUpdateCommand", dbCommand.CommandText); + // Populate parameters. + dbCommand.Parameters.Clear(); + if (columnNames.ContainsCI("UserAccountId")) AddCommandParameter(dbCommand, "@UserAccountId", _UserAccountId); + if (columnNames.ContainsCI("RegionId")) AddCommandParameter(dbCommand, "@RegionId", _RegionId); + if (columnNames.ContainsCI("EligibilityType")) AddCommandParameter(dbCommand, "@EligibilityType", _EligibilityType); + if (columnNames.ContainsCI("Info")) AddCommandParameter(dbCommand, "@Info", _Info); + if (columnNames.ContainsCI("ExpiresOn")) AddCommandParameter(dbCommand, "@ExpiresOn", _ExpiresOn); + if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes); + if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags); + if (columnNames.ContainsCI("Status")) AddCommandParameter(dbCommand, "@Status", _Status); + if (columnNames.ContainsCI("UpdateOn")) AddCommandParameter(dbCommand, "@UpdateOn", _UpdateOn); + if (columnNames.ContainsCI("UpdateBy")) AddCommandParameter(dbCommand, "@UpdateBy", _UpdateBy); + if (columnNames.ContainsCI("UpdateHost")) AddCommandParameter(dbCommand, "@UpdateHost", _UpdateHost); + AddCommandParameter(dbCommand, "@Id", _Id); + int executeNonQueryResult = dbCommand.ExecuteNonQuery(); + return (executeNonQueryResult == 1); + } + + //------------------------------------------------------------------- + } +} diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserOnline_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserOnline_Db.cs index 623ea6c..000435a 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserOnline_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserOnline_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserOrganisation_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserOrganisation_Db.cs index 1b06947..a72470b 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserOrganisation_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserOrganisation_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserRole_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserRole_Db.cs index fd52406..02a2a09 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserRole_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserRole_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserSession_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserSession_Db.cs index 7d5b211..445abd2 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserSession_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserSession_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserSportExperience_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserSportExperience_Db.cs index 3985699..e38c1ee 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserSportExperience_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserSportExperience_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Internal/UserSport_Db.cs b/SaxoniteStandardDbas/Dbas/Internal/UserSport_Db.cs index 9eaea91..885ed69 100644 --- a/SaxoniteStandardDbas/Dbas/Internal/UserSport_Db.cs +++ b/SaxoniteStandardDbas/Dbas/Internal/UserSport_Db.cs @@ -9,7 +9,7 @@ using System.Data.Common; using System.Linq; //--------------------------------------------------------------------------- -// Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58 +// Code generated by Sarand Database Utilities Thu 13-Oct-2022 09:38:46 //--------------------------------------------------------------------------- namespace Saxonite.Net.Standard.Dbas.Internal { diff --git a/SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserEligibility.cs b/SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserEligibility.cs new file mode 100644 index 0000000..bb937ce --- /dev/null +++ b/SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserEligibility.cs @@ -0,0 +1,630 @@ +using Sarand.Net.Standard.Dbas.Data; +using Sarand.Net.Standard.Base.App; +using Sarand.Net.Standard.Base.Bus; +using Sarand.Net.Standard.Base.Core; +using Sarand.Net.Standard.Base.Dbas; +using Saxonite.Base.App; +using Saxonite.Net.Standard.Dbas.Bus; +using Saxonite.Net.Standard.Dbas.Internal; +using Saxonite.Net.Standard.Base.Bus; +using System; +using System.Collections.Generic; +using System.Data.Common; +using System.Text; +using Saxonite.Net.Standard.Base.App; +using System.Linq; +using Sarand.Net.Standard.Base.Utils; +using static Saxonite.Net.Standard.Base.App.Sax; +using System.ComponentModel; + +namespace Saxonite.Net.Standard.Dbas.Mgr +{ + //======================================================================= + partial class SaxAccountMgr_Dbas + { + //******************************************************************* + // Account Mgr - User Eligibility + //******************************************************************* + // Utilities. + private List GetLogProperties(SaxUserEligibility userEligibility) + { + return new List() + { + new StringPair("Id",SysId.ToString(userEligibility.Id)), + new StringPair("UserAccountId",SysId.ToString(userEligibility.UserAccountId)), + new StringPair("RegionId",SysId.ToString(userEligibility.RegionId)), + new StringPair("Eligibility",userEligibility.EligibilityType.ToString()), + new StringPair("Status",userEligibility.StatusCode) + }; + } + + //------------------------------------------------------------------- + // Create item. + public override SaxUserEligibility CreateUserEligibility(SysId userAccountId, SysId regionId, Sax.EligibilityType userEligibility) + { + ClearErrorState(); + return new SaxUserEligibility_Dbas(CoreDatabase, null, userAccountId, regionId, userEligibility, 0); + } + private SaxUserEligibility_Dbas CreateUserEligibility(UserEligibility_Db dbUserEligibility) + { + ClearErrorState(); + SaxUserEligibility_Dbas userEligibility = new SaxUserEligibility_Dbas(CoreDatabase, new SysId(dbUserEligibility._Id), new SysId(dbUserEligibility._UserAccountId), new SysId(dbUserEligibility._RegionId), (Sax.EligibilityType)dbUserEligibility._EligibilityType, (ushort)dbUserEligibility._Flags); + PopulateFrom(dbUserEligibility, userEligibility); + return userEligibility; + } + + //------------------------------------------------------------------- + // Get item. + public override SaxUserEligibility GetUserEligibility(SaxUserEligibility.Params prm) + { + ClearErrorState(); + return GetUserEligibility(GetUserEligibilityQueryFilter(prm).Concat(" And ", "(", ")")); + } + private SaxUserEligibility GetUserEligibility(String filter) + { + ClearErrorState(); + long count = GetUserEligibilityCount(filter); + if (count == 0) return null; + if (count != 1) + { + SetErrorState("Multiple items found"); + return null; + } + SaxUserEligibility userEligibility = null; + // Query data. + using (var dbConnection = CoreDatabase.CreateConnection()) + using (var dbCommand = dbConnection.CreateCommand()) + { + try + { + dbConnection.Open(); + UserEligibility_Db dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + dbUserEligibility.PopulateFrom(dbCommand, aliasUserEligibility, filter); + userEligibility = CreateUserEligibility(dbUserEligibility); + } + catch (Exception exc) + { + SetErrorState("Database query exception"); + SaLogger.Warn(GetType().Name + ".GetUserEligibility\n\tQuery: " + dbCommand.CommandText + "\n\t" + ExceptionUtil.GetLogMessage(exc)); + } + } + return userEligibility; + } + + //------------------------------------------------------------------- + // Validate item. + public override bool IsValidUserEligibilityData(SaxUserEligibility.Data data, SaxUserEligibility.ErrField errField) + { + ClearErrorState(); + if (!base.IsValidUserEligibilityData(data, errField)) return false; + return true; + } + + //------------------------------------------------------------------- + // Insert item. + public override bool InsertUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo) + { + String fn = GetType().Name + ".InsertUserEligibility"; + ClearErrorState(); + if (!IsValidUserEligibility(userEligibility)) return false; + if (SysId.IsValid(userEligibility.Id)) return SetErrorState(ErrorMessage.ValiditemId); + using (var dbConnection = CoreDatabase.CreateConnection()) + using (var dbCommand = dbConnection.CreateCommand()) + { + try + { + dbConnection.Open(); + UserEligibility_Db dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + PopulateTo(dbUserEligibility, userEligibility, dbUpdateInfo); + if (UserEligibility_Db.FieldsNonId.Contains("Id")) + { + // Generate next Id. + dbUserEligibility._Id = CoreDatabase.GetNextIdFromTable("UserEligibility"); + } + dbUserEligibility.ExecuteInsertCommand(dbCommand); + userEligibility.Id = new SysId(dbUserEligibility._Id); + userEligibility.Changed = false; + if (DebugMode) SaLogger.Debug(fn + " Inserted. " + GetLogProperties(userEligibility).Concat(": ").Concat("", "\n\t")); + } + catch (Exception exc) { SetErrorState(exc.Message); } + } + return !HasErrorState(); + } + + //------------------------------------------------------------------- + // Update item. + public override bool UpdateUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo) + { + String fn = GetType().Name + ".UpdateUserEligibility"; + ClearErrorState(); + if (!IsValidUserEligibility(userEligibility)) return false; + if (!SysId.IsValid(userEligibility.Id)) return SetErrorState(ErrorMessage.InvalidItemId); + if (!userEligibility.Changed) + { + if (DebugMode) SaLogger.Debug(fn + " Data not changed. " + GetLogProperties(userEligibility).Concat(": ").Concat("", "\n\t")); + return true; + } + using (var dbConnection = CoreDatabase.CreateConnection()) + using (var dbCommand = dbConnection.CreateCommand()) + { + try + { + // Retrieve item. + dbConnection.Open(); + UserEligibility_Db dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + dbUserEligibility.PopulateFrom(dbCommand, aliasUserEligibility, "Id=" + SysId.ToString(userEligibility.Id)); + // ToDo SaxUpdateLogItemMonitor_UserEligibility updateLogMonitor = new SaxUpdateLogItemMonitor_UserEligibility(SessionContext, CreateUserEligibility(dbUserEligibility), dbUpdateInfo); + // Update item. + PopulateTo(dbUserEligibility, userEligibility, dbUpdateInfo); + dbUserEligibility.ExecuteUpdateCommand(dbCommand); + userEligibility.Changed = false; + if (DebugMode) SaLogger.Debug(fn + " Updated. " + GetLogProperties(userEligibility).Concat(": ").Concat("", "\n\t")); + // Record updates. + // ToDo updateLogMonitor.RecordUpdatedValues(userEligibility); + // ToDo updateLogMonitor.LogUpdates(); + } + catch (Exception exc) { SetErrorState(exc.Message); } + } + return !HasErrorState(); + } + + //------------------------------------------------------------------- + // Delete item. + public override bool UserEligibilityCanBeDeleted(SaxUserEligibility userEligibility) + { + ClearErrorState(); + if (!base.UserEligibilityCanBeDeleted(userEligibility)) return false; + return true; + } + public override bool DeleteUserEligibility(SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo) + { + String fn = GetType().Name + ".DeleteUserEligibility"; + ClearErrorState(); + if (!UserEligibilityCanBeDeleted(userEligibility)) return false; + + // User Eligibilitys are logically deleted by changing the status. + userEligibility.Status = SaStatus.Deleted; + return UpdateUserEligibility(userEligibility, dbUpdateInfo); + + /* + * Physical deletion. + using (var dbConnection = CoreDatabase.CreateConnection()) + using (var dbCommand = dbConnection.CreateCommand()) + { + try + { + // Retrieve item. + dbConnection.Open(); + UserEligibility_Db dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + dbUserEligibility.PopulateFrom(dbCommand, aliasUserEligibility, "Id=" + userEligibility.Id.ToString()); + // Delete item. + dbCommand.CommandType = System.Data.CommandType.Text; + dbCommand.CommandText = "DELETE FROM " + SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserEligibility) + " WHERE Id=" + SysId.ToString(userEligibility.Id) + ";"; + dbCommand.ExecuteNonQuery(); + userEligibility.Changed = false; + if (DebugMode) SaLogger.Debug(fn + " Deleted. " + GetLogProperties(userEligibility).Concat(": ").Concat("", "\n\t")); + } + catch (Exception exc) { SetErrorState(exc.Message); } + } + return !HasErrorState(); + */ + } + + //------------------------------------------------------------------- + // Copy data properties to and from database. + private void PopulateTo(UserEligibility_Db dbUserEligibility, SaxUserEligibility userEligibility, DbUpdateInfo dbUpdateInfo) + { + dbUserEligibility._Id = SysId.ToLong(userEligibility.Id); + dbUserEligibility._UserAccountId = SysId.ToInt(userEligibility.UserAccountId); + dbUserEligibility._RegionId = SysId.ToInt(userEligibility.RegionId); + dbUserEligibility._EligibilityType = (short)userEligibility.EligibilityType; + dbUserEligibility._Info = userEligibility.Info; + dbUserEligibility._ExpiresOn = userEligibility.ExpiresOn; + // Common. + dbUserEligibility._Notes = userEligibility.Notes; + dbUserEligibility._Status = SacsSystem.GetStatusCode(userEligibility.Status); + dbUserEligibility._Flags = (short)userEligibility.Flags; + if (!SysId.IsValid(userEligibility.Id)) + { + dbUserEligibility._CreateOn = DateTime.Now; + dbUserEligibility._CreateBy = dbUpdateInfo.UserId.ToInt(); + dbUserEligibility._CreateHost = dbUpdateInfo.Host; + } + dbUserEligibility._UpdateOn = DateTime.Now; + dbUserEligibility._UpdateBy = dbUpdateInfo.UserId.ToInt(); + dbUserEligibility._UpdateHost = dbUpdateInfo.Host; + } + private void PopulateFrom(UserEligibility_Db dbUserEligibility, SaxUserEligibility userEligibility) + { + //userEligibility.Id = new SysId(dbUserEligibility._Id); + //userEligibility.UserAccountId = new SysId(dbUserEligibility._UserAccountId); + //userEligibility.RegionId = new SysId(dbUserEligibility._RegionId); + //userEligibility.EligibilityType = (Sax.EligibilityType)dbUserEligibility._EligibilityType; + userEligibility.Info = dbUserEligibility._Info; + userEligibility.ExpiresOn = dbUserEligibility._ExpiresOn; + // Common. + userEligibility.Notes = dbUserEligibility._Notes; + userEligibility.Status = SacsSystem.GetStatusForCode(dbUserEligibility._Status); + userEligibility.SetCreateStamp(dbUserEligibility._CreateOn, new SysId(dbUserEligibility._CreateBy), dbUserEligibility._CreateHost); + userEligibility.SetUpdateStamp(dbUserEligibility._UpdateOn, new SysId(dbUserEligibility._UpdateBy), dbUserEligibility._UpdateHost); + userEligibility.AcceptChanges(); + } + + //------------------------------------------------------------------- + // Item column definitions. + private static readonly String aliasUserEligibility = "UsrRol"; + private static readonly String aliasUserEligibility_UserAccount = "UsrElg_Usr"; + private static readonly String prefixUserEligibility_UserAccount = aliasUserEligibility_UserAccount + "_"; + private static readonly String aliasUserEligibility_Region = "UsrElg_Usr"; + private static readonly String prefixUserEligibility_Region = aliasUserEligibility_Region + "_"; + private void SetUserEligibilityColDfn + (ColumnDfn col, String caption, int width, SaxDbDfn_Core.ColumnIdx dbCol, + ColumnAlignment align = ColumnAlignment.Default, DataValue.DataType dataType = DataValue.DataType.String, + String alias = "", String prefix = "") + { + if (String.IsNullOrEmpty(alias) && SaxDbDfn_Core.GetTableForColumn(dbCol) == SaxDbDfn_Core.TableIdx.UserEligibility) + alias = aliasUserEligibility; + col.Set(caption, width, (int)dbCol, prefix + SaxDbDfn_Core.GetColumnName(dbCol, false), SaxDbDfn_Core.GetColumnNameQual(dbCol, alias), dataType, align); + if (dataType == DataValue.DataType.String && dbCol != SaxDbDfn_Core.ColumnIdx.Unknown) + col.MaxLength = (int)SaxDbDfn_Core.GetColTextLen(dbCol); + } + public override ColumnDfn GetUserEligibilityColumnDfn(SaxUserEligibility.Column columnId, string caption = "", int width = 0) + { + ColumnDfn columnDfn = new ColumnDfn((int)columnId, caption, width); + switch (columnId) + { + //----------------------------------------------------------- + case SaxUserEligibility.Column.Pos: + SetUserEligibilityColDfn(columnDfn, "Pos", 60, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Right); + columnDfn.SortMode = ColumnDfn.ColumnSortMode.Off; + columnDfn.ReadOnly = true; + columnDfn.Resizable = false; + break; + case SaxUserEligibility.Column.Id: + SetUserEligibilityColDfn(columnDfn, "Id", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_Id, ColumnAlignment.Center, DataValue.DataType.Long); + columnDfn.ReadOnly = true; + break; + + //------------------------------------------------------- + // User. + case SaxUserEligibility.Column.UserAccountId: + SetUserEligibilityColDfn(columnDfn, "User Id", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_UserAccountId, ColumnAlignment.Center, DataValue.DataType.Long); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.User_EmailAddress: + SetUserEligibilityColDfn(columnDfn, "Email address", 160, SaxDbDfn_Core.ColumnIdx.UserAccount_EmailAddress, ColumnAlignment.Left, DataValue.DataType.String, aliasUserEligibility_UserAccount, prefixUserEligibility_UserAccount); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.User_DisplayName: + SetUserEligibilityColDfn(columnDfn, "User", 160, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Left, DataValue.DataType.String); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.User_Title: + SetUserEligibilityColDfn(columnDfn, "Title", 80, SaxDbDfn_Core.ColumnIdx.UserAccount_Title, ColumnAlignment.Left, DataValue.DataType.String, aliasUserEligibility_UserAccount, prefixUserEligibility_UserAccount); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.User_FirstName: + SetUserEligibilityColDfn(columnDfn, "First name", 120, SaxDbDfn_Core.ColumnIdx.UserAccount_FirstName, ColumnAlignment.Left, DataValue.DataType.String, aliasUserEligibility_UserAccount, prefixUserEligibility_UserAccount); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.User_LastName: + SetUserEligibilityColDfn(columnDfn, "Last name", 120, SaxDbDfn_Core.ColumnIdx.UserAccount_LastName, ColumnAlignment.Left, DataValue.DataType.String, aliasUserEligibility_UserAccount, prefixUserEligibility_UserAccount); + columnDfn.ReadOnly = true; + break; + + //----------------------------------------------------------- + // Region. + case SaxUserEligibility.Column.RegionId: + SetUserEligibilityColDfn(columnDfn, "Region Id", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_RegionId, ColumnAlignment.Center, DataValue.DataType.Long); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Region_Type: + SetUserEligibilityColDfn(columnDfn, "Region Type", 80, SaxDbDfn_Core.ColumnIdx.Region_RegionType, ColumnAlignment.Center, DataValue.DataType.Long, aliasUserEligibility_Region, prefixUserEligibility_Region); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Region_Type_Desc: + SetUserEligibilityColDfn(columnDfn, "Region Type", 100, SaxDbDfn_Core.ColumnIdx.Region_RegionType, ColumnAlignment.Center, DataValue.DataType.String, aliasUserEligibility_Region, prefixUserEligibility_Region); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Region_CountryIso2Code: + SetUserEligibilityColDfn(columnDfn, "Country code", 80, SaxDbDfn_Core.ColumnIdx.Region_CountryIso2Code, ColumnAlignment.Center, DataValue.DataType.String, aliasUserEligibility_Region, prefixUserEligibility_Region); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Region_Name: + SetUserEligibilityColDfn(columnDfn, "Region", 80, SaxDbDfn_Core.ColumnIdx.Region_Name, ColumnAlignment.Center, DataValue.DataType.String, aliasUserEligibility_Region, prefixUserEligibility_Region); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Region_ParentId: + SetUserEligibilityColDfn(columnDfn, "Parent Region Id", 90, SaxDbDfn_Core.ColumnIdx.Region_RegionIdParent, ColumnAlignment.Center, DataValue.DataType.Long, aliasUserEligibility_Region, prefixUserEligibility_Region); + columnDfn.ReadOnly = true; + break; + + //----------------------------------------------------------- + // Eligibility. + case SaxUserEligibility.Column.EligibilityType: + SetUserEligibilityColDfn(columnDfn, "Eligibility", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_EligibilityType, ColumnAlignment.Center, DataValue.DataType.Long); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.EligibilityType_Desc: + SetUserEligibilityColDfn(columnDfn, "Eligibility", 120, SaxDbDfn_Core.ColumnIdx.UserEligibility_EligibilityType, ColumnAlignment.Center); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.Info: + SetUserEligibilityColDfn(columnDfn, "Info", 120, SaxDbDfn_Core.ColumnIdx.UserEligibility_Info); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.ExpiresOn: + SetUserEligibilityColDfn(columnDfn, "Expires", 100, SaxDbDfn_Core.ColumnIdx.UserEligibility_ExpiresOn, ColumnAlignment.Center, DataValue.DataType.Date); + columnDfn.ReadOnly = true; + break; + + //----------------------------------------------------------- + // Common properties. + case SaxUserEligibility.Column.Notes: + SetUserEligibilityColDfn(columnDfn, "Notes", 240, SaxDbDfn_Core.ColumnIdx.UserEligibility_Notes); + break; + case SaxUserEligibility.Column.Flags: + SetUserEligibilityColDfn(columnDfn, "Flags", 60, SaxDbDfn_Core.ColumnIdx.UserEligibility_Flags, ColumnAlignment.Center, DataValue.DataType.Long); + break; + case SaxUserEligibility.Column.Status: + SetUserEligibilityColDfn(columnDfn, "Status", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_Status, ColumnAlignment.Center); + break; + case SaxUserEligibility.Column.Status_Desc: + SetUserEligibilityColDfn(columnDfn, "Status", 90, SaxDbDfn_Core.ColumnIdx.UserEligibility_Status, ColumnAlignment.Center); + break; + case SaxUserEligibility.Column.Status_Ind: + SetUserEligibilityColDfn(columnDfn, "Status", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_Status, ColumnAlignment.Center, DataValue.DataType.TriState); + columnDfn.TriStateFormat = ColumnTriStateFormat.Lights; + break; + case SaxUserEligibility.Column.CreateOn_Date: + SetUserEligibilityColDfn(columnDfn, "Created", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_CreateOn, ColumnAlignment.Center, DataValue.DataType.Date); + columnDfn.ReadOnly = true; + break; + case SaxUserEligibility.Column.UpdateOn_Date: + SetUserEligibilityColDfn(columnDfn, "Updated", 80, SaxDbDfn_Core.ColumnIdx.UserEligibility_UpdateOn, ColumnAlignment.Center, DataValue.DataType.Date); + columnDfn.ReadOnly = true; + break; + //----------------------------------------------------------- + } + if (!String.IsNullOrEmpty(caption)) + columnDfn.Caption = caption; + if (width > 0) + columnDfn.Width = width; + return columnDfn; + } + + //------------------------------------------------------------------- + // Item query filter. + public override List GetUserEligibilityQueryFilter(SaxUserEligibility.Params prm) + { + List filter = new List(); + + // Item Ids. + String idsIncluded = prm.IdsIncluded.Concat(","); + if (!idsIncluded.IsEmpty()) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Id, aliasUserEligibility) + " IN (" + idsIncluded + ")"); + String idsxcluded = prm.IdsExcluded.Concat(","); + if (!idsxcluded.IsEmpty()) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Id, aliasUserEligibility) + " NOT IN (" + idsxcluded + ")"); + + // User accounts. + String userAccountIdsIncluded = prm.UserAccountIdsIncluded.Concat(","); + if (!userAccountIdsIncluded.IsEmpty()) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_UserAccountId, aliasUserEligibility) + " IN (" + userAccountIdsIncluded + ")"); + + // Regions. + String regionIdsIncluded = prm.RegionIdsIncluded.Concat(","); + if (!regionIdsIncluded.IsEmpty()) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_RegionId, aliasUserEligibility) + " IN (" + regionIdsIncluded + ")"); + + // Eligibility. + String eligibilityTypes = prm.EligibilityTypesIncluded.Select(item => ((int)item).ToString()).ToList().Concat(",", "", "", true, true); + if (!eligibilityTypes.IsEmpty()) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_EligibilityType, aliasUserEligibility) + " IN (" + eligibilityTypes + ")"); + + // Valid on. + if (DateUtil.IsValid(prm.ValidOn)) + { + String colName_ExpiresOn = SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_ExpiresOn, aliasUserEligibility); + filter.Add(colName_ExpiresOn + " Is Null Or " + colName_ExpiresOn + " >= " + DbQuery.FormatDateForCondition(prm.ValidOn) + ")"); + } + + // Notes. + if (!StringUtil.IsEmpty(prm.NotesPartial)) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Notes, aliasUserEligibility) + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'"); + + // Status. + if (prm.StatusCat != SaxUserEligibility.StatusCat.Any) + filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Status, aliasUserEligibility) + GetUserEligibilityStatusCatFilterCondition(prm.StatusCat)); + + if (filter.Count < 1) filter.Add("1=1"); + return filter; + } + internal static String GetUserEligibilityStatusCatFilterCondition(SaxUserEligibility.StatusCat statusCat) + { + if (statusCat == SaxUserEligibility.StatusCat.ActiveOnly) + return "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'"; + if (statusCat == SaxUserEligibility.StatusCat.InactiveOnly) + return "='" + SacsSystem.GetStatusCode(SaStatus.Inactive) + "'"; + if (statusCat == SaxUserEligibility.StatusCat.NotDeleted) + return "!='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'"; + if (statusCat == SaxUserEligibility.StatusCat.DeletedOnly) + return "='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'"; + return ""; + } + // Item sort columns. + public List GetUserEligibilitySortColumns(SaxUserEligibility.Params prm) + { + // Sort sequence: + List sortColumnNames = new List(); + foreach (var columnDfn in prm.SortColumns) + { + // Need to ensure correct alias used for UserEligibility columns in case of conflict. + String sortCol = String.Empty; + if (SaxDbDfn_Core.GetTableForColumn((SaxDbDfn_Core.ColumnIdx)columnDfn.DbColumn) == SaxDbDfn_Core.TableIdx.UserEligibility) + { + sortCol = SaxDbDfn_Core.GetColumnNameQual((SaxDbDfn_Core.ColumnIdx)columnDfn.DbColumn, aliasUserEligibility); + } + else + { + sortCol = columnDfn.DataName; + if (!StringUtil.IsEmpty(columnDfn.SortDataName)) + sortCol = columnDfn.SortDataName; + } + if (!sortCol.IsEmpty()) + { + DbOrderByNullMode orderByNullMode = DbOrderByNullMode.Default; // eSaOrderByDemoteNulls, eSaOrderByPromoteNulls + sortColumnNames.Add(DbQuery.FormatForOrderBy(sortCol, columnDfn.SortAscending, orderByNullMode).Concat(", ")); + } + } + sortColumnNames.RemoveBlanks(); + if (sortColumnNames.IsEmpty()) + { + // Default sort columns. + sortColumnNames.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Id, aliasUserEligibility) + " ASC"); + } + return sortColumnNames; + } + + //------------------------------------------------------------------- + // Item count. + private long GetUserEligibilityCount(String filter) + { + ClearErrorState(); + return CoreDatabase.GetRowCount(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserEligibility) + " As " + aliasUserEligibility, filter); + } + public override long GetUserEligibilityCount(SaxUserEligibility.Params prm) + { + ClearErrorState(); + return GetUserEligibilityCount(GetUserEligibilityQueryFilter(prm).Concat(" AND ", "(", ")")); + } + + //------------------------------------------------------------------- + // Item list. + public override List GetUserEligibilityList(SaxUserEligibility.Params prm) + { + List userEligibilitys = new List(); + DbQuery qry = new DbQuery(CoreDatabase.DbmsType); + qry.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserEligibility), aliasUserEligibility); + UserEligibility_Db dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + qry.Columns.AddRange(dbUserEligibility.ExistingColumnNames); + qry.Filters.AddRange(GetUserEligibilityQueryFilter(prm)); + qry.OrderBy.AddRange(GetUserEligibilitySortColumns(prm)); + // Query data. + using (var dbConnection = CoreDatabase.CreateConnection()) + using (var dbCommand = dbConnection.CreateCommand()) + { + try + { + dbConnection.Open(); + dbCommand.CommandText = qry.BuildQuery(prm.ResultsPaging); + using (DbDataReader dbDataReader = dbCommand.ExecuteReader()) + { + while (dbDataReader.Read()) + { + dbUserEligibility = new UserEligibility_Db(CoreDbInfo); + dbUserEligibility.PopulateFrom(dbDataReader); + userEligibilitys.Add(CreateUserEligibility(dbUserEligibility)); + } + } + } + catch (Exception exc) + { + SaLogger.Warn(GetType().Name + ".GetUserEligibilityList\n\tQuery: " + dbCommand.CommandText + "\n\t" + ExceptionUtil.GetLogMessage(exc)); + } + } + return userEligibilitys; + } + + //------------------------------------------------------------------- + // Item query execution. + public override DbResultSet ExecuteUserEligibilityQuery(List columns, SaxUserEligibility.Params prm) + { + ClearErrorState(); + + //--------------------------------------------------------------------- + // Construct query. + DbQuery query = new DbQuery(CoreDatabase.DbmsType); + query.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserEligibility), aliasUserEligibility); + + // Add columns as defined in query list. + if (columns.HasId(SaxUserEligibility.Column.Id)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Id, aliasUserEligibility)); + bool hasUserAccountCols = (columns.HasId(SaxUserEligibility.Column.User_EmailAddress) || columns.HasId(SaxUserEligibility.Column.User_DisplayName) || columns.HasId(SaxUserEligibility.Column.User_Title) || columns.HasId(SaxUserEligibility.Column.User_FirstName) || columns.HasId(SaxUserEligibility.Column.User_LastName)); + if (columns.HasId(SaxUserEligibility.Column.UserAccountId) || hasUserAccountCols) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_UserAccountId, aliasUserEligibility)); + bool hasRegionCols = (columns.HasId(SaxUserEligibility.Column.Region_Type) || columns.HasId(SaxUserEligibility.Column.Region_Type_Desc) || columns.HasId(SaxUserEligibility.Column.Region_CountryIso2Code) || columns.HasId(SaxUserEligibility.Column.Region_Name) || columns.HasId(SaxUserEligibility.Column.Region_ParentId)); + if (columns.HasId(SaxUserEligibility.Column.RegionId) || hasRegionCols) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_RegionId, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.EligibilityType) || columns.HasId(SaxUserEligibility.Column.EligibilityType_Desc)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_EligibilityType, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.Info)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Info, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.ExpiresOn)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_ExpiresOn, aliasUserEligibility)); + // Common properties. + if (columns.HasId(SaxUserEligibility.Column.Notes)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Notes, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.Flags)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Flags, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.Status) || columns.HasId(SaxUserEligibility.Column.Status_Desc) || columns.HasId(SaxUserEligibility.Column.Status_Ind)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_Status, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.CreateOn_Date)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_CreateOn, aliasUserEligibility)); + if (columns.HasId(SaxUserEligibility.Column.UpdateOn_Date)) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_UpdateOn, aliasUserEligibility)); + + //--------------------------------------------------------------------- + // User Account. + if (hasUserAccountCols) + { + DbQueryJoin joinUserAccount = new DbQueryJoin(DbJoinType.LeftOuter); + joinUserAccount.Table = new StringPair(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserAccount), aliasUserEligibility_UserAccount); + joinUserAccount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserAccount_Id, aliasUserEligibility_UserAccount) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_UserAccountId, aliasUserEligibility)); + query.Joins.Add(joinUserAccount); + List cols = new List(); + cols.Add(SaxDbDfn_Core.ColumnIdx.UserAccount_EmailAddress); + cols.Add(SaxDbDfn_Core.ColumnIdx.UserAccount_Title); + cols.Add(SaxDbDfn_Core.ColumnIdx.UserAccount_FirstName); + cols.Add(SaxDbDfn_Core.ColumnIdx.UserAccount_LastName); + foreach (var col in cols) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(col, aliasUserEligibility_UserAccount), prefixUserEligibility_UserAccount + SaxDbDfn_Core.GetColumnName(col, false)); + } + + //--------------------------------------------------------------------- + // Region. + if (hasRegionCols) + { + DbQueryJoin joinRegion = new DbQueryJoin(DbJoinType.LeftOuter); + joinRegion.Table = new StringPair(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Region), aliasUserEligibility_Region); + joinRegion.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Region_Id, aliasUserEligibility_Region) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserEligibility_RegionId, aliasUserEligibility)); + query.Joins.Add(joinRegion); + List cols = new List(); + cols.Add(SaxDbDfn_Core.ColumnIdx.Region_RegionType); + cols.Add(SaxDbDfn_Core.ColumnIdx.Region_CountryIso2Code); + cols.Add(SaxDbDfn_Core.ColumnIdx.Region_Name); + cols.Add(SaxDbDfn_Core.ColumnIdx.Region_RegionIdParent); + foreach (var col in cols) + query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(col, aliasUserEligibility_Region), prefixUserEligibility_Region + SaxDbDfn_Core.GetColumnName(col, false)); + } + + //--------------------------------------------------------------------- + // Populate filter. + query.Filters.AddRange(GetUserEligibilityQueryFilter(prm)); + + if (prm.IdsIncluded.Count != 1) + { + // Configure sort sequence. + foreach (String sortColumn in GetUserEligibilitySortColumns(prm)) + query.OrderBy.Add(sortColumn); + } + + //--------------------------------------------------------------------- + //return new DbResultSet_DataTableReader(db, query.BuildQuery(prm.ResultsPaging)); + return DbResultSet_DataReader.ExecuteQuery(CoreDatabase, query.BuildQuery(prm.ResultsPaging)); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteStandardDbas/Resources/Database/SaxDbDfn_Core.xml b/SaxoniteStandardDbas/Resources/Database/SaxDbDfn_Core.xml index 1fce72e..d326719 100644 --- a/SaxoniteStandardDbas/Resources/Database/SaxDbDfn_Core.xml +++ b/SaxoniteStandardDbas/Resources/Database/SaxDbDfn_Core.xml @@ -5845,6 +5845,385 @@ + + dbo + UserEligibility + + + + dbo + UserEligibility
      + 1 + Id + BigInt + + -5 + bigint + true + 19 + 8 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 2 + UserAccountId + Int + + 4 + int + false + 10 + 4 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 3 + RegionId + Int + + 4 + int + false + 10 + 4 + 0 + Nullable + true + +       + + dbo + UserEligibility
      + 4 + EligibilityType + SmallInt + + 5 + smallint + false + 5 + 2 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 5 + Info + VarChar + + -9 + nvarchar + false + 2000 + 4000 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 6 + ExpiresOn + DateTime + + 93 + smalldatetime + false + 16 + 16 + 0 + Nullable + true + +       + + dbo + UserEligibility
      + 7 + Notes + VarChar + + -9 + nvarchar + false + 2000 + 4000 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 8 + Flags + SmallInt + + 5 + smallint + false + 5 + 2 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 9 + Status + VarChar + + 12 + varchar + false + 3 + 3 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 10 + CreateOn + DateTime + + 93 + datetime + false + 23 + 16 + 3 + NoNulls + false + +       + + dbo + UserEligibility
      + 11 + CreateBy + Int + + 4 + int + false + 10 + 4 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 12 + CreateHost + VarChar + + 12 + varchar + false + 100 + 100 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 13 + UpdateOn + DateTime + + 93 + datetime + false + 23 + 16 + 3 + NoNulls + false + +       + + dbo + UserEligibility
      + 14 + UpdateBy + Int + + 4 + int + false + 10 + 4 + 0 + NoNulls + false + +       + + dbo + UserEligibility
      + 15 + UpdateHost + VarChar + + 12 + varchar + false + 100 + 100 + 0 + NoNulls + false + +       +       + + + dbo + UserEligibility
      + PK_UserEligibility + 1 + true + false + false + false + 0 + 0 + false + + + 1 + Id + true + + +       + + dbo + UserEligibility
      + IDX_UserEligibility_User_Region_Eligibilty + 3 + true + false + false + false + 0 + 0 + false + + + 1 + UserAccountId + true + + + 2 + RegionId + true + + + 3 + EligibilityType + true + + +       + + dbo + UserEligibility
      + IDX_UserEligibility_Region + 3 + false + false + false + false + 0 + 0 + false + + + 1 + RegionId + true + + +       + + dbo + UserEligibility
      + IDX_UserEligibility_Region_Status + 3 + false + false + false + false + 0 + 0 + false + + + 1 + RegionId + true + + + 2 + Status + true + + +       + + dbo + UserEligibility
      + IDX_UserEligibility_User + 3 + false + false + false + false + 0 + 0 + false + + + 1 + UserAccountId + true + + +       +       +       dbo UserOnline