This commit is contained in:
2021-07-23 14:01:49 +01:00
parent 10907d3aff
commit 0d7be69e1e
109 changed files with 3161 additions and 943 deletions
@@ -202,7 +202,7 @@
//sax.debug('addProfileSport');
let $dlg = sax.$dlg.profileSport;
$('.UserSportId,.ProfileSportExists,#ifProfileSportId,input.sax-input,select.sax-select', $dlg).val('');
$('#pbSelectSport', $dlg).show();
$('.SelectSport', $dlg).show();
$dlg.dialog('option', 'title', sax.dlg.title.addUserSport);
sax.openDialog($dlg, 480, 400);
}
@@ -224,7 +224,7 @@
$('#ifProfileSport', $dlg).val(item.sportName);
$('#cbProfileSportParticipation', $dlg).val(item.sportParticipationCode);
$('#cbProfileSportOfficiating', $dlg).val(item.sportOfficiatingCode);
$('#pbSelectSport', $dlg).hide();
$('.SelectSport', $dlg).hide();
$dlg.dialog('option', 'title', sax.dlg.title.updateUserSport);
sax.openDialog($dlg, 480, 400);
}
@@ -273,7 +273,7 @@
}
sax.onRefreshProfileOrganisationsInfo = function (response)
{
//sax.debug('onRefreshProfileOrganisationsInfo', response);
sax.debug('onRefreshProfileOrganisationsInfo', response);
if (!response || !response.success) return;
var $section = $('.sax-panel-section.ProfileOrganisations');
$('.sax-message', $section).stop(true, false).fadeOut(200).empty();
@@ -287,6 +287,10 @@
let item = items[itemIdx];
let $item = $tmpl.clone().prop('id', 'ProOrg_' + item.id);
$('.OrganisationName', $item).text(item.name);
$('.OrganisationSport', $item).text(item.sportName);
$('.OrganisationRegion', $item).text(item.regionName);
$('.OrganisationMemberCount', $item).toggle(!!item.memberCount).find('.MemberCount').text(item.memberCount);
$('.OrganisationOpportunityCount', $item).toggle(!!item.opportunityCount).find('.MemberCount').text(item.opportunityCount);
$items.append($item);
}
$items.show();
@@ -0,0 +1,123 @@
/*
* Code selection.
*/
(function (win, doc, undef)
{
"use strict";
let cs = sax.codeSelect = sax.codeSelect || { fn: {}, $dlg: {}, codeIdPrefix: 'Code_' };
//--------------------------------------------------------------
/*
* Code selection config:
* - caption - dialog title.
* - width: preferred dialog width (default: 400).
* - height: preferred dialog height (default: 400).
* - showFilter: whether to display filter control(s).
* - filterLabel: filter code field caption.
* - maxItems: maximum number of available items to list.
* - codes - list of {code,desc,comment} objects
* - selectedCodes - list of codes.
* - fnCallback - method to call on completion to store codes taking list of selected codes as parameter.
*/
cs.fn.openCodeSelect = function (cfg)
{
//sax.debug('openSelectCode', cfg);
cs.fn.init();
cs.cfg = cfg;
cs.selectedCodes = cfg.selectedCodes || [];
cs.fn.displayCodes(cfg.codes);
sax.openDialog(cs.$dlg.dialog('option', { title: cfg.caption || 'Select Codes' }), cs.cfg.width || 400, cs.cfg.height || 400);
}
cs.fn.displayCodes = function (codes)
{
let $codesAvail = $('.sax-codeSelect-codes.AvailableCodes').empty();
let $codesSelec = $('.sax-codeSelect-codes.SelectedCodes').empty();
let $codeTmpl = $('.sax-panel-item-template .sax-panel-item.Code');
for (let codeIdx = 0; codeIdx < codes.length; codeIdx++)
{
let code = codes[codeIdx];
let selected = cs.selectedCodes.indexOf(code.code) >= 0;
let $code = $codeTmpl.clone();
$($code).prop('id', cs.codeIdPrefix + code.code).attr('aria-code', code.code).on('click', function () { cs.fn.onClickCode(code.code); }).on('dblclick', function () { cs.fn.onDblClickCode(code.code); }).find('.CodeDesc').text(code.desc).end();
if (selected) $codesSelec.append($code);
else $codesAvail.append($code);
}
}
cs.fn.onClickCode = function (code)
{
$('.sax-panel-item.Code').removeClass('sel');
$('.sax-panel-item.Code[aria-code="' + code + '"]').addClass('sel');
}
cs.fn.onDblClickCode = function (code)
{
let codeIdx = cs.selectedCodes.indexOf(code);
//sax.debug('onDblClickCode', code, codeIdx);
if (codeIdx >= 0) cs.selectedCodes.splice(codeIdx, 1); else cs.selectedCodes.push(code)
cs.fn.displayCodes(cs.cfg.codes)
$('.sax-panel-item.Code[aria-code="' + code + '"]').addClass('sel');
}
cs.fn.onClickSelect = function ()
{
let codes = [];
$('.sax-codeSelect-codes.AvailableCodes .sax-panel-item.Code.sel').each(function (idx, el)
{
let code = $(el).attr('aria-code');
if (code)
{
codes.push(code);
cs.selectedCodes.push(code);
};
});
cs.fn.displayCodes(cs.cfg.codes)
for (const code of codes)
$('.sax-panel-item.Code[aria-code="' + code + '"]').addClass('sel');
}
cs.fn.onClickRemove = function ()
{
let codes = [];
$('.sax-codeSelect-codes.SelectedCodes .sax-panel-item.Code.sel').each(function (idx, el)
{
let code = $(el).attr('aria-code');
if (code)
{
let codeIdx = cs.selectedCodes.indexOf(code);
if (codeIdx >= 0)
{
codes.push(code);
cs.selectedCodes.splice(codeIdx, 1);
}
};
});
cs.fn.displayCodes(cs.cfg.codes)
for (const code of codes)
$('.sax-panel-item.Code[aria-code="' + code + '"]').addClass('sel');
}
cs.fn.storeSelectCode = function ()
{
//sax.debug('storeSelectCode', cs.cfg, cs.selectedCodes);
if (cs.cfg.fnCallback) cs.cfg.fnCallback(cs.selectedCodes);
cs.$dlg.dialog('close');
cs.fn.cleanUp();
}
cs.fn.cleanUp = function ()
{
delete cs.cfg;
delete cs.selectedCodes;
}
//--------------------------------------------------------------
cs.fn.init = function ()
{
if (!cs.$dlg) return;
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { cs.fn.storeSelectCode(); };
opt.buttons[sax.dlg.btn.cancel] = function () { cs.fn.cleanUp(); $(this).dialog('close'); };
cs.$dlg = $('#dlgCodeSelect').dialog(opt);
$('.sax-button.Select', cs.$dlg).on('click', function () { cs.fn.onClickSelect(); });
$('.sax-button.Remove', cs.$dlg).on('click', function () { cs.fn.onClickRemove(); });
}
}(window, window.document));
/* The End */
+28 -3
View File
@@ -70,6 +70,21 @@
}
sax.debug = sax.debugMode ? win.console.log.bind(win.console) : function () { };
//--------------------------------------------------------------
sax.compareCI = function (a, b)
{
var comparison = a.toLowerCase().localeCompare(b.toLowerCase());
if (comparison === 0)
return a.localeCompare(b);
return comparison;
}
sax.arraySortCI = function ()
{
if (!this) return this;
this.sort(function (a, b) { return sax.compareCI(a, b); });
return this;
};
//--------------------------------------------------------------
sax.setOddDataRowClass = function (rowSel, cName)
{
@@ -387,7 +402,7 @@
// Data entry.
sax.clearControlErrors = function (context)
{
var $ctrls = $('.sax-form-control', $(context)).removeClass('sax-error');
var $ctrls = $('.sax-form-control', $(context || doc.body)).removeClass('sax-error');
$('.sax-message', $ctrls).empty();
}
sax.clearControlError = function (sel)
@@ -402,8 +417,8 @@
}
sax.refreshControlValues = function (controlValues, context)
{
var $frmCtrls = $('.sax-form-control', $(context)).removeClass('sax-error');
sax.clearControlErrors();
var $frmCtrls = $('.sax-form-control', $(context || doc.body)).removeClass('sax-error');
sax.clearControlErrors(context);
var values = (controlValues || []);
var valuesLen = values.length;
for (var valIdx = 0; valIdx < valuesLen; valIdx++)
@@ -516,4 +531,14 @@
}(window, window.document));
//--------------------------------------------------------------
(function ()
{
if (typeof Object.defineProperty === 'function')
{
try { Object.defineProperty(Array.prototype, 'sortCI', { value: sax.arraySortCI }); } catch (e) { }
}
if (!Array.prototype.sortBy) Array.prototype.sortCI = sax.arraySortCI;
})();
/* The End */
@@ -0,0 +1,322 @@
/*
* Organisation - Members page scripts.
*/
(function (win, doc, undef)
{
"use strict";
sax.members = {};
sax.itemIdPrefix = 'Itm_';
//--------------------------------------------------------------
sax.refreshResults = function (delay)
{
sax.data.userCanManageMembers = false;
if (!sax.awaitingRefreshResponse)
{
var $items = $('.sax-panel-item-list', sax.$pnl.results).fadeOut(200).empty();
var $msgs = $('.sax-panel-messages', sax.$pnl.results).hide().empty().append($('<div class="sax-message">' + sax.msg.dataQuerying + '</div>')).fadeIn(200);
}
sax.ajax.refreshResults = sax.ajax.refreshResults || { url: sax.url.base + 'Organisation/Ajax/GetMemberList', formId: 'frmMemberFilter', callbackFn: sax.doRefreshResults };
sax.doAjaxRequest(sax.ajax.refreshResults, delay || 50);
sax.awaitingRefreshResponse = true;
}
sax.getFilterDropdownTemplate = function ()
{
return $('.sax-panel-item-template .sax-dropdown-menu.Members li.sax-dropdown-item', sax.$pnl.filter).clone();
}
sax.getItemTemplate = function ()
{
return $('.sax-panel-item-template .sax-panel-item.Member', sax.$pnl.results).clone();
}
sax.getItemDropdownTemplate = function ()
{
return $('.sax-panel-item-template .sax-dropdown-menu.Member li.sax-dropdown-item', sax.$pnl.results).clone();
}
sax.doRefreshResults = function (response)
{
sax.debug('doRefreshResults', response);
delete sax.awaitingRefreshResponse;
sax.refreshControlValues(response.controlValues);
let $mnu = $('.sax-burger ul.sax-dropdown-menu', sax.$pnl.filter).empty();
var $msgs = $('.sax-panel-messages', sax.$pnl.results).hide().empty();
var $items = $('.sax-panel-item-list', sax.$pnl.results).hide().empty();
if (!response.success) return;
// Reference data - roles.
if (response.memberRoles && response.memberRoles.length)
sax.data.memberRoles = response.memberRoles;
// Menu.
$mnu.append(sax.getFilterMenuOption(sax.lbl.refresh, function () { sax.refreshResults(); }));
if (sax.data.userCanManageMembers = (response.user && response.user.canManage))
$mnu.append(sax.getFilterMenuOption(sax.lbl.add, function () { sax.createItem(); }));
$('.sax-burger', sax.$pnl.filter).toggle(!!$('.sax-dropdown-item', $mnu).length);
// Items.
var items = response.members;
if (!items.length)
return $msgs.append($('<div class="sax-message">' + sax.msg.dataNoneFound + '</div>')).fadeIn(500);
for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
{
let item = items[itemIdx];
let $item = sax.getItemTemplate();
sax.populateItem($item, item);
$items.append($item);
}
$items.fadeIn(50);
}
sax.getFilterMenuOption = function (lbl, fn)
{
return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn);
}
sax.getMenuOption = function ($opt, lbl, fn)
{
return $opt.find('div.sax-label').text(lbl).end().on('click', fn);
}
sax.populateItem = function ($item, item)
{
if (!item) return;
$item.prop('id', sax.itemIdPrefix + item.id);
$('.MemberEmail', $item).text(item.emailAddress);
$('.MemberDisplayName', $item).text(item.displayName);
$('.MemberAdminComment', $item).text(item.adminComment);
$('.MemberStatus', $item).text(item.statusDesc).addClass('sax-status-' + item.statusCode.toLowerCase());
let $mnu = $('ul.sax-dropdown-menu', $item).empty();
if (sax.data.userCanManageMembers)
{
let fnUpd = function () { sax.updateItem(item.id) };
$mnu.append(sax.getItemMenuOption(sax.lbl.edit, fnUpd));
if (!item.currentUser)
$mnu.append(sax.getItemMenuOption(sax.lbl.remove, function () { sax.removeItem(item.id) }));
if (item.awaiting)
$mnu.append(sax.getItemMenuOption(sax.lbl.activate, function () { sax.activateItem(item.id) }));
$('.sax-caption .sax-action', $item).off('click').on('click', fnUpd);
}
else $('.sax-caption .sax-action', $item).removeClass('sax-action');
$('.sax-burger', $item).toggle(!!$('.sax-dropdown-menu .sax-dropdown-item', $item).length);
$('.sax-panel-messages', sax.$pnl.results).hide().empty();
}
sax.getItemMenuOption = function (lbl, fn)
{
return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn);
}
//--------------------------------------------------------------
sax.selectFilterOrganisation = function ()
{
if (!sax.data.memberOrganisations)
sax.getMemberOrganisations(sax.showSelectOrganisation);
else sax.showSelectOrganisation();
}
sax.getMemberOrganisations = function (fnCallback)
{
let handleMemberOrganisationsResponse = function (response)
{
//sax.debug('handleUserOrgsResponse', response);
if (!response.success) return;
sax.data.memberOrganisations = response.organisations;
if (fnCallback) fnCallback();
}
sax.ajax.userOrgs = sax.ajax.userOrgs || { url: sax.url.base + 'Organisation/Ajax/GetMemberOrganisationList', formId: 'frmNavigate', callbackFn: handleMemberOrganisationsResponse };
sax.doAjaxRequest(sax.ajax.userOrgs);
}
sax.showSelectOrganisation = function ()
{
//sax.debug('sax.selectFilterOrganisation');
sax.selectOrganisation.fn.selectOrganisation({ caption: sax.dlg.title.selectOrganisation, items: sax.data.memberOrganisations, fnCallback: sax.onOrganisationSelected });
}
sax.onOrganisationSelected = function (id, name)
{
//sax.debug('sax.onOrganisationSelected', id, name);
$('#frmMemberFilter #ifFilterOrganisationId, #frmMember #ifMemberOrganisationId').val(id);
$('#frmMemberFilter #ifFilterOrganisation').val(name);
sax.refreshResults(50);
}
//--------------------------------------------------------------
sax.createItem = function ()
{
if (!sax.data.userCanManageMembers) return;
sax.clearItem();
$('.MemberOrganisationId', sax.$frm.member).val($('.FilterOrganisationId', sax.$frm.filter).val());
sax.$dlg.member.dialog('option', 'title', sax.dlg.title.createMember);
sax.openDialog(sax.$dlg.member, 600, 600);
}
sax.clearItem = function ()
{
sax.member = { roleCodes: [] };
let $frm = sax.$frm.member;
$('.MemberId,.MemberExists,.MemberRoleCodes,input[type="text"],textarea,select', $frm).val('');
$('.MemberEmailAddress', $frm).prop('readonly', false);
$('.MemberDisplayName,.MemberTitle,.MemberFirstName,.MemberLastName', $frm).hide();
sax.clearControlErrors();
}
sax.doCreateItem = function ()
{
sax.storeItem();
}
//--------------------------------------------------------------
sax.updateItem = function (id)
{
if (!sax.data.userCanManageMembers) return;
$('.MemberId', sax.$frm.memberId).val(id);
sax.ajax.updateItem = sax.ajax.updateItem || { url: sax.url.base + 'Organisation/Ajax/GetMember', formId: 'frmMemberId', callbackFn: sax.onUpdateItem };
sax.doAjaxRequest(sax.ajax.updateItem, 50);
}
sax.onUpdateItem = function (response)
{
//sax.debug('onUpdateItem', response);
sax.clearItem();
if (!response.success) return;
let $frm = sax.$frm.member;
let item = sax.member = response.member;
$('.MemberId', $frm).val(item.id);
$('.MemberExists', $frm).val(1);
$('.MemberOrganisationId', $frm).val();
$('.MemberEmailAddress', $frm).val(item.emailAddress).prop('readonly', true);
$('.MemberDisplayName', $frm).toggle(!item.awaiting).val(item.displayName);
$('.MemberTitle', $frm).toggle(!!item.awaiting).val(item.title);
$('.MemberFirstName', $frm).toggle(!!item.awaiting).val(item.firstName);
$('.MemberLastName', $frm).toggle(!!item.awaiting).val(item.lastName);
$('.MemberRoleCodes', $frm).val(item.roleCodes);
$('.MemberRoles', $frm).val(sax.getSelectedMemberRoleDescs().join('\n'));
$('.MemberAdminComment', $frm).val(item.adminComment);
sax.clearControlErrors();
sax.$dlg.member.dialog('option', 'title', sax.dlg.title.updateMember);
sax.openDialog(sax.$dlg.member, 600, 600);
}
sax.doUpdateItem = function ()
{
sax.storeItem();
}
//--------------------------------------------------------------
// Member Roles.
sax.selectMemberRoles = function ()
{
//sax.debug('selectMemberRoles',sax.data);
sax.codeSelectCfg = sax.codeSelectCfg || { caption: sax.dlg.title.selectRoles, width: 520, fnCallback: sax.updateMemberRoles };
sax.codeSelectCfg.codes = sax.data.memberRoles;
sax.codeSelectCfg.selectedCodes = sax.member.roleCodes || [];
sax.codeSelect.fn.openCodeSelect(sax.codeSelectCfg);
}
sax.updateMemberRoles = function (memberRoleCodes)
{
sax.debug('updateMemberRoles', memberRoleCodes);
let $frm = sax.$frm.member;
sax.member.roleCodes = memberRoleCodes;
$('.MemberRoleCodes',$frm).val(memberRoleCodes.join(sax.data.memberRoleCodeDelim));
$('.MemberRoles', $frm).val(sax.getSelectedMemberRoleDescs().join('\n'));
}
sax.getSelectedMemberRoleDescs = function ()
{
let roles = [];
sax.member.roleCodes.forEach(function (value) { roles.push(sax.getMemberRoleDesc(value)); })
return roles.sortCI();
}
sax.getMemberRoleDesc = function (roleCode)
{
let roleDesc = '';
sax.data.memberRoles.some(function (value) { if (value.code == roleCode) { roleDesc = value.desc; return true; } return false; })
return roleDesc || roleCode;
}
//--------------------------------------------------------------
sax.storeItem = function ()
{
let $frm = sax.$frm.member;
$('.MemberNameSupplied', $frm).val($('.MemberLastName', $frm).is(":visible") ? 1 : 0);
sax.ajax.storeItem = sax.ajax.storeItem || { url: sax.url.base + 'Organisation/Ajax/StoreMember', formId: 'frmMember', callbackFn: sax.onStoreItem };
sax.doAjaxRequest(sax.ajax.storeItem, 50);
}
sax.onStoreItem = function (response)
{
sax.debug('onStoreItem', response);
sax.refreshControlValues(response.controlValues);
if (!response.success) return;
let $frm = sax.$frm.member;
if (response.memberNameRequired)
{
$('.MemberEmailAddress', $frm).prop('readonly', true);
$('.MemberTitle,.MemberFirstName,.MemberLastName', $frm).show();
return;
}
sax.$dlg.member.dialog('close');
var item = response.member;
var $item = $('#' + sax.itemIdPrefix + item.id);
if (!$item.length)
{
$item = sax.getItemTemplate();
$('.sax-panel-item-list', sax.$pnl.results).prepend($item).show();
}
sax.populateItem($item, item)
}
//--------------------------------------------------------------
sax.removeItem = function (id)
{
let fn = function ()
{
$('.MemberId', sax.$frm.memberId).val(id);
sax.ajax.removeItem = sax.ajax.removeItem || { url: sax.url.base + 'Organisation/Ajax/RemoveMember', formId: 'frmMemberId', callbackFn: sax.onItemRemoved };
sax.doAjaxRequest(sax.ajax.removeItem, 50);
}
sax.doConfirm(sax.dlg.title.remove, sax.msg.remove, fn);
}
sax.onItemRemoved = function (response)
{
if (!response.success) return;
var item = response.member;
var $item = $('#' + sax.itemIdPrefix + item.id);
//sax.debug(item, $item);
if ($item.length)
$item.remove();
}
//--------------------------------------------------------------
sax.activateItem = function (id)
{
let fn = function ()
{
$('.MemberId', sax.$frm.memberId).val(id);
sax.ajax.activateItem = sax.ajax.activateItem || { url: sax.url.base + 'Organisation/Ajax/ActivateMember', formId: 'frmMemberId', callbackFn: sax.onItemActivated };
sax.doAjaxRequest(sax.ajax.activateItem, 50);
}
sax.doConfirm(sax.dlg.title.activate, sax.msg.activate, fn);
}
sax.onItemActivated = function (response)
{
if (!response.success) return;
var item = response.member;
var $item = $('#' + sax.itemIdPrefix + item.id);
//sax.debug(item, $item);
if ($item.length)
sax.populateItem($item, item)
}
//--------------------------------------------------------------
$(function ()
{
sax.$pnl.members = $('#pnlMembers');
sax.$pnl.filter = $('.sax-panel-filter', sax.$pnl.members);
sax.$pnl.results = $('.sax-panel-results', sax.$pnl.members);
sax.$frm.filter = $('#frmMemberFilter');
$('.MemberFilter', sax.$frm.filter).on('input', function () { sax.refreshResults(250); }).on('keypress', function (event)
{
if (event.keyCode == 13) setTimeout(sax.refreshResults, 50);
});
sax.$frm.memberId = $('#frmMemberId');
sax.$frm.member = $('#frmMember');
$('.sax-input', sax.$frm.member).on('input', function () { sax.clearControlError(this); });
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { sax.doCreateItem(); };
opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
sax.$dlg.member = $('#dlgMember').dialog(opt);
setTimeout(sax.refreshResults, 250);
});
}(window, window.document));
/* The End */
@@ -21,7 +21,7 @@
or.fn.storeOrganisation = function ()
{
//sax.debug('refreshResults');
or.ajax.registerOrg = or.ajax.registerOrg || { url: sax.url.base + 'Organisation/Ajax/requestOrganisation', formId: 'frmOrganisationRequest', callbackFn: or.fn.handleRequestOrganisationResponse };
or.ajax.registerOrg = or.ajax.registerOrg || { url: sax.url.base + 'Organisation/Ajax/Request', formId: 'frmOrganisationRequest', callbackFn: or.fn.handleRequestOrganisationResponse };
sax.doAjaxRequest(or.ajax.registerOrg, 50);
}
or.fn.handleRequestOrganisationResponse = function (response)