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

v1.2.0

Browse Source
This commit is contained in:
andy
2021-11-01 18:14:21 +00:00
parent ea61d37840
commit 806ebb4024
34 changed files with 766 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/wwwroot/js/sax-organisation.js
+5 -6
View File
@@ -6,7 +6,7 @@
{
"use strict";
let op = sax.mdl.organisations = sax.mdl.organisations || { data: {}, ajax: {} };
let $pnl = sax.$pnl, $frm = sax.$frm, $dlg = sax.$dlg;
let $pnl = op.$pnl = {}, $frm = op.$frm = {}, $dlg = op.$dlg = {};
sax.itemIdPrefix = 'Itm_';
//--------------------------------------------------------------
@@ -200,7 +200,7 @@
$('.OrganisationStatus', frm).val(sax.data.defaultStatusCode);
sax.clearControlErrors();
$dlg.organisation.dialog('option', 'title', sax.dlg.title.createOrganisation);
sax.openDialog($dlg.organisation, 600, 600);
sax.openDialog($dlg.organisation, 600, 480);
}
//--------------------------------------------------------------
@@ -228,7 +228,7 @@
$('.OrganisationStatus', frm).val(item.statusCode);
sax.clearControlErrors();
$dlg.organisation.dialog('option', 'title', sax.dlg.title.updateOrganisation);
sax.openDialog($dlg.organisation, 600, 600);
sax.openDialog($dlg.organisation, 600, 480);
}
//--------------------------------------------------------------
@@ -269,7 +269,6 @@
sax.debug('showActivationInfo', response);
if (!response.success || !response.organisation) return;
let item = response.organisation;
let $dlg = $dlg.activate;
let frm = $('#frmOrganisationActivation');
$('.OrganisationId', frm).val($('.OrganisationId', $frm.orgId).val());
let popItemValue = function (sel, val)
@@ -281,7 +280,7 @@
popItemValue('.OrganisationRegion', item.regionNameCountry);
popItemValue('.OrganisationCategory', item.categoryDesc);
popItemValue('.OrganisationAddress', item.addressSummary);
let $orgMbrs = $('.OrganisationMembers', $dlg).empty();
let $orgMbrs = $('.OrganisationMembers', $dlg.activate).empty();
let $mbrTmpl = $('.sax-panel-item-template tr.sax-item.Member');
sax.debug(response.members, $orgMbrs, $mbrTmpl);
for (let idx = 0; idx < response.members.length; idx++)
@@ -295,7 +294,7 @@
$orgMbrs.append($item);
sax.debug($item);
}
sax.openDialog($dlg, 480, 640);
sax.openDialog($dlg.activate, 480, 420);
}
sax.activateOrganisation = function ()
{
SaxoniteCoreWebAdmin/wwwroot/js/sax-organisationMembers.js
+3 -11
View File
@@ -135,11 +135,7 @@
sax.clearControlErrors();
sax.member = { roleCodes: [] };
sax.$dlg.member.dialog('option', 'title', sax.dlg.title.createMember);
sax.openDialog(sax.$dlg.member, 600, 600);
}
sax.doCreateItem = function ()
{
sax.storeItem();
sax.openDialog(sax.$dlg.member, 600, 480);
}
//--------------------------------------------------------------
@@ -165,11 +161,7 @@
$('.MemberStatus', $frm).val(item.statusCode);
sax.clearControlErrors();
sax.$dlg.member.dialog('option', 'title', sax.dlg.title.updateMember);
sax.openDialog(sax.$dlg.member, 600, 600);
}
sax.doUpdateItem = function ()
{
sax.storeItem();
sax.openDialog(sax.$dlg.member, 600, 480);
}
//--------------------------------------------------------------
@@ -208,7 +200,7 @@
$('#ifMemberUserEmailAddress', sax.$frm.member).on('change', function () { sax.onChangeEmail(); });
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { sax.doCreateItem(); };
opt.buttons[sax.dlg.btn.ok] = function () { sax.storeItem(); };
opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
sax.$dlg.member = $('#dlgMember').dialog(opt);
SaxoniteCoreWebAdmin/wwwroot/js/sax-region.js
+1 -9
View File
@@ -101,10 +101,6 @@
sax.$dlg.region.dialog('option', 'title', sax.dlg.title.createRegion);
sax.openDialog(sax.$dlg.region, 600, 600);
}
sax.doCreateItem = function ()
{
sax.storeItem();
}
//--------------------------------------------------------------
sax.updateItem = function (id)
@@ -131,10 +127,6 @@
sax.$dlg.region.dialog('option', 'title', sax.dlg.title.updateRegion);
sax.openDialog(sax.$dlg.region, 600, 600);
}
sax.doUpdateItem = function ()
{
sax.storeItem();
}
//--------------------------------------------------------------
sax.storeItem = function ()
@@ -174,7 +166,7 @@
sax.$frm.region = $('#frmRegion');
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { sax.doCreateItem(); };
opt.buttons[sax.dlg.btn.ok] = function () { sax.storeItem(); };
opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
sax.$dlg.region = $('#dlgRegion').dialog(opt);
SaxoniteCoreWebAdmin/wwwroot/js/sax-sys-db.js
+1 -5
View File
@@ -75,10 +75,6 @@
sax.$dlg.dbTable.dialog('option', 'title', sax.dlg.title.viewDatabaseTable);
sax.openDialog(sax.$dlg.dbTable, 600, 600);
}
sax.doUpdateItem = function ()
{
sax.storeItem();
}
//--------------------------------------------------------------
$(function ()
@@ -92,7 +88,7 @@
sax.$frm.dbTable = $('#frmDatabaseTable');
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { sax.doCreateItem(); };
opt.buttons[sax.dlg.btn.ok] = function () { sax.storeItem(); };
opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
sax.$dlg.dbTable = $('#dlgDatabaseTable').dialog(opt);
SaxoniteCoreWebAdmin/wwwroot/js/sax-user.js
+3 -3
View File
@@ -210,7 +210,7 @@
sax.clearControlErrors();
sax.userAccount = { userRoleCodes: [] };
$dlg.user.dialog('option', 'title', sax.dlg.title.createUser);
sax.openDialog($dlg.user, 600, 600);
sax.openDialog($dlg.user, 600, 480);
}
//--------------------------------------------------------------
@@ -237,7 +237,7 @@
$('#ifUserRoleCodes').val(item.userRoleCodes.join(sax.data.userRoleCodeDelim));
$('.UserStatus', frm).val(item.statusCode);
$dlg.user.dialog('option', 'title', sax.dlg.title.updateUser);
sax.openDialog($dlg.user, 600, 600);
sax.openDialog($dlg.user, 600, 480);
}
//--------------------------------------------------------------
@@ -274,7 +274,7 @@
$('.RequestPasswordAdminOption', frm).toggle(item.systemAdmin);
$('input[type="checkbox"]', frm).prop('checked', false);
$dlg.emails.dialog('option', { 'title': sax.dlg.title.selectUserEmails });
sax.openDialog($dlg.emails, 600, 600);
sax.openDialog($dlg.emails, 600, 360);
}
sax.sendUserEmails = function ()
{