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

1.2.11.5

Browse Source
This commit is contained in:
andy
2024-06-13 14:29:58 +01:00
parent 2f6395485a
commit 60427e8230
114 changed files with 2176 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/Admin/App/SaxApplication_Admin.cs
+2 -2
View File
@@ -31,7 +31,7 @@ namespace Saxonite.Net.Core.Web.Admin.App
{
//-------------------------------------------------------------------
// Data members.
private bool generateDatabaseDefinitions = true;
private bool generateDatabaseDefinitions = false;
private bool populateRegions = false;
private Dictionary<String, SaxAppConfig> appConfigs = new Dictionary<string, SaxAppConfig>();
private Dictionary<String, SaxEmailConfig> emailConfigs = new Dictionary<string, SaxEmailConfig>();
@@ -55,7 +55,7 @@ namespace Saxonite.Net.Core.Web.Admin.App
}
catch (Exception exc)
{
SaLogger.Error(GetType().Name + ".CTR " + ExceptionUtil.GetErrorStateMessage(exc));
SaLogger.Error($"{GetType().Name}.CTR {ExceptionUtil.GetErrorStateMessage(exc)}");
throw;
}
}
SaxoniteCoreWebAdmin/Admin/Consoles/SaxConsoleHelper_Admin.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using Saxonite.Net.Core.Web.Admin.App;
using Sarand.Net.Standard.Base.Utils;
using Saxonite.Net.Core.Web.Admin.App;
using Saxonite.Net.Core.Web.Base.Consoles;
using Saxonite.Net.Standard.Base.App;
using Saxonite.Net.Standard.Base.Consoles;
@@ -58,7 +59,7 @@ namespace Saxonite.Net.Core.Web.Admin.Consoles
private Dictionary<ushort, SaxProcessConsole_Admin> processConsoles { get; } = new Dictionary<ushort, SaxProcessConsole_Admin>();
public SaxProcessConsole GetProcessConsole(SaxSessionContext sessionContext)
{
if (sessionContext == null) throw new NotSupportedException(GetType().Name + ".GetProcessConsole Session Context must be specified");
if (sessionContext == null) throw new NotSupportedException($"{SysUtil.Fn} Session Context must be specified.");
SaxProcessConsole_Admin processConsole = processConsoles.GetValueOrDefault(sessionContext.Index, null);
if (processConsole == null)
{
SaxoniteCoreWebAdmin/Admin/Controllers/SaxController_Admin.cs
+4 -4
View File
@@ -21,7 +21,7 @@ using System.Web;
namespace Saxonite.Net.Core.Web.Admin.Controllers
{
//=======================================================================
public class SaxController_Admin : SaxController_Base
public class SaxController_Admin : SaxController_Web
{
//-------------------------------------------------------------------
// Data members.
@@ -98,7 +98,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
userRole.KeepLoggedIn = keepLoggedIn;
userRole.LastLoginAt = DateTime.Now;
userRole.InvalidLoginCount = 0;
userRole.LastInvalidLoginAt = DateTime.MinValue;
userRole.LastInvalidLoginAt = null;
if (!AccountMgr.UpdateUserRole(userRole, DbUpdateInfo))
{
SaLogger.Warn(fn + " Failed to update Admin user role for " + userAccount.EmailAddress + ": " + AccountMgr.ErrorStateMessage);
@@ -197,7 +197,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
if (StringUtil.IsEmpty(GetRequestCookie(KeepLoggedIn.CookieName))) return;
// Clear cookie by setting expiry date in the past.
SetResponseCookie(KeepLoggedIn.CookieName, "", DateTime.Today.AddDays(-7), true);
SaLogger.Info(GetType().Name + ".ClearKeepLoggedInCookie 'Keep Logged In' cookie cleared.");
SaLogger.Info($"{SysUtil.Fn} 'Keep Logged In' cookie cleared.");
}
//-------------------------------------------------------------------
@@ -245,7 +245,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
NameValueCollection linkParams = DecryptParameters(encryptedParams, KeepLoggedIn.Base64IV, KeepLoggedIn.Base64Key);
keepLoggedInParams.UserAccountId = new SysId(StringUtil.ToInt(linkParams.Get(ParamName_KeepLoggedIn_UserAccountId)));
}
if (DebugMode) SaLogger.Info(GetType().Name + ".ExtractKeepLoggedInParams UserAccountId: " + SysId.ToString(keepLoggedInParams.UserAccountId));
if (DebugMode) SaLogger.Info($"{SysUtil.Fn} UserAccountId: " + SysId.ToString(keepLoggedInParams.UserAccountId));
return keepLoggedInParams;
}
SaxoniteCoreWebAdmin/wwwroot/css/sax-data.css
+5
View File
@@ -67,6 +67,11 @@
text-align: right;
}
.sax-panel-filter .sax-content .sax-value
{
padding-top: 2px;
}
.sax-panel-filter .sax-content input[type="text"],
.sax-panel-filter .sax-content select
{
SaxoniteCoreWebAdmin/wwwroot/css/sax-form.css
+3 -2
View File
@@ -199,8 +199,8 @@
.sax-form .sax-form-control .sax-message
{
display: none;
margin-top: 8px;
padding-left: 16px;
margin-top: 4px;
padding-left: 24px;
font-size: 1.00rem;
background-position: left top;
background-repeat: no-repeat;
@@ -208,6 +208,7 @@
.sax-form .sax-form-control.sax-error .sax-message
{
min-height: 18px;
display: block;
color: #e3120b;
background-image: url("../img/icon/error-18.png");
SaxoniteCoreWebAdmin/wwwroot/js/sax-home.js
+1 -1
View File
@@ -95,7 +95,7 @@
var items = response.items;
if (!items.length)
return $msgs.append($('<div class="sax-message">' + sax.msg.dbSchemaValid + '</div>')).fadeIn(500);
sax.debug(ah.getDbSchemaTemplate());
//sax.debug(ah.getDbSchemaTemplate());
for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
$items.append(ah.populateDbSchemaItem(ah.getDbSchemaTemplate(), items[itemIdx]));
$items.slideDown(750);
SaxoniteCoreWebAdmin/wwwroot/js/sax-org-dnl.js
+5 -5
View File
@@ -21,22 +21,22 @@
od.downloadOrgData = function ()
{
sax.debug("downloadOrgData");
//sax.debug("downloadOrgData");
$('.FilterOrganisation', $frm.orgDnl).val($('.FilterOrganisation', $frm.orgFlt).val());
$('.FilterOrganisationCategory', $frm.orgDnl).val($('.FilterOrganisationCategory', $frm.orgFlt).val());
sax.debug($('.FilterOrganisationSportId', $frm.orgFlt));
sax.debug($('.FilterOrganisationSportId', $frm.orgFlt).val());
//sax.debug($('.FilterOrganisationSportId', $frm.orgFlt));
//sax.debug($('.FilterOrganisationSportId', $frm.orgFlt).val());
$('.FilterOrganisationSportId', $frm.orgDnl).val($('.FilterOrganisationSportId', $frm.orgFlt).val());
$('.FilterOrganisationRegionId', $frm.orgDnl).val($('.FilterOrganisationRegionId', $frm.orgFlt).val());
$('.FilterOrganisationStatusCategory', $frm.orgDnl).val($('.FilterOrganisationStatusCategory', $frm.orgFlt).val());
sax.debug($frm.orgDnl);
//sax.debug($frm.orgDnl);
if (!$frm.orgDnl.length) return;
$frm.orgDnl.prop('target', '_blank').prop('action', '/Organisation/Download').submit();
}
od.onDownloadOrgData = function (response)
{
sax.debug('onDownloadOrgData', response);
//sax.debug('onDownloadOrgData', response);
}
//--------------------------------------------------------------
SaxoniteCoreWebAdmin/wwwroot/js/sax-sys-logs.js
+10 -7
View File
@@ -89,7 +89,7 @@
$ctrl.cbYears.append($('<option value="' + items[itemIdx].name + '">' + items[itemIdx].name + '</option>'));
if (sax.data.logYear) $ctrl.cbYears.val(sax.data.logYear);
delete sax.data.logYear;
$ctrl.cbYears.trigger('change');
if ($ctrl.cbYears.val()) $ctrl.cbYears.trigger('change');
}
//--------------------------------------------------------------
@@ -112,6 +112,7 @@
sax.refreshControlValues(response.controlValues);
$pnl.msgs.hide().empty();
if (!response.success) return;
sax.data.logYear = $ctrl.cbYears.val();
// Months.
var items = response.months;
if (!items.length)
@@ -119,8 +120,9 @@
for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
$ctrl.cbMonths.append($('<option value="' + items[itemIdx].name + '">' + items[itemIdx].name + '</option>'));
if (sax.data.logMonth) $ctrl.cbMonths.val(sax.data.logMonth);
if (!$ctrl.cbMonths.val() && items.length) $ctrl.cbMonths.val(items[0].name);
delete sax.data.logMonth;
$ctrl.cbMonths.trigger('change');
if ($ctrl.cbMonths.val()) $ctrl.cbMonths.trigger('change');
}
//--------------------------------------------------------------
@@ -137,13 +139,14 @@
}
sl.doRefreshFiles = function (response)
{
sax.debug('doRefreshFiles', response);
//sax.debug('doRefreshFiles', response);
delete sl.data.awaitingRefreshFilesResponse;
sl.clearFiles();
sax.refreshControlValues(response.controlValues);
$pnl.msgs.hide().empty();
var $items = $('.sax-panel-item-list', $pnl.results).hide().empty();
if (!response.success) return;
sax.data.logMonth = $ctrl.cbMonths.val();
// Files.
var items = response.files;
if (!items.length)
@@ -152,11 +155,11 @@
$items.append(sl.populateItem(sl.getFileTemplate(), items[itemIdx]));
$items.fadeIn(50);
}
sl.populateItem = function ($item,item)
sl.populateItem = function ($item, item)
{
if (!item) return $item;
$('.Filename', $item).text(item.name).off('click').on('click', function () { sl.getFile(item.name) });
$('.Length', $item).text(sax.formatFileSize(item.size,2));
$('.Length', $item).text(sax.formatFileSize(item.size, 2));
return $item;
}
sl.getFileTemplate = function ()
@@ -178,7 +181,7 @@
}
sl.doGetFiles = function (response)
{
sax.debug('doGetFiles', response);
//sax.debug('doGetFiles', response);
delete sl.data.awaitingGetFileResponse;
$pnl.msgs.hide().empty();
if (!response.success) return;
@@ -207,7 +210,7 @@
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.close] = function () { $(this).dialog('close'); };
$dlg.file= $('#dlgLogFile').dialog(opt);
$dlg.file = $('#dlgLogFile').dialog(opt);
setTimeout(sl.refreshFolders, 250);
});