Sarand/BusinessMgr-2019
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

3.0.1.3 Requirements

Browse Source
This commit is contained in:
Andy Howard
2025-03-02 19:08:41 +00:00
parent 80b085cf29
commit 6e23b091cf
45 changed files with 1420 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-form.css
+2 -66
View File
@@ -4,7 +4,7 @@
/* Panels */
.sbm-panel-info, .sbm-panel-form
.sbm-panel-form
{
max-width: 720px;
margin: 24px auto;
@@ -25,12 +25,11 @@
@media (min-width: 576px)
{
.sbm-panel-info, .sbm-panel-form
.sbm-panel-form
{
}
}
.sbm-panel-info > .sbm-header,
.sbm-panel-form > .sbm-header
{
padding: 12px 12px;
@@ -40,7 +39,6 @@
border-color: var(--color-primary);
}
.sbm-panel-info > .sbm-header .sbm-caption,
.sbm-panel-form > .sbm-header .sbm-caption
{
font-size: 1.5rem;
@@ -48,7 +46,6 @@
color: var(--color-primary-dark);
}
.sbm-panel-info > .sbm-header .sbm-action img:hover,
.sbm-panel-form > .sbm-header .sbm-action img:hover
{
background-color: #f0f0f0;
@@ -56,7 +53,6 @@
box-shadow: 2px 2px 4px 0 #80808080;
}
.sbm-panel-info > .sbm-content,
.sbm-panel-form > .sbm-content
{
max-height: 400px;
@@ -65,66 +61,6 @@
overflow-y: auto;
}
.sbm-panel-info > .sbm-content
{
padding: 8px 12px;
}
.sbm-panel-section.sbm-edit .sbm-panel-info,
.sbm-panel-section.sbm-populating .sbm-button-action.edit,
.sbm-panel-section .sbm-panel-form
{
display: none;
}
.sbm-panel-section.sbm-edit .sbm-panel-form
{
display: block;
}
/* Form */
.sbm-form
{
}
/* Labels, values, notes */
.sbm-panel-info .sbm-label, .sbm-panel-info .sbm-value
{
margin-bottom: 6px;
font-size: 1rem;
}
.sbm-panel-info .sbm-label
{
padding-right: 16px;
font-weight: bold;
color: #808080;
}
.sbm-panel-info .sbm-value
{
}
.sbm-form .sbm-form-control .sbm-label
{
margin: 2px 0 8px 0;
}
.sbm-form .sbm-form-control .sbm-label,
.sbm-form .sbm-form-control .sbm-label-text
{
font-size: 1rem;
line-height: 1.25;
}
.sbm-form .sbm-form-control .sbm-note
{
font-size: 0.9rem;
line-height: 1.2;
}
/* Controls */
.sbm-form .sbm-form-control
SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css
+9 -1
View File
@@ -380,6 +380,14 @@ a:focus
border-color: var(--color-dialog);
}
.ui-dialog .ui-dialog-titlebar .sbm-panel-caption
{
margin: 2px 0;
font-size: 1.1em;
white-space: nowrap;
overflow: hidden;
}
.ui-widget-content
{
font-size: 16px;
@@ -444,7 +452,7 @@ a:focus
.ui-datepicker-trigger
{
margin-left:4px;
margin-left: 4px;
}
/* The End */
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cmd.js
+5 -5
View File
@@ -181,7 +181,7 @@
$ctrls.filter('.CommodityExists').val(1);
sbm.selectOrAdd($ctrls.filter('.CommodityType'), item.typeCode, item.typeDesc);
co.populateSaleUomType(env, item.salesUnitType);
$ctrls.filter('.CommoditySalesPackQty').off('blur').on('blur', function () { sbm.formatNumber($(this), cfg.decimals.packQty); }).trigger('blur');
$ctrls.filter('.CommoditySalePackQty').off('blur').on('blur', function () { sbm.formatNumber($(this), cfg.decimals.packQty); }).trigger('blur');
sbm.selectOrAdd($ctrls.filter('.CommodityStatus'), item.statusCode, item.field.value.Status);
co.openItemDlg(env, cfg, sbm.dlg.title.updateCommodity);
}
@@ -327,15 +327,15 @@
env.$dlg.item = $items.find('#dlgCommodity').dialog(opt);
env.$frm.item = env.$dlg.item.find('#frmCommodity').off('input').on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).off('change').on('change', '.sbm-select', function () { sbm.clearControlError(this); });
env.$frm.item.off('blur').on('blur', '.sbm-input.sbm-format-integer', function () { sbm.formatInteger($(this)); }).off('blur').on('blur', '.sbm-input.sbm-format-currency', function () { sbm.formatCurrency($(this)); });
env.$ctrl.saleTaxCode = env.$frm.item.find('.sbm-select.CommoditySalesTaxCode');
env.$ctrl.saleUomCat = env.$frm.item.find('.sbm-select.CommoditySalesUnitCategory');
env.$ctrl.saleUomTyp = env.$frm.item.find('.sbm-select.CommoditySalesUnitType');
env.$ctrl.saleTaxCode = env.$frm.item.find('.sbm-select.CommoditySaleTaxCode');
env.$ctrl.saleUomCat = env.$frm.item.find('.sbm-select.CommoditySaleUnitCat');
env.$ctrl.saleUomTyp = env.$frm.item.find('.sbm-select.CommoditySaleUnitType');
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Commodity";
opt.buttons[sbm.lbl.ok] = function () { co.selectItem(env); };
opt.buttons[sbm.lbl.cancel] = function () { delete env.prmSelect; $(this).dialog('close'); };
env.$dlg.select = $items.find('#dlgCommoditySelect').dialog(opt);
env.$dlg.select = $('#dlgCommoditySelect').dialog(opt);
return env;
}
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cod-typ.js
+1 -1
View File
@@ -22,7 +22,7 @@
}
ct.handleCodeTypes = function (env, response)
{
sbm.debug('handleCodeTypes', response);
//sbm.debug('handleCodeTypes', response);
delete ct.awaitingRefreshResponse;
let $table = $('table', env.$pnl.table).find('tbody tr').remove().end();
env.$pnl.msgs.hide().empty();
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-main.js
+5 -5
View File
@@ -169,13 +169,13 @@
sbm.populateItemValues = function (cfg, $item, val)
{
//sbm.debug('populateItemValues', cfg, $item, val);
for (var name in val || []) { $item.find('.' + cfg.column.prefix + name).text(val[name]); };
for (var name in val || {}) { $item.find('.' + cfg.column.prefix + name).text(val[name]); };
}
sbm.clearItemForm = function ($frm)
{
sbm.clearControlErrors($frm);
$frm.find('.sbm-input,.sbm-textarea,.sbm-select').val('').prop('readonly', false).prop('disabled', false);
$frm.find('.sbm-checkbox').prop('readonly', false).prop('disabled', false).removeAttr('checked');
$frm.find('.sbm-input,.sbm-textarea,.sbm-select').val('').filter('.sbm-auto-val').prop('readonly', false).prop('disabled', false);
$frm.find('.sbm-checkbox').removeAttr('checked').filter('.sbm-auto-val').prop('readonly', false).prop('disabled', false);
}
sbm.configureItemControls = function (cfg, $frm)
{
@@ -189,8 +189,8 @@
sbm.populateFormValues = function (cfg, $frm, val)
{
//sbm.debug('populateFormValues', cfg, $frm, val);
let $ctrl = $('.sbm-form-control', $frm);
for (var name in val || {}) { $ctrl.filter('.' + cfg.field.prefix + name).find('.sbm-input,.sbm-textarea,.sbm-select').filter('.sbm-auto-val').val(val[name]).end().find('.sbm-checkbox').prop('checked', !!val[name]); };
let $ctrl = $frm.find('.sbm-input,.sbm-textarea,.sbm-select,.sbm-checkbox').filter('.sbm-auto-val');
for (var name in val || {}) { $ctrl.filter('.' + cfg.field.prefix + name).val(val[name]).filter('.sbm-checkbox').prop('checked', !!val[name]); };
}
sbm.formatInteger = function ($ctrl)
{
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-req.js
+82 -29
View File
@@ -26,8 +26,7 @@
env.$pnl.table.find('tbody tr').remove();
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
}
env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Requirement/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { re.doRefreshResults(env, response); } };
sbm.doAjaxRequest(env.ajax.refreshResults, delay || 50);
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Requirement/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { re.doRefreshResults(env, response); } }, delay || 50);
re.awaitingRefreshResponse = true;
}
re.doRefreshResults = function (env, response)
@@ -126,8 +125,9 @@
{
re.clearItem(env, cfg);
let $frm = env.$frm.item;
$frm.find('.RequirementType').val(env.data.requirementTypeDefault);
$frm.find('.RequirementStatus').val(env.data.defaultStatusCode);
$frm.find('.ReqntType').val(env.data.requirementTypeDefault);
$frm.find('.ReqntTaxEffective').val(env.$frm.filter.find('.FilterTaxEffective').val());
$frm.find('.ReqntStatus').val(env.data.defaultStatusCode);
re.openItemDlg(env, cfg, sbm.dlg.title.createRequirement);
}
re.clearItem = function (env, cfg)
@@ -143,6 +143,12 @@
{
let $dlg = env.$dlg.item;
let $frm = env.$frm.item;
let fnSelCmd = function () { re.selectCommodity(env); };
$frm.find('.ReqntTransactionId').val(env.$frm.filter.find('.FilterTransactionId').val());
$frm.find('.ReqntTransactionType').val(env.$frm.filter.find('.FilterTransactionType').val());
$frm.find('.ReqntCommodity').off('dblclick').on('dblclick', fnSelCmd);
$frm.find('.ReqntCommoditySearch').off('click').on('click', fnSelCmd);
$frm.find('.ReqntQuantity').off('input').on('input', function () { re.calculate(env, 500); });
env.$ctrl.saleTaxCode.off('change').on('change', function () { re.onTaxCodeSelected(env); });
env.$ctrl.uomCat.off('change').on('change', function () { re.onUomCatSelected(env); })
env.$ctrl.uomTyp.off('change').on('change', function () { re.onUomSelected(env); });
@@ -161,12 +167,11 @@
let $frm = env.$frm.itemId;
$('.RequirementId', $frm).val(id);
$('.RequirementDataGroups', $frm).val('Sales');
env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Requirement/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { re.onUpdateItem(env, response); } };
sbm.doAjaxRequest(env.ajax.updateItem, 50);
sbm.doAjaxRequest(env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Requirement/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { re.onUpdateItem(env, response); } }, 50);
}
re.onUpdateItem = function (env, response)
{
sbm.debug('onUpdateItem', env, response);
//sbm.debug('onUpdateItem', env, response);
if (!response.success) return;
let cfg = response.config || {};
re.clearItem(env, cfg);
@@ -174,8 +179,10 @@
let $frm = env.$frm.item;
sbm.populateFormValues(cfg, $frm, item.field.value);
let $ctrls = $frm.find('.sbm-input,.sbm-textarea,.sbm-select');
$ctrls.filter('.RequirementId').val(item.id);
$ctrls.filter('.RequirementExists').val(1);
$ctrls.filter('.ReqntId').val(item.id);
$ctrls.filter('.ReqntExists').val(1);
env.$ctrl.commmodityId.val(item.commodityId);
env.$ctrl.commmodity.val(item.commodityCaption);
sbm.selectOrAdd($ctrls.filter('.RequirementType'), item.typeCode, item.typeDesc);
re.populateUomType(env, item.unitType);
sbm.selectOrAdd($ctrls.filter('.RequirementStatus'), item.statusCode, item.field.value.Status);
@@ -183,14 +190,51 @@
}
//--------------------------------------------------------------
re.selectCommodity = function (env)
{
//sbm.debug('selectCommodity');
sbm.fn.selectCommodity({ fnSuccess: function (item) { re.onCommoditySelected(env, item); } });
}
re.onCommoditySelected = function (env, item)
{
//sbm.debug('onCommoditySelected', item)
let $frm = env.$frm.item;
env.$ctrl.commmodityId.val(item.id);
env.$ctrl.commmodity.val(item.caption);
env.$ctrl.desc.val(item.caption);
let fn = function (env, response)
{
//sbm.debug('Commodity response', response);
if (!response.success) return;
sbm.populateFormValues(response.config, $frm, response.requirement.field.value);
re.calculate(env);
}
sbm.doAjaxRequest(env.ajax.commodity = env.ajax.commodity || { url: sbm.url.base + 'Requirement/Ajax/Commodity', formSel: $frm, callbackFn: function (response) { fn(env, response); } }, 50);
}
re.onTaxCodeSelected = function (env)
{
re.calculate(env);
}
re.calculate = function (env, delay)
{
//sbm.debug('calculate');
let $frm = env.$frm.item;
let fn = function (env, response)
{
//sbm.debug('Calculate response', response);
if (!response.success) return;
sbm.populateFormValues(response.config, $frm, response.requirement.field.value);
}
sbm.doAjaxRequest(env.ajax.calculate = env.ajax.calculate || { url: sbm.url.base + 'Requirement/Ajax/Calculate', formSel: $frm, callbackFn: function (response) { fn(env, response); } }, delay || 50);
}
//--------------------------------------------------------------
re.onUomCatSelected = function (env)
{
//sbm.debug('onUomCatSelected', env);
//sbm.debug('onUomCatSelected', env.$ctrl.uomCat.val());
let $uomCat = env.$ctrl.uomCat;
let $uomTyp = env.$ctrl.uomTyp;
let uomCat = $uomCat.val();
@@ -206,20 +250,16 @@
let $uomTyp = env.$ctrl.uomTyp;
let uom = env.data.uoms.find(function (uom) { return uom.type == type; });
if (!uom) return;
$uomCat.val(uom.category).trigger('change');
$uomCat.val(uom.category);
re.onUomCatSelected(env);
$uomTyp.val(uom.type);
}
re.onUomSelected = function (env)
{
let $uomCat = env.$ctrl.uomCat;
let $uomTyp = env.$ctrl.uomTyp;
}
re.onUomSelected = function (env) { }
//--------------------------------------------------------------
re.storeItem = function (env)
{
env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Requirement/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { re.onStoreItem(env, response); } };
sbm.doAjaxRequest(env.ajax.storeItem, 50);
sbm.doAjaxRequest(env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Requirement/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { re.onStoreItem(env, response); } }, 50);
}
re.onStoreItem = function (env, response)
{
@@ -243,12 +283,14 @@
}
re.populateItem(env, $item, item);
sbm.configureItemTable(env.data.cfgList, env.$pnl.table);
setTimeout(function () { re.refreshResults(env); }, 50);
}
}
//--------------------------------------------------------------
sbm.fn.maintainRequirements = function (prm)
{
//sbm.debug('maintainRequirements', prm);
let env = re.env.select;
env.prmList = prm;
prm.mode = 'Maintain';
@@ -261,13 +303,15 @@
prm.mode = 'Search';
re.showRequirements(env, prm);
}
/* Params: transId, search, fnSuccess. */
/* Params: transId, transType, search, fnSuccess. */
re.showRequirements = function (env, prm)
{
//sbm.debug('showRequirements', env, prm, env.$frm.filter.find('.FilterMode'));
if (!env.$pnl.items.length) return;
env.$frm.filter.find('.FilterMode').val(prm.mode || null);
env.$frm.filter.find('.FilterTransactionId').val(prm.transId);
env.$frm.filter.find('.FilterTransactionType').val(prm.transType);
env.$frm.filter.find('.FilterTaxEffective').val(prm.taxEffective);
env.$frm.filter.find('.FilterSearch').val(prm.search || '');
env.$pnl.table.find('tbody tr').remove();
sbm.openDialog(env.$dlg.select, 1160, 800);
@@ -284,7 +328,8 @@
{
//sbm.debug('selectItem', env, env.prmSelect.item);
env.$dlg.select.dialog('close');
env.prmSelect.fnSuccess(env.prmSelect.item);
if ((env.prmList || {}).fnSuccess) env.prmList.fnSuccess(env.prmList.item);
else if ((env.prmSelect || {}).fnSuccess) env.prmSelect.fnSuccess(env.prmSelect.item);
delete env.prmSelect;
}
@@ -326,16 +371,24 @@
env.$frm.item = env.$dlg.item.find('#frmRequirement').off('input').on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).off('change').on('change', '.sbm-select', function () { sbm.clearControlError(this); });
env.$frm.item.off('blur').on('blur', '.sbm-input.sbm-format-integer', function () { sbm.formatInteger($(this)); }).off('blur').on('blur', '.sbm-input.sbm-format-currency', function () { sbm.formatCurrency($(this)); });
sbm.initCalendars(env.$frm.item.find('.sbm-input.sbm-calendar'), {});
env.$ctrl.saleTaxCode = env.$frm.item.find('.sbm-select.ReqntTaxCode');
env.$ctrl.uomCat = env.$frm.item.find('.sbm-select.ReqntUnitCategory');
env.$ctrl.uomTyp = env.$frm.item.find('.sbm-select.ReqntUnitType');
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Requirement";
opt.buttons[sbm.lbl.ok] = function () { re.selectItem(env); };
opt.buttons[sbm.lbl.cancel] = function () { delete env.prmSelect; $(this).dialog('close'); };
env.$dlg.select = $('#dlgRequirementSelect').dialog(opt);
let $ctrls = env.$frm.item.find('.sbm-input,.sbm-textarea,.sbm-select');
env.$ctrl.commmodityId = $ctrls.filter('.ReqntCommodityId');
env.$ctrl.commmodity = $ctrls.filter('.ReqntCommodity');
env.$ctrl.desc = $ctrls.filter('.ReqntDescBrief');
env.$ctrl.saleTaxCode = $ctrls.filter('.ReqntTaxCode');
env.$ctrl.uomCat = $ctrls.filter('.ReqntUnitCategory');
env.$ctrl.uomTyp = $ctrls.filter('.ReqntUnitType');
let $dlgSelect = $('#dlgRequirementSelect');
if ($dlgSelect.length)
{
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Requirement";
opt.buttons[sbm.lbl.ok] = function () { re.selectItem(env); };
opt.buttons[sbm.lbl.cancel] = function () { delete env.prmSelect; $(this).dialog('close'); };
env.$dlg.select = $dlgSelect.dialog(opt);
env.$dlg.select.parent().find('.ui-dialog-titlebar').empty().append(env.$pnl.tmpl.find('.sbm-panel-header').remove());
}
return env;
}
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-trn.js
+7 -7
View File
@@ -131,7 +131,7 @@
tr.clearItem(env, cfg);
let $frm = env.$frm.item;
env.$ctrl.trnType.val(env.$frm.filter.find('.sbm-input.FilterType').val());
env.$ctrl.searchTgtAssoc.show();
env.$ctrl.searchAssoc.show();
env.$ctrl.trnStatus.val(env.data.defaultStatusCode);
tr.onChangeStatus(env);
env.$ctrl.trnRaised.datepicker('setDate', 'today');
@@ -147,7 +147,7 @@
let $dlg = env.$dlg.item;
let $frm = env.$frm.item;
$frm.find('.TransactionAssociation').off('dblclick').on('dblclick', function () { tr.selectAssocTarget(env); });
env.$ctrl.searchTgtAssoc.off('click').on('click', function () { tr.selectAssocTarget(env); });
env.$ctrl.searchAssoc.off('click').on('click', function () { tr.selectAssocTarget(env); });
env.$ctrl.trnStatus.off('change').on('change', function () { tr.onChangeStatus(env); });
env.$ctrl.clearRequired.off('click').on('click', function () { env.$ctrl.trnRequired.val(''); });
sbm.configureItemControls(cfg, $frm);
@@ -181,7 +181,7 @@
$ctrls.filter('.TransactionExists').val(1);
$ctrls.filter('.TransactionType').val(item.typeCode);
$ctrls.filter('.TransactionAssociationId').val(item.field.value.AssociationId);
env.$ctrl.searchTgtAssoc.hide();
env.$ctrl.searchAssoc.hide();
sbm.selectOrAdd(env.$ctrl.trnStatus, item.statusCode, item.field.value.Status);
tr.onChangeStatus(env);
tr.openItemDlg(env, cfg, sbm.dlg.title.updateTransaction);
@@ -245,12 +245,12 @@
//--------------------------------------------------------------
tr.showRequirements = function (env, item)
{
//sbm.debug('showRequirements');
//sbm.debug('showRequirements', item);
let fn = function (env, item)
{
sbm.debug('showRequirementsmaintainRequirementsDone', item);
//sbm.debug('showRequirementsmaintainRequirementsDone', item);
}
sbm.fn.maintainRequirements({ transId: item.id, successFn: function (item) { fn(env, item); } });
sbm.fn.maintainRequirements({ transId: item.id, transType: item.typeCode, taxEffective: item.taxEffective, fnSuccess: function (item) { fn(env, item); } });
}
//--------------------------------------------------------------
@@ -323,7 +323,7 @@
{
env.$frm.item.off('blur').on('blur', '.sbm-input.sbm-format-integer', function () { sbm.formatInteger($(this)); }).off('blur').on('blur', '.sbm-input.sbm-format-currency', function () { sbm.formatCurrency($(this)); });
env.$ctrl.trnType = env.$frm.item.find('.sbm-input.TransactionType');
env.$ctrl.searchTgtAssoc = env.$frm.item.find('.AssociationTargetSearch');
env.$ctrl.searchAssoc = env.$frm.item.find('.TransactionAssociationSearch');
env.$ctrl.trnStatus = env.$frm.item.find('.sbm-select.TransactionStatus');
sbm.initCalendars(env.$frm.item.find('.sbm-input.sbm-calendar'), {});
env.$ctrl.trnRaised = env.$frm.item.find('.sbm-input.TransactionRaised');