From ca29099508fa44c2d76943c109929a1b5bcf33de Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 7 Feb 2023 20:05:38 +0000 Subject: [PATCH] v1.2.10.5 --- .../Admin/Controllers/SportController-Ajax.cs | 2 + .../Support/Controller_UserReport-Ajax.cs | 351 ++++++++++++++++++ .../Support/Controller_UserReport.cs | 45 +++ .../Support/SaxController_Admin_Support.cs | 28 ++ .../Admin/Models/SaxModel_Admin.cs | 2 +- .../Admin/Models/Support/Model_UserReport.cs | 95 +++++ .../Models/Support/SaxModel_Admin_Support.cs | 21 ++ .../Localisation/SaxAdminProperties.resx | 18 + .../Views/Shared/_Layout.cshtml | 16 +- .../Views/UserReport/Index.cshtml | 116 ++++++ .../UserReport/Panel-UserReportDialog.cshtml | 99 +++++ .../Views/_ViewImports.cshtml | 1 + SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js | 2 +- .../wwwroot/js/sax-spt-rpt.js | 199 ++++++++++ .../SupportController-Ajax-Feedback.cs | 1 + SaxoniteCoreWebOnline/wwwroot/js/sax-main.js | 12 +- SaxoniteStandardBase/Base/App/Sax-Version.cs | 2 +- .../Base/App/SaxSystem-CodeTypes.cs | 6 +- .../Mgr/SaxAccountMgr_Dbas-UserSession.cs | 2 +- 19 files changed, 1004 insertions(+), 14 deletions(-) create mode 100644 SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport-Ajax.cs create mode 100644 SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport.cs create mode 100644 SaxoniteCoreWebAdmin/Admin/Controllers/Support/SaxController_Admin_Support.cs create mode 100644 SaxoniteCoreWebAdmin/Admin/Models/Support/Model_UserReport.cs create mode 100644 SaxoniteCoreWebAdmin/Admin/Models/Support/SaxModel_Admin_Support.cs create mode 100644 SaxoniteCoreWebAdmin/Views/UserReport/Index.cshtml create mode 100644 SaxoniteCoreWebAdmin/Views/UserReport/Panel-UserReportDialog.cshtml create mode 100644 SaxoniteCoreWebAdmin/wwwroot/js/sax-spt-rpt.js diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/SportController-Ajax.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/SportController-Ajax.cs index 163aae2..07e4a67 100644 --- a/SaxoniteCoreWebAdmin/Admin/Controllers/SportController-Ajax.cs +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/SportController-Ajax.cs @@ -14,6 +14,8 @@ using System.Threading.Tasks; namespace Saxonite.Net.Core.Web.Admin.Controllers { + //======================================================================= + // Sport Controller - Ajax requests. //======================================================================= partial class SportController { diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport-Ajax.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport-Ajax.cs new file mode 100644 index 0000000..7f278df --- /dev/null +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport-Ajax.cs @@ -0,0 +1,351 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +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.Net.Standard.Base.App; +using Saxonite.Net.Core.Web.Admin.Models; +using Saxonite.Net.Core.Web.Admin.Models.Support; +using Saxonite.Net.Core.Web.Base.App; +using Saxonite.Net.Standard.Base.Bus; +using Saxonite.Net.Standard.Base.Bus.Support; +using System; +using System.Collections.Generic; +using System.Linq; +using Sarand.Net.Standard.Base.Utils; + +namespace Saxonite.Net.Core.Web.Admin.Controllers.Support +{ + //======================================================================= + // UserReport Controller - Ajax requests. + //======================================================================= + partial class Controller_UserReport + { + //------------------------------------------------------------------- + // UserReport data. + private class UserReportListData : AjaxResponse_Data.ItemData_Base + { + // Account Id only populated while account names are being queried, then nulled. + public SysId UserAccountId { get; set; } + public String UserDisplayName { get; set; } + public String ReportTypeCode { get; set; } + public String ReportTypeDesc { get; set; } + public String Title { get; set; } + public String RecordedOnDisp { get; set; } + } + private class UserReportItemData : UserReportListData + { + public String ReportType { get; set; } + public String Report { get; set; } + public String RecordedOnForm { get; set; } + } + private void PopulateUserReportResponseListData(SaxModel_Admin model, SaxUserReport userReport, SaxUserAccount userAccount, UserReportListData data) + { + data.Id = SysId.ToString(userReport.Id); + data.UserDisplayName = userAccount.GetDisplayName(); + data.ReportTypeCode = UserReportTypeCodes.GetCodeForType(userReport.ReportType); + data.ReportTypeDesc = model.Localiser.GetUserReportTypeCaption(userReport.ReportType); + data.Title = userReport.Title; + data.RecordedOnDisp = model.FormatDateForDisplay(userReport.RecordedOn); + data.StatusCode = userReport.StatusCode; + data.StatusDesc = userReport.StatusDesc; + } + private void PopulateUserReportResponseItemData(Model_UserReport model, SaxUserReport userReport, SaxUserAccount userAccount, UserReportItemData data) + { + PopulateUserReportResponseListData(model, userReport, userAccount, data); + data.Report = userReport.Report; + data.RecordedOnForm = model.FormatDateForForm(userReport.RecordedOn); + } + + //------------------------------------------------------------------- + // Ajax - User Report list. + //------------------------------------------------------------------- + private class AjaxResponse_UserReportList : AjaxResponse_Data + { + // Construction. + public AjaxResponse_UserReportList(SaxModel_Admin model) : base(model) { } + // UserReport list. + public List Reports { get; } = new List(); + // Reference data. + public List ReportTypes { get; } = new List(); + public List Statuses { get; } = new List(); + public String DefaultStatusCode { get; set; } + } + //------------------------------------------------------------------- + [HttpPost] + [Route("UserReport/Ajax/GetList")] + public IActionResult Ajax_GetList(Model_UserReport model) + { + String fn = GetType().Name + ".Ajax_GetList"; + String messageTitle = Localiser["caption.user.reports"]; + AjaxResponse_UserReportList responseData = new AjaxResponse_UserReportList(model); + + // Validate session. + if (!ValidUserSession) + return GetAjaxResult_InvalidSession(responseData); + + // Reference data - report types. + responseData.ReportTypes.Add(new AjaxResponse_Data.ItemCodeDesc()); + List validReportTypes = new List(EnumUtil.GetValues()); + foreach (TypeCodeDesc reportType in UserReportTypeCodes) + { + if (!validReportTypes.Contains((Sax.UserReportType)reportType.Type)) continue; + responseData.ReportTypes.Add(new AjaxResponse_Data.ItemCodeDesc() { Code = reportType.Code, Desc = Localiser.GetUserReportTypeCaption((Sax.UserReportType)reportType.Type) }); + } + + // Reference data - statuses. + foreach (SaStatus status in SaxUserReport.ValidStatuses.FindAll(item => item != SaStatus.Deleted)) + responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc() { Code = SacsSystem.GetStatusCode(status), Desc = Localiser.GetStatusCaption(status) }); + responseData.DefaultStatusCode = SacsSystem.GetStatusCode(SaxUserReport.DefaultStatus); + + // Item filter. + SaxUserReport.Params prmUserReport = new SaxUserReport.Params(); + prmUserReport.UserReportFilter = model.Filter.Report; + prmUserReport.StatusCat = SaxUserReport.StatusCat.NotDeleted; + model.Paging.ItemTotal = (ulong)SupportMgr.GetUserReportCount(prmUserReport); + model.PopulatePagingTo(prmUserReport.ResultsPaging); + + // Item columns. + ColumnDfn colId = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.Id); + ColumnDfn colUserAccountId = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.UserAccountId); + ColumnDfn colReportType = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.ReportType); + ColumnDfn colTitle = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.Title); + ColumnDfn colRecordedOn = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.RecordedOn); + ColumnDfn colStatus = SupportMgr.GetUserReportColumnDfn(SaxUserReport.Column.Status); + List columns = new List() + { + colId, colUserAccountId, colReportType, colTitle, + colRecordedOn, colStatus + }; + + // Sort order. + prmUserReport.SortColumns.Add(colRecordedOn); + prmUserReport.SortColumns.Last().SortAscending = false; + prmUserReport.SortColumns.Add(colId); + prmUserReport.SortColumns.Last().SortAscending = false; + + // User account details must be queried separately - different database! + HashSet userAccountIds = new HashSet(); + + // Query items. + using (DbResultSet resultSet = SupportMgr.ExecuteUserReportQuery(columns, prmUserReport)) + { + while (resultSet != null && resultSet.HasRows && resultSet.NextRecord()) + { + NamedValue.Map values = resultSet.GetRecordValues(); + SysId userAccountId = new SysId(values.GetLong(colUserAccountId.DataName)); + userAccountIds.AddId(userAccountId); + Sax.UserReportType reportType = (Sax.UserReportType)values.GetLong(colReportType.DataName); + UserReportListData userReportData = new UserReportListData() + { + Id = values.GetString(colId.DataName), + UserAccountId = userAccountId, + ReportTypeCode = UserReportTypeCodes.GetCodeForType(reportType), + ReportTypeDesc = model.Localiser.GetUserReportTypeCaption(reportType), + Title = values.GetString(colTitle.DataName), + RecordedOnDisp = model.FormatDateForDisplay(values.GetDate(colRecordedOn.DataName)), + StatusCode = values.GetString(colStatus.DataName), + StatusDesc = SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName)) + }; + responseData.Reports.Add(userReportData); + } + } + if (model.Paging.IsPaged) + model.Paging.ItemCount = (ushort)responseData.Reports.Count; + + // Query and populate User Account details. + if (userAccountIds.Any()) + { + // User Account columns. + ColumnDfn colUserAccount_Id = AccountMgr.GetUserAccountColumnDfn(SaxUserAccount.Column.Id); + ColumnDfn colUserAccount_Title = AccountMgr.GetUserAccountColumnDfn(SaxUserAccount.Column.Title); + ColumnDfn colUserAccount_FirstName = AccountMgr.GetUserAccountColumnDfn(SaxUserAccount.Column.FirstName); + ColumnDfn colUserAccount_LastName = AccountMgr.GetUserAccountColumnDfn(SaxUserAccount.Column.LastName); + List userAccountCols = new List() { colUserAccount_Id, colUserAccount_Title, colUserAccount_FirstName, colUserAccount_LastName }; + // User Account filter. + SaxUserAccount.Params prmUserAccount = new SaxUserAccount.Params(); + prmUserAccount.IdsIncluded.AddRange(userAccountIds); + prmUserAccount.StatusCat = SaxUserAccount.StatusCat.Any; + // Query user accounts and populate properties to report list. + using (DbResultSet resultSet = AccountMgr.ExecuteUserAccountQuery(userAccountCols, prmUserAccount)) + { + while (resultSet != null && resultSet.HasRows && resultSet.NextRecord()) + { + NamedValue.Map values = resultSet.GetRecordValues(); + SysId userAccountId = new SysId(values.GetLong(colUserAccount_Id.DataName)); + String title = values.GetString(colUserAccount_Title.DataName); + String firstName = values.GetString(colUserAccount_FirstName.DataName); + String lastName = values.GetString(colUserAccount_LastName.DataName); + foreach (UserReportListData userReportData in responseData.Reports.FindAll(item => SysId.InvalidOnNull(item.UserAccountId).Equals(userAccountId))) + { + userReportData.UserDisplayName = SaxUserAccount.GetDisplayName(title, firstName, lastName); + userReportData.UserAccountId = null; + } + } + } + + // Clear any remaining User Account Ids. + foreach (UserReportListData userReportData in responseData.Reports.FindAll(item => item.UserAccountId != null)) + userReportData.UserAccountId = null; + } + + // Complete response. + responseData.SetPaging(model); + responseData.Success = true; + return Json(responseData); + } + + //------------------------------------------------------------------- + // Ajax - User Report properties. + //------------------------------------------------------------------- + private class AjaxResponse_UserReport : AjaxResponse_Data + { + // Construction. + public AjaxResponse_UserReport(SaxModel_Admin model) : base(model) { } + // UserReport details. + public UserReportItemData Report { get; } = new UserReportItemData(); + } + //------------------------------------------------------------------- + [HttpPost] + [Route("UserReport/Ajax/GetItem")] + public IActionResult Ajax_GetItem(Model_UserReport model) + { + String fn = GetType().Name + ".Ajax_GetItem"; + String messageTitle = Localiser["caption.user.report"]; + AjaxResponse_UserReport responseData = new AjaxResponse_UserReport(model); + + // Validate session. + if (!ValidUserSession) + return GetAjaxResult_InvalidSession(responseData); + + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + + // Identify item. + SysId userReportId = model.UserReport.Id.ToSysId(); + if (!SysId.IsValid(userReportId)) + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"])); + + // Retrieve item. + SaxUserReport userReport = SupportMgr.GetUserReportById(userReportId); + disposableItems.Add(userReport); + if (userReport == null) + { + SaLogger.Warn(fn + " Failed to retrieve userReport for Id: '" + model.UserReport.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Retrieve user. + SaxUserAccount userAccount = AccountMgr.GetUserAccountById(userReport.UserAccountId); + disposableItems.Add(userAccount); + + // Construct response. + PopulateUserReportResponseItemData(model, userReport, userAccount, responseData.Report); + } + + // Complete response. + responseData.Success = true; + + return Json(responseData); + } + + //------------------------------------------------------------------- + // Ajax - User Report storage. + //------------------------------------------------------------------- + [HttpPost] + [Route("UserReport/Ajax/StoreItem")] + public IActionResult Ajax_StoreItem(Model_UserReport model) + { + String fn = GetType().Name + ".Ajax_StoreItem"; + String messageTitle = Localiser["caption.user.report"]; + AjaxResponse_UserReport responseData = new AjaxResponse_UserReport(model); + + // Validate session. + if (!ValidUserSession) + return GetAjaxResult_InvalidSession(responseData); + + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + + // Validate item properties. + model.ValidateUserReportData(responseData); + if (responseData.HasControlErrors()) + return Json(responseData); + + // Retrieve existing item. + SysId userReportId = model.UserReport.Id.ToSysId(); + if (StringUtil.ToBool(model.UserReport.Exists) && !SysId.IsValid(userReportId)) + { + SaLogger.Warn(fn + " Item Id not supplied for existing item."); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"])); + } + if (!StringUtil.ToBool(model.UserReport.Exists) && SysId.IsValid(userReportId)) + { + SaLogger.Warn(fn + " Item Id supplied for new item: '" + model.UserReport.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"])); + } + SaxUserReport userReport = SupportMgr.GetUserReportById(userReportId); + disposableItems.Add(userReport); + if (userReport == null && SysId.IsValid(userReportId)) + { + SaLogger.Warn(fn + " Failed to retrieve userReport for Id: '" + model.UserReport.Id + "'"); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"])); + } + + // Create new item if required. + if (userReport == null) + { + userReport = SupportMgr.CreateUserReport(SessionUserAccountId); + disposableItems.Add(userReport); + userReport.RecordedOn = DateTime.Today; + } + + // Populate item properties. + if (model.UserReport.ReportType != null) + userReport.ReportType = model.UserReportType; + if (model.UserReport.Title != null) + userReport.Title = model.UserReport.Title; + if (model.UserReport.Report != null) + userReport.Report = model.UserReport.Report; + if (model.UserReport.Status != null) + userReport.Status = model.UserReportStatus; + + // Store item. + if (!SysId.IsValid(userReport.Id)) + { + if (!SupportMgr.InsertUserReport(userReport, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to insert userReport: " + SupportMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + SupportMgr.ErrorStateMessage)); + } + } + else + { + if (!SupportMgr.UpdateUserReport(userReport, DbUpdateInfo)) + { + SaLogger.Warn(fn + " Failed to update userReport [Id:" + SysId.ToString(userReport.Id) + "]: " + SupportMgr.ErrorStateMessage); + return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + SupportMgr.ErrorStateMessage)); + } + } + + // Retrieve user. + SaxUserAccount userAccount = AccountMgr.GetUserAccountById(userReport.UserAccountId); + disposableItems.Add(userAccount); + + // Construct response. + PopulateUserReportResponseItemData(model, userReport, userAccount, responseData.Report); + } + + // Complete response. + responseData.Success = true; + + return Json(responseData); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport.cs new file mode 100644 index 0000000..65df2b4 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/Controller_UserReport.cs @@ -0,0 +1,45 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using Saxonite.Net.Core.Web.Admin.Models.Support; +using Saxonite.Net.Core.Web.Base.App; +using System; + +namespace Saxonite.Net.Core.Web.Admin.Controllers.Support +{ + //======================================================================= + public partial class Controller_UserReport : SaxController_Admin_Support + { + //------------------------------------------------------------------- + // Data members. + + //------------------------------------------------------------------- + // Construction. + public Controller_UserReport(SaxLocaliser localiser, ILogger logger) : + base(localiser, logger) + { + } + + //------------------------------------------------------------------- + // Properties. + + //------------------------------------------------------------------- + // Index page. + [HttpGet] + [Route("UserReport")] + [Route("UserReport/Index")] + public IActionResult Index(String sta) + { + // Validate session. + if (!ValidUserSession) + return RedirectToAction("", ""); + + // Model. + Model_UserReport model = new Model_UserReport(Localiser); + + return View("/Views/UserReport/Index.cshtml", model); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebAdmin/Admin/Controllers/Support/SaxController_Admin_Support.cs b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/SaxController_Admin_Support.cs new file mode 100644 index 0000000..16301e1 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Admin/Controllers/Support/SaxController_Admin_Support.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using Saxonite.Net.Core.Web.Admin.Models.Support; +using Saxonite.Net.Core.Web.Base.App; +using System; + +namespace Saxonite.Net.Core.Web.Admin.Controllers.Support +{ + //======================================================================= + public abstract class SaxController_Admin_Support : SaxController_Admin + { + //------------------------------------------------------------------- + // Data members. + + //------------------------------------------------------------------- + // Protected construction. + protected SaxController_Admin_Support(SaxLocaliser localiser, ILogger logger) : + base(localiser, logger) + { + } + + //------------------------------------------------------------------- + // Properties. + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebAdmin/Admin/Models/SaxModel_Admin.cs b/SaxoniteCoreWebAdmin/Admin/Models/SaxModel_Admin.cs index 07dbdc1..df3d930 100644 --- a/SaxoniteCoreWebAdmin/Admin/Models/SaxModel_Admin.cs +++ b/SaxoniteCoreWebAdmin/Admin/Models/SaxModel_Admin.cs @@ -25,7 +25,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models //------------------------------------------------------------------- // Session. public SaxSessionData_Admin SessionData_Admin { get { return SessionData as SaxSessionData_Admin; } } - public SysId UserAccountId { get { return SessionData_Admin?.User?.UserAccountId ?? null; } } + public SysId SessionUserAccountId { get { return SessionData_Admin?.User?.UserAccountId ?? null; } } //------------------------------------------------------------------- // Reference data. diff --git a/SaxoniteCoreWebAdmin/Admin/Models/Support/Model_UserReport.cs b/SaxoniteCoreWebAdmin/Admin/Models/Support/Model_UserReport.cs new file mode 100644 index 0000000..4788173 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Admin/Models/Support/Model_UserReport.cs @@ -0,0 +1,95 @@ +using Sarand.Net.Standard.Base.App; +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.Standard.Base.App; +using Saxonite.Net.Core.Web.Base.Controllers; +using Saxonite.Net.Standard.Base.Bus; +using Saxonite.Net.Standard.Base.Bus.Support; +using System; + +namespace Saxonite.Net.Core.Web.Admin.Models.Support +{ + //======================================================================= + public class Model_UserReport : SaxModel_Admin_Support + { + //------------------------------------------------------------------- + // Construction. + public Model_UserReport(SaxLocaliser localiser) : + base(localiser) + { + } + + //------------------------------------------------------------------- + // User Report list configuration. + public class FilterData + { + public String Report { get; set; } + } + public FilterData Filter { get; } = new FilterData(); + + //------------------------------------------------------------------- + // Sport properties. + public class UserReportData + { + public String Id { get; set; } + public String Exists { get; set; } + public String ReportType { get; set; } + public String Title { get; set; } + public String Report { get; set; } + public String Status { get; set; } + } + public UserReportData UserReport { get; } = new UserReportData(); + public Sax.UserReportType UserReportType{ get { return (Sax.UserReportType)UserReportTypeCodes.GetTypeForCode(UserReport.ReportType); } } + public SaStatus UserReportStatus { get { return SacsSystem.GetStatusForCode(UserReport.Status); } } + + //------------------------------------------------------------------- + // Validation. + //------------------------------------------------------------------- + // User Report. + public bool ValidateUserReportData(SaxController_Base.AjaxResponse_Data responseData) + { + // Record disposable items as they are created so all can be disposed when needed. + using (DisposableCollection disposableItems = new DisposableCollection()) + { + // Report Type. + String controlName = "UserReportType"; + if (UserReport.ReportType != null) + { + if (StringUtil.IsEmpty(UserReport.ReportType)) + responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]); + else if (UserReportType <= 0) + responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]); + } + + // Report Title. + controlName = "UserReportTitle"; + if (UserReport.Title != null) + { + responseData.SetControlValue(controlName, UserReport.Title); + if (StringUtil.IsEmpty(UserReport.Title)) + responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]); + else if (StringUtil.GetLength(UserReport.Title) > GetControlMaxLength(SaxDbDfn_Support.ColumnIdx.UserReport_Title)) + responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SaxDbDfn_Support.ColumnIdx.UserReport_Title)]); + } + + // Status. + controlName = "UserReportStatus"; + if (UserReport.Status != null) + { + if (StringUtil.IsEmpty(UserReport.Status)) + responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]); + else if (!SaxUserReport.ValidStatuses.Contains(UserReportStatus)) + responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]); + } + + } + return !responseData.HasControlErrors(); + } + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebAdmin/Admin/Models/Support/SaxModel_Admin_Support.cs b/SaxoniteCoreWebAdmin/Admin/Models/Support/SaxModel_Admin_Support.cs new file mode 100644 index 0000000..6af5910 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Admin/Models/Support/SaxModel_Admin_Support.cs @@ -0,0 +1,21 @@ +using Saxonite.Net.Core.Web.Base.App; + +namespace Saxonite.Net.Core.Web.Admin.Models.Support +{ + //======================================================================= + public class SaxModel_Admin_Support : SaxModel_Admin + { + //------------------------------------------------------------------- + // Protected construction. + protected SaxModel_Admin_Support(SaxLocaliser localiser) : + base(localiser) + { + } + + //------------------------------------------------------------------- + // Properties. + + //------------------------------------------------------------------- + } + //======================================================================= +} diff --git a/SaxoniteCoreWebAdmin/Localisation/SaxAdminProperties.resx b/SaxoniteCoreWebAdmin/Localisation/SaxAdminProperties.resx index 6167029..eb9b315 100644 --- a/SaxoniteCoreWebAdmin/Localisation/SaxAdminProperties.resx +++ b/SaxoniteCoreWebAdmin/Localisation/SaxAdminProperties.resx @@ -156,6 +156,18 @@ Organisations + + User Report + + + Create User Report + + + Update User Report + + + User Reports + Sportierre @@ -432,6 +444,9 @@ Remove + + Report + Roles @@ -477,6 +492,9 @@ Strength + + Support + System diff --git a/SaxoniteCoreWebAdmin/Views/Shared/_Layout.cshtml b/SaxoniteCoreWebAdmin/Views/Shared/_Layout.cshtml index 22d0f2f..6479499 100644 --- a/SaxoniteCoreWebAdmin/Views/Shared/_Layout.cshtml +++ b/SaxoniteCoreWebAdmin/Views/Shared/_Layout.cshtml @@ -118,6 +118,16 @@ } else { +
  • + +
    +
    @Localiser["label.users.online"]
    +
    @Localiser["user.caption.users"]
    +
    @Localiser["caption.organisations"]
    +
    +
  • -
    @Localiser["label.users.online"]
    -
    @Localiser["user.caption.users"]
    -
    @Localiser["caption.organisations"]
    +
    @Localiser["caption.user.reports"]
  • diff --git a/SaxoniteCoreWebAdmin/Views/UserReport/Index.cshtml b/SaxoniteCoreWebAdmin/Views/UserReport/Index.cshtml new file mode 100644 index 0000000..79649f9 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Views/UserReport/Index.cshtml @@ -0,0 +1,116 @@ +@model Model_UserReport +@inject SaxLocaliser Localiser +@{ + /* User Report - Index */ + ViewData["Title"] = "User Reports"; + Model.AdditionalFiles_JS.Add("js/sax-spt-rpt.js"); +} + +
    + + + +
    + + @* Filter Panel *@ +
    +
    + + @* Filter Form *@ + @using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserReportFilter", @class = "sax-form", @onSubmit = "return false;" })) + { + + @* Header - Page caption, paging controls, actions. *@ +
    +
    @Localiser["caption.user.reports"]
    +
    +
    + +
    +
    + @* Burger menu *@ +
      +
    • + +
        @* Menu items will be inserted here. *@
      +
      • +
    +
    +
    +
    +
    +
    +
    @Localiser["label.report"]
    +
    @Html.TextBoxFor(model => model.Filter.Report, new { @id = "ifFilterUserReport", @class = "FilterUserReport", @maxlength = "32" })
    +
    +
    + + @* Filter element templates *@ +
    + @* Burger dropdown item template - ul is ignored *@ +
      +
    • XXX
      • +
    +
    + } +
    +
    + + @* Results Panel *@ +
    +
    +
    +
    + + @* Element templates *@ +
    + + @* UserReport item template *@ +
    +
    +
    +
    UserReport Title
    +
    +
    + @* Burger menu *@ +
      +
    • + +
        @* Menu items will be inserted here. *@
      +
      • +
    +
    +
    +
    +
    +
     
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + @* Burger dropdown item template - ul is ignored *@ +
      +
    • XXX
      • +
    + +
    +
    + +
    + +
    + + + +
    + diff --git a/SaxoniteCoreWebAdmin/Views/UserReport/Panel-UserReportDialog.cshtml b/SaxoniteCoreWebAdmin/Views/UserReport/Panel-UserReportDialog.cshtml new file mode 100644 index 0000000..d87e480 --- /dev/null +++ b/SaxoniteCoreWebAdmin/Views/UserReport/Panel-UserReportDialog.cshtml @@ -0,0 +1,99 @@ +@model Model_UserReport +@inject SaxLocaliser Localiser +@{ + /* Support - User Report dialog */ +} + + + +@* User Report Id form. *@ +@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserReportId", @class = "sax-form" })) +{ + @Html.HiddenFor(model => model.UserReport.Id, new { @class = "UserReportId" }) +} + +@* User Report dialog *@ +
    +
    + + @* User Report form *@ + @using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserReport", @class = "sax-form", @onSubmit = "return false;" })) + { + @Html.HiddenFor(model => model.UserReport.Id, new { @class = "UserReportId" }) + @Html.HiddenFor(model => model.UserReport.Exists, new { @class = "UserReportExists" }) + + @* User Report Type *@ +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + @* User Report Title *@ +
    +
    +
    +
    + +
    +
    +
    +
    + @Html.TextBoxFor(model => model.UserReport.Title, new { @id = "ifUserReportTitle", @class = "UserReportTitle sax-input", @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Support.ColumnIdx.UserReport_Title) }) +
    +
    +
    +
    +
    + + @* Report *@ +
    +
    +
    +
    + +
    +
    +
    +
    + @Html.TextAreaFor(model => model.UserReport.Report, new { @id = "ifUserReportReport", @class = "UserReportReport sax-textarea", @rows = 12, @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Support.ColumnIdx.UserReport_Report) }) +
    +
    +
    +
    +
    + + @* UserReport Status *@ +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + } +
    + +
    diff --git a/SaxoniteCoreWebAdmin/Views/_ViewImports.cshtml b/SaxoniteCoreWebAdmin/Views/_ViewImports.cshtml index 0fa65e5..5b52a3f 100644 --- a/SaxoniteCoreWebAdmin/Views/_ViewImports.cshtml +++ b/SaxoniteCoreWebAdmin/Views/_ViewImports.cshtml @@ -4,4 +4,5 @@ @using Saxonite.Net.Standard.Base.App @using Saxonite.Net.Core.Web.Base.App @using Saxonite.Net.Core.Web.Admin.Models +@using Saxonite.Net.Core.Web.Admin.Models.Support @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js b/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js index 8d4c2fd..63ab918 100644 --- a/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js +++ b/SaxoniteCoreWebAdmin/wwwroot/js/sax-main.js @@ -102,7 +102,7 @@ code = code || 'code'; desc = desc || 'desc'; $sel = $($sel).empty(); - for (const value of values) + for (const value of values || []) $sel.append($('