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

v1.2.4.2

Browse Source
This commit is contained in:
andy
2022-03-07 12:22:53 +00:00
parent 362aa31e15
commit 7271b54fba
39 changed files with 356 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/wwwroot/js/sax-org.js
+4 -4
View File
@@ -109,7 +109,7 @@
}
op.showSelectFilterSport = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, items: op.data.sports, fnCallback: op.onFilterSportSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, itemId: $('.FilterOrganisationSportId', $frm.filter).val(), items: op.data.sports, fnCallback: op.onFilterSportSelected });
}
op.onFilterSportSelected = function (spt)
{
@@ -144,7 +144,7 @@
}
op.showSelectOrgSport = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, items: op.data.sports, fnCallback: op.onOrgSportSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, itemId: $('.OrganisationSportId', $frm.org).val(), items: op.data.sports, fnCallback: op.onOrgSportSelected });
}
op.onOrgSportSelected = function (spt)
{
@@ -167,7 +167,7 @@
}
op.showSelectFilterRegion = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectFilterRegion, items: op.data.regions, fnCallback: op.onFilterRegionSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectFilterRegion, itemId: $('.FilterOrganisationRegionId', $frm.filter).val(), items: op.data.regions, fnCallback: op.onFilterRegionSelected });
}
op.onFilterRegionSelected = function (rgn)
{
@@ -203,7 +203,7 @@
}
op.showSelectOrgRegion = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegion, items: op.data.regions, fnCallback: op.onOrgRegionSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegion, itemId: $('.OrganisationRegionIdCountry', $frm.org).val(), items: op.data.regions, fnCallback: op.onOrgRegionSelected });
}
op.onOrgRegionSelected = function (rgn)
{
SaxoniteCoreWebAdmin/wwwroot/js/sax-usr.js
+8 -6
View File
@@ -65,8 +65,10 @@
$('.UserRegionNameProvince', $item).text(item.regionNameProvince);
$('.UserRoleCount', $item).text(item.userRoleCount);
$('.UserRoles', $item).toggle(!!item.userRoleCount);
$('.UserLastLoginAt', $item).text(item.lastLoginAt);
$('.UserLastLogin', $item).toggle(!!item.lastLoginAt);
$('.UserLastOnlineLoginAt', $item).text(item.lastOnlineLoginAt);
$('.UserLastOnlineLogin', $item).toggle(!!item.lastOnlineLoginAt);
$('.UserLastAdminLoginAt', $item).text(item.lastAdminLoginAt);
$('.UserLastAdminLogin', $item).toggle(!!item.lastAdminLoginAt);
$('.StatusDesc', $item).text(item.statusDesc).addClass('sax-status-' + item.statusCode.toLowerCase());
$('.sax-caption .sax-action').toggleClass('sax-action', !item.deleted);
let $mnu = $('ul.sax-dropdown-menu', $item);
@@ -129,7 +131,7 @@
}
sax.showSelectFilterSport = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, items: sax.data.sports, fnCallback: sax.onFilterSportSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, itemId: $('.FilterUserSportId', $frm.filter).val(), items: sax.data.sports, fnCallback: sax.onFilterSportSelected });
}
sax.onFilterSportSelected = function (spt)
{
@@ -171,7 +173,7 @@
}
sax.showSelectFilterRegion = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectFilterRegion, items: sax.data.regions, fnCallback: sax.onFilterRegionSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectFilterRegion, itemId: $('.FilterUserRegionId', $frm.filter).val(), items: sax.data.regions, fnCallback: sax.onFilterRegionSelected });
}
sax.onFilterRegionSelected = function (rgn)
{
@@ -193,7 +195,7 @@
}
sax.showSelectRegionCountry = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegionCountry, items: sax.data.regions, fnCallback: sax.onRegionCountrySelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegionCountry, itemId: $('.UserRegionIdCountry', $frm.user).val(), items: sax.data.regions, fnCallback: sax.onRegionCountrySelected });
}
sax.onRegionCountrySelected = function (rgn)
{
@@ -215,7 +217,7 @@
}
sax.showSelectRegionProvince = function ()
{
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegionProvince, items: sax.data.regions, fnCallback: sax.onRegionProvinceSelected });
sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectRegionProvince, itemId: $('.UserRegionIdProvince', $frm.user).val(), items: sax.data.regions, fnCallback: sax.onRegionProvinceSelected });
}
sax.onRegionProvinceSelected = function (rgn)
{