Contacts

SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-data.css

@@ -128,13 +128,15 @@
 .sbm-panel-data .sbm-panel-header .sbm-results-paging .sbm-action
 {
 	margin: 2px 1px 0 1px;
-	background-color: #b0b0b0;
+	background-color: #e0e0e0;
+	opacity: 50%;
 	box-shadow: 0 0 0 1px #40404080 inset;
+	border-radius: 6px;
 }
 
 .sbm-panel-data .sbm-panel-header .sbm-results-paging .sbm-action:hover
 {
-	background-color: #c0c0c0;
+	opacity: 80%;
 }
 
 /* Panel header - Burger */
@@ -467,22 +469,27 @@ table.sbm-item-list tbody td
 
 /* Item statuses */
 
-.sbm-status-awa
+.sbm-status-awa, .sbm-status-req, .sbm-status-rai, .sbm-status-clo
 {
 	color: darkorange;
 }
 
-.sbm-status-atv, .sbm-status-cur
+.sbm-status-atv, .sbm-status-ena, .sbm-status-cur, .sbm-status-rei, .sbm-status-ope, .sbm-status-con, .sbm-status-com, .sbm-status-acc, .sbm-status-gra
 {
 	color: green;
 }
 
-.sbm-status-ina
+.sbm-status-ina, .sbm-status-dis, .sbm-status-dsc, .sbm-status-red, .sbm-status-can, .sbm-status-fai, .sbm-status-rej, .sbm-status-den
 {
 	color: darkred;
 }
 
-.sbm-status-hld
+.sbm-status-inp, .sbm-status-exp, .sbm-status-inv, .sbm-status-suc, .sbm-status-act, .sbm-status-que, .sbm-status-log
+{
+	color: darkcyan;
+}
+
+.sbm-status-pre, .sbm-status-pro, .sbm-status-inp, .sbm-status-hld, .sbm-status-upd, .sbm-status-sup, .sbm-status-aut, .sbm-status-sub
 {
 	color: dodgerblue;
 }

SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-main.css

@@ -62,7 +62,7 @@ body
 	body.sbm-layout-flex #sbm-page-body
 	{
 		flex: 1;
-		min-height:0;
+		min-height: 0;
 	}
 }
 
@@ -142,7 +142,7 @@ button.accept-policy
 
 #sbm-page-footer
 {
-	margin: 4px 0;
+	padding: 4px 0;
 }
 
 #sbm-page-footer, #sbm-page-footer div
@@ -249,10 +249,9 @@ a:focus
 {
 	display: none;
 	position: fixed;
-	top: 0;
-	right: 0;
 	min-width: 180px;
-	margin-right: 12px;
+	margin-top: 6px;
+	margin-right: 48px;
 	z-index: 1000;
 	border: 1px solid #808080;
 	border-bottom-left-radius: 4px;
@@ -390,10 +389,14 @@ a:focus
 .ui-dialog .ui-dialog-buttonpane
 {
 	border-color: #d4af37;
+	margin-top: .25em;
+	padding: .2em 1em .2em .5em;
 }
 
 .ui-dialog .ui-dialog-buttonpane button
 {
+	min-width: 80px;
+	margin: .5em .25em .5em .5em;
 	color: #fff;
 	background-color: #d4af37;
 	border-color: #d4af37;

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-asset-cat.js

@@ -14,7 +14,7 @@
 	{
 		if (!ac.awaitingRefreshResponse)
 		{
-			$('.sbm-burger', $pnl.header).invisible();
+			$pnl.bgr.invisible();
 			$pnl.table.find('tbody tr').remove();
 			$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
 		}
@@ -31,23 +31,24 @@
 		sbm.refreshPaging(response, '#frmAssetCategoryFilter', ac.refreshResults);
 		if (!response.success) return;
 
-		// Reference data - Statuses.
+		// Reference data.
 		if (response.statuses) sbm.data.statuses = response.statuses;
 		if (response.statusesCreate) sbm.data.statusesCreate = response.statusesCreate;
 		if (response.statusCodeDefault) sbm.data.statusCodeDefault = response.statusCodeDefault;
 
 		// Menu.
-		var $bgr = $('.sbm-burger', $pnl.header).invisible();
-		var $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
-		$mnu.append(ac.getFilterMenuOption(sbm.lbl.refresh, function () { ac.refreshResults(); }, 'sbm-refresh'));
-		$mnu.append(ac.getFilterMenuOption(sbm.lbl.create, function () { ac.createItem(); }, 'sbm-add'));
-		$bgr.toggleVisibility(!!$('.sbm-dropdown-item', $mnu).length);
+		$pnl.bgr.invisible();
+		$pnl.mnu.empty();
+		$pnl.mnu.append(ac.getFilterMenuOption(sbm.lbl.refresh, function () { ac.refreshResults(); }, 'sbm-refresh'));
+		$pnl.mnu.append(ac.getFilterMenuOption(sbm.lbl.create, function () { ac.createItem(); }, 'sbm-add'));
+		$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', $pnl.mnu).length);
+
 		// Items.
 		var items = response.assetCategories || [];
 		if (!items.length)
 			return $pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-			$table.append(ac.populateItem(ac.getItemRowTemplate(), items[itemIdx]));
+			$table.append(ac.populateItem(ac.getItemTemplate(), items[itemIdx]));
 	}
 	ac.populateItem = function ($item, item)
 	{
@@ -57,7 +58,7 @@
 		$('.AssetCategoryType', $item).text(item.typeDesc);
 		$('.AssetCategoryCode', $item).text(item.code);
 		$('.AssetCategoryDescription', $item).text(item.descBrief);
-		$('.AssetCategoryStatusDesc', $item).text(item.statusDesc).removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); }).addClass('sbm-status-' + item.statusCode.toLowerCase());
+		$('.AssetCategoryStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
 		// Actions.
 		let fnUpd = function () { ac.updateItem($item, item) };
 		var $bgr = $('.sbm-burger', $item).invisible();
@@ -81,7 +82,7 @@
 	{
 		return $('.sbm-dropdown-menu.AssetCategoryFilter li.sbm-dropdown-item', $pnl.tmpls).clone();
 	}
-	ac.getItemRowTemplate = function ()
+	ac.getItemTemplate = function ()
 	{
 		return $('table tr.sbm-row-item.AssetCategory', $pnl.tmpls).clone();
 	}
@@ -89,6 +90,8 @@
 	{
 		return $('.sbm-dropdown-menu.AssetCategory li.sbm-dropdown-item', $pnl.tmpls).clone();
 	}
+
+	//--------------------------------------------------------------
 	ac.getFilterMenuOption = function (lbl, fn, cls)
 	{
 		return ac.getMenuOption(ac.getFilterDropdownTemplate(), lbl, fn, cls);
@@ -165,15 +168,13 @@
 		$dlg.item.dialog('close');
 
 		var item = response.assetCategory;
-		var $item = $('#' + ac.getItemId(item));
+		var $item = $('#' + ac.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
-			$item = ac.getItemRowTemplate();
+			$item = ac.getItemTemplate();
 			$('table tbody', $pnl.table).prepend($item).show();
 		}
 		ac.populateItem($item, item);
-		// Force repopulation of sprts.
-		delete ac.data.assetCategories;
 	}
 
 	//--------------------------------------------------------------
@@ -181,9 +182,11 @@
 	{
 		$pnl.items = $('.sbm-panel.AssetCategories');
 		$pnl.header = $('.sbm-panel-header', $pnl.items);
+		$pnl.bgr = $('.sbm-burger', $pnl.header);
+		$pnl.mnu = $('ul.sbm-dropdown-menu', $pnl.bgr);
 		$pnl.filter = $('.sbm-panel-filter', $pnl.items);
-		$pnl.msgs = $('.sbm-panel-messages', $pnl.items);
 		$pnl.table = $('.sbm-panel-item-table', $pnl.items);
+		$pnl.msgs = $('.sbm-panel-messages', $pnl.items);
 		$pnl.tmpls = $('.sbm-panel-item-template', $pnl.items);
 
 		$frm.filter = $('#frmAssetCategoryFilter');

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-asset.js

@@ -57,7 +57,7 @@
 		$('.AssetCategory', $item).text(item.categoryDesc);
 		$('.AssetSerial', $item).text(item.serialNumber);
 		$('.AssetDescription', $item).text(item.descBrief);
-		$('.AssetStatusDesc', $item).text(item.statusDesc).removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); }).addClass('sbm-status-' + item.statusCode.toLowerCase());
+		$('.AssetStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
 		// Actions.
 		let fnUpd = function () { ac.updateItem($item, item) };
 		var $bgr = $('.sbm-burger', $item).invisible();
@@ -187,7 +187,7 @@
 		$dlg.item.dialog('close');
 
 		var item = response.asset;
-		var $item = $('#' + ac.getItemId(item));
+		var $item = $('#' + ac.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
 			$item = ac.getItemRowTemplate();

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-assoc.js

@@ -0,0 +1,211 @@
+/*
+ * Association page scripts.
+ */
+
+(function (win, doc, undef)
+{
+	"use strict";
+	let as = sbm.Associations = { data: {}, ajax: {} };
+	let $pnl = as.$pnl = {}, $frm = as.$frm = {}, $dlg = as.$dlg = {};
+
+	//--------------------------------------------------------------
+	as.refreshResults = function (delay)
+	{
+		if (!sbm.awaitingRefreshResponse)
+		{
+			$pnl.bgr.invisible();
+			$pnl.table.find('tbody tr').remove();
+			$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
+		}
+		as.ajax.refreshResults = as.ajax.refreshResults || { url: sbm.url.base + 'Association/Ajax/List', formId: $frm.filter.prop('id'), callbackFn: as.doRefreshResults };
+		sbm.doAjaxRequest(as.ajax.refreshResults, delay || 50);
+		sbm.awaitingRefreshResponse = true;
+	}
+	as.doRefreshResults = function (response)
+	{
+		sbm.debug('doRefreshResults', response);
+		delete sbm.awaitingRefreshResponse;
+		$pnl.msgs.hide().empty();
+		let $table = $('table', $pnl.table).find('tbody tr').remove().end();
+		sbm.refreshPaging(response, '#frmAssociationFilter', as.refreshResults);
+		if (!response.success) return;
+
+		// Reference data.
+		as.data.associationTypes = response.associationTypes;
+		as.data.statuses = response.statuses;
+		as.data.defaultStatusCode = response.defaultStatusCode;
+
+		// Menu.
+		$pnl.bgr.invisible();
+		$pnl.mnu.empty();
+		$pnl.mnu.append(as.getFilterMenuOption(sbm.lbl.refresh, function () { as.refreshResults(); }, 'sbm-refresh'));
+		$pnl.mnu.append(as.getFilterMenuOption(sbm.lbl.create, function () { as.createItem(); }, 'sbm-add'));
+		$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', $pnl.mnu).length);
+		// Items.
+		var items = response.associations || [];
+		if (!items.length)
+			return $pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
+		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
+			$table.append(as.populateItem(as.getItemTemplate(), items[itemIdx]));
+	}
+	as.populateItem = function ($item, item)
+	{
+		if (!item) return;
+		$pnl.msgs.hide().empty();
+		$item.prop('id', as.getItemId(item));
+		$('.AssociationCode', $item).text(item.code);
+		$('.AssociationTargetName', $item).text(item.targetName);
+		$('.AssociationType', $item).text(item.typeDesc);
+		$('.AssociationAddress', $item).text(item.addressSummary);
+		$('.AssociationNotes', $item).text(item.notes);
+		$('.AssociationStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
+		// Actions.
+		var $bgr = $('.sbm-burger', $item).hide();
+		let $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
+		if (!item.deleted)
+		{
+			let fnUpd = function () { as.updateItem(item) };
+			$mnu.append(as.getItemMenuOption(sbm.lbl.edit, fnUpd, 'sbm-edit'));
+			$('.AssociationTargetName', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
+			$item.off('dblclick').on('dblclick', fnUpd);
+		}
+		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
+		return $item;
+	}
+	as.getItemId = function (item)
+	{
+		return 'Ass_' + (item || {}).id;
+	}
+
+	//--------------------------------------------------------------
+	as.getFilterDropdownTemplate = function ()
+	{
+		return $('.sbm-dropdown-menu.AssociationList li.sbm-dropdown-item', $pnl.tmpls).clone();
+	}
+	as.getItemTemplate = function ()
+	{
+		return $('table tr.sbm-row-item.Association', $pnl.tmpls).clone();
+	}
+	as.getItemDropdownTemplate = function ()
+	{
+		return $('.sbm-dropdown-menu.Association li.sbm-dropdown-item', $pnl.tmpls).clone();
+	}
+
+	//--------------------------------------------------------------
+	as.getFilterMenuOption = function (lbl, fn, cls)
+	{
+		return as.getMenuOption(as.getFilterDropdownTemplate(), lbl, fn, cls);
+	}
+	as.getItemMenuOption = function (lbl, fn, cls)
+	{
+		return as.getMenuOption(as.getItemDropdownTemplate(), lbl, fn, cls);
+	}
+	as.getMenuOption = function ($opt, lbl, fn, cls)
+	{
+		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn).addClass(cls);
+	}
+
+	//--------------------------------------------------------------
+	as.createItem = function ()
+	{
+		as.clearItem();
+		let $ctrls = $('.sbm-input,.sbm-textarea,.sbm-select', $frm.item);
+		$ctrls.filter('.AssociationType').val('').prop('disabled', false);
+		$ctrls.filter('.AssociationStatus').val(as.data.defaultStatusCode);
+		$dlg.item.dialog('option', 'title', sbm.dlg.title.createAssociation);
+		as.openItemDlg();
+	}
+	as.clearItem = function ()
+	{
+		sbm.clearControlErrors($frm.item);
+		$('.sbm-input,.sbm-textarea,.sbm-select', $frm.item).val('');
+		sbm.populateSelectCodeDesc('#cbAssociationType', as.data.associationTypes);
+		sbm.populateSelectCodeDesc('#cbAssociationStatus', as.data.statuses);
+	}
+	as.openItemDlg = function ()
+	{
+		sbm.openDialog($dlg.item, 600, 640);
+	}
+
+	//--------------------------------------------------------------
+	as.updateItem = function (item)
+	{
+		$('.AssociationId', $frm.itemId).val(item.id);
+		as.ajax.updateItem = as.ajax.updateItem || { url: sbm.url.base + 'Association/Ajax/GetItem', formId: 'frmAssociationId', callbackFn: as.onUpdateItem };
+		sbm.doAjaxRequest(as.ajax.updateItem, 50);
+	}
+	as.onUpdateItem = function (response)
+	{
+		//sbm.debug('onUpdateItem', response);
+		as.clearItem();
+		if (!response.success) return;
+		let item = response.association;
+		let $ctrls = $('.sbm-input,.sbm-textarea,.sbm-select', $frm.item);
+		$ctrls.filter('.AssociationId').val(item.id);
+		$ctrls.filter('.AssociationExists').val(1);
+		let $ctrlType = $ctrls.filter('.AssociationType');
+		sbm.selectOrAdd($ctrlType, item.typeCode, item.typeDesc)
+		if ($ctrlType.val()) $ctrlType.prop('disabled', true);
+		$ctrls.filter('.AssociationTargetId').val(item.targetId);
+		$ctrls.filter('.AssociationTarget').val(item.targetName);
+		$ctrls.filter('.AssociationCode').val(item.code);
+		$ctrls.filter('.AssociationDesc').val(item.desc);
+		$ctrls.filter('.AssociationNotes').val(item.notes);
+		sbm.selectOrAdd($ctrls.filter('.AssociationStatus'), item.statusCode, item.statusDesc)
+		$dlg.item.dialog('option', 'title', sbm.dlg.title.updateAssociation);
+		as.openItemDlg();
+	}
+
+	//--------------------------------------------------------------
+	as.storeItem = function ()
+	{
+		as.ajax.storeItem = as.ajax.storeItem || { url: sbm.url.base + 'Association/Ajax/StoreItem', formId: 'frmAssociation', callbackFn: as.onStoreItem };
+		sbm.doAjaxRequest(as.ajax.storeItem, 50);
+	}
+	as.onStoreItem = function (response)
+	{
+		//sbm.debug('onStoreItem', response);
+		sbm.refreshControlValues(response.controlValues);
+		if (!response.success) return;
+		$dlg.item.dialog('close');
+
+		var item = response.association;
+		var $item = $('#' + as.getItemId(item), $pnl.table);
+		if (!$item.length)
+		{
+			$item = as.getItemTemplate();
+			$('table tbody', $pnl.table).prepend($item).show();
+		}
+		as.populateItem($item, item);
+	}
+
+	//--------------------------------------------------------------
+	$(function ()
+	{
+		$pnl.items = $('.sbm-panel.Associations');
+		$pnl.header = $('.sbm-panel-header', $pnl.items);
+		$pnl.bgr = $('.sbm-burger', $pnl.header);
+		$pnl.mnu = $('ul.sbm-dropdown-menu', $pnl.bgr);
+		$pnl.table = $('.sbm-panel-item-table', $pnl.items);
+		$pnl.msgs = $('.sbm-panel-messages', $pnl.table);
+		$pnl.tmpls = $('.sbm-panel-item-template', $pnl.items);
+
+		$frm.filter = $('#frmAssociationFilter');
+		$frm.filter.on('input', '.FilterSearch', function () { as.refreshResults(250); }).on('change', '.FilterAssociationType', function () { as.refreshResults(50); });
+
+
+		$frm.itemId = $('#frmAssociationId');
+		$frm.item = $('#frmAssociation');
+		$frm.item.on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).on('change', '.sbm-select', function () { sbm.clearControlError(this); });
+
+		var opt = sbm.dlgOpts();
+		opt.buttons[sbm.lbl.ok] = function () { as.storeItem(); };
+		opt.buttons[sbm.lbl.cancel] = function () { $(this).dialog('close'); };
+		$dlg.item = $('#dlgAssociation').dialog(opt);
+
+		setTimeout(as.refreshResults, 250);
+	});
+
+}(window, window.document));
+
+/* The End */

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-association.js

@@ -1,189 +0,0 @@
-/*
- * Association page scripts.
- */
-
-(function (win, doc, undef)
-{
-	"use strict";
-	sbm.itemIdPrefix = 'Itm_';
-	let $pnl = sbm.$pnl;
-	let $frm = sbm.$frm;
-	let $dlg = sbm.$dlg;
-
-	//--------------------------------------------------------------
-	sbm.refreshResults = function (delay)
-	{
-		if (!sbm.awaitingRefreshResponse)
-		{
-			$('.sbm-burger', $pnl.filter).hide();
-			$('.sbm-panel-item-list', $pnl.results).fadeOut(200).empty();
-			$('.sbm-panel-messages', $pnl.results).hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
-		}
-		sbm.ajax.refreshResults = sbm.ajax.refreshResults || { url: sbm.url.base + 'Association/Ajax/List', formId: 'frmAssociationFilter', callbackFn: sbm.doRefreshResults };
-		sbm.doAjaxRequest(sbm.ajax.refreshResults, delay || 50);
-		sbm.awaitingRefreshResponse = true;
-	}
-	sbm.doRefreshResults = function (response)
-	{
-		//sbm.debug('doRefreshResults', response);
-		delete sbm.awaitingRefreshResponse;
-		sbm.refreshControlValues(response.controlValues);
-		var $msgs = $('.sbm-panel-messages', $pnl.results).hide().empty();
-		var $items = $('.sbm-panel-item-list', $pnl.results).hide().empty();
-		sbm.refreshPaging(response, '#frmAssociationFilter', sbm.refreshResults);
-		if (!response.success) return;
-		// Reference data - Statuses.
-		if (response.defaultStatusCode) sbm.data.defaultStatusCode = response.defaultStatusCode;
-		if (response.statuses)
-			sbm.populateSelectCodeDesc('#cbAssociationStatus', response.statuses);
-		// Menu.
-		var $bgr = $('.sbm-burger', $pnl.filter).hide();
-		var $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.refresh, function () { sbm.refreshResults(); }));
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.create, function () { sbm.createItem(); }));
-		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
-		// Items.
-		var items = response.associations;
-		if (!items.length)
-			return $msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
-		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-			$items.append(sbm.populateItem(sbm.getItemTemplate(), items[itemIdx]));
-		$items.fadeIn(50);
-	}
-	sbm.populateItem = function ($item, item)
-	{
-		if (!item) return;
-		$item.prop('id', sbm.itemIdPrefix + item.id);
-		$('.AssociationCode', $item).text(item.code);
-		$('.AssociationTargetName', $item).text(item.targetName);
-		$('.AssociationType', $item).text(item.typeDesc);
-		//$('.AssociationTransactionCount', $item).on('click', function () { sbm.onClickTransactionCount(item.id); }).toggle(item.associationCount).find('.TransactionCount').text(item.associationCount);
-		$('.AssociationAddress', $item).text(item.addressSummary);
-		$('.AssociationNotes', $item).text(item.notes);
-		$('.StatusDesc', $item).text(item.statusDesc).addClass('sbm-status-' + item.statusCode.toLowerCase());
-		$('.sbm-caption .sbm-action').toggleClass('sbm-action', !item.deleted);
-		let $mnu = $('ul.sbm-dropdown-menu', $item);
-		if (!item.deleted)
-		{
-			$mnu.append(sbm.getItemMenuOption(sbm.lbl.edit, function () { sbm.updateItem(item.id) }));
-			$('.sbm-header .sbm-action.sbm-item-update', $item).off('click').on('click', function () { sbm.updateItem(item.id) });
-			$item.off('dblclick').on('dblclick', function () { sbm.updateItem(item.id) });
-		}
-		$('.sbm-burger', $item).toggle(!!$('.sbm-dropdown-item', $mnu).length);
-		$('.sbm-panel-messages', $pnl.results).hide().empty();
-		return $item;
-	}
-
-	//--------------------------------------------------------------
-	sbm.getFilterDropdownTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.AssociationFilter li.sbm-dropdown-item', $pnl.filter).clone();
-	}
-	sbm.getItemTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-panel-item.Association', $pnl.results).clone();
-	}
-	sbm.getItemDropdownTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.Association li.sbm-dropdown-item', $pnl.results).clone();
-	}
-	sbm.getFilterMenuOption = function (lbl, fn)
-	{
-		return sbm.getMenuOption(sbm.getFilterDropdownTemplate(), lbl, fn);
-	}
-	sbm.getItemMenuOption = function (lbl, fn)
-	{
-		return sbm.getMenuOption(sbm.getItemDropdownTemplate(), lbl, fn);
-	}
-	sbm.getMenuOption = function ($opt, lbl, fn)
-	{
-		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn);
-	}
-
-	//--------------------------------------------------------------
-	sbm.createItem = function ()
-	{
-		let frm = $frm.association;
-		$('.AssociationId,.AssociationExists,input[type="text"],textarea,select', frm).val('');
-		$('.AssociationStatus', frm).val(sbm.data.defaultStatusCode);
-		sbm.clearControlErrors();
-		sbm.$dlg.association.dialog('option', 'title', sbm.dlg.title.createAssociation);
-		sbm.openDialog(sbm.$dlg.association, 600, 600);
-	}
-
-	//--------------------------------------------------------------
-	sbm.updateItem = function (id)
-	{
-		$('.AssociationId', $frm.associationId).val(id);
-		sbm.ajax.updateItem = sbm.ajax.updateItem || { url: sbm.url.base + 'Association/Ajax/GetItem', formId: 'frmAssociationId', callbackFn: sbm.onUpdateItem };
-		sbm.doAjaxRequest(sbm.ajax.updateItem, 50);
-	}
-	sbm.onUpdateItem = function (response)
-	{
-		sbm.debug('onUpdateItem', response);
-		let frm = $frm.association;
-		$('.AssociationId,input[type="text"],textarea,select', frm).val('');
-		if (!response.success) return;
-		let item = response.association;
-		$('.AssociationId', frm).val(item.id);
-		$('.AssociationExists', frm).val(1);
-		$('.AssociationType', frm).val(item.typeCode);
-		$('.AssociationCode', frm).val(item.code);
-		$('.AssociationDesc', frm).val(item.desc);
-		$('.AssociationNotes', frm).val(item.notes);
-		$('.AssociationStatus', frm).val(item.statusCode);
-		sbm.clearControlErrors();
-		sbm.$dlg.association.dialog('option', 'title', sbm.dlg.title.updateAssociation);
-		sbm.openDialog(sbm.$dlg.association, 600, 600);
-	}
-
-	//--------------------------------------------------------------
-	sbm.storeItem = function ()
-	{
-		sbm.ajax.storeItem = sbm.ajax.storeItem || { url: sbm.url.base + 'Association/Ajax/StoreItem', formId: 'frmAssociation', callbackFn: sbm.onStoreItem };
-		sbm.doAjaxRequest(sbm.ajax.storeItem, 50);
-	}
-	sbm.onStoreItem = function (response)
-	{
-		//sbm.debug('onStoreItem', response);
-		sbm.refreshControlValues(response.controlValues);
-		if (!response.success) return;
-		sbm.$dlg.association.dialog('close');
-
-		var item = response.association;
-		var $item = $('#' + sbm.itemIdPrefix + item.id);
-		if (!$item.length)
-		{
-			$item = sbm.getItemTemplate();
-			$('.sbm-panel-item-list', $pnl.results).prepend($item).show();
-		}
-		$item.replaceWith(sbm.populateItem(sbm.getItemTemplate(), item));
-	}
-
-	//--------------------------------------------------------------
-	$(function ()
-	{
-		$pnl.associations = $('.sbm-panel.Associations');
-		$pnl.filter = $('.sbm-panel-filter', $pnl.associations);
-		$pnl.results = $('.sbm-panel-results', $pnl.associations);
-
-		$('.sbm-input, .sbm-textarea').on('input', function () { sbm.clearControlError(this); });
-		$('.sbm-select').on('change', function () { sbm.clearControlError(this); });
-
-		$frm.filter = $('#frmAssociationFilter');
-		$('.FilterAssociation', $frm.filter).on('input', function () { sbm.refreshResults(250); });
-		$('.FilterAssociationType,.FilterAssociationStatusCategory', $frm.filter).on('change', function () { sbm.refreshResults(50); });
-		$frm.associationId = $('#frmAssociationId');
-		$frm.association = $('#frmAssociation');
-
-		var opt = sbm.dlgOpts();
-		opt.buttons[sbm.lbl.ok] = function () { sbm.storeItem(); };
-		opt.buttons[sbm.lbl.cancel] = function () { $(this).dialog('close'); };
-		sbm.$dlg.association = $('#dlgAssociation').dialog(opt);
-
-		setTimeout(sbm.refreshResults, 250);
-	});
-
-}(window, window.document));
-
-/* The End */

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cod-typ.js

@@ -57,7 +57,7 @@
 		$('.CodeTypeCode', $item).text(item.code);
 		$('.CodeTypeName', $item).text(item.name);
 		$('.CodeTypeCodes', $item).text(item.codeCount);
-		$('.CodeTypeStatusDesc', $item).text(item.statusDesc).removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); }).addClass('sbm-status-' + item.statusCode.toLowerCase());
+		$('.CodeTypeStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
 		// Actions.
 		let fnUpd = function () { ac.updateItem($item, item) };
 		var $bgr = $('.sbm-burger', $item).invisible();
@@ -65,9 +65,9 @@
 		if (!item.deleted)
 		{
 			$mnu.append(ac.getItemMenuOption(sbm.lbl.edit, fnUpd, 'sbm-edit'));
-			$('.CodeTypeName', $item).on('click', fnUpd).addClass('sbm-action-text');
-			$('.CodeTypeCodes', $item).on('click', function () { sbm.navigateTo('Codes/Code?Filter.CodeTypeCode='+item.code);return false; }).on('dblclick', function () { return false; }).addClass('sbm-action-text');
-			$item.on('dblclick', fnUpd);
+			$('.CodeTypeName', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
+			$('.CodeTypeCodes', $item).off('click').on('click', function () { sbm.navigateTo('Codes/Code?Filter.CodeTypeCode='+item.code);return false; }).on('dblclick', function () { return false; }).addClass('sbm-action-text');
+			$item.off('dblclick').on('dblclick', fnUpd);
 		}
 		$bgr.toggleVisibility(!!$('.sbm-dropdown-item', $mnu).length);
 		return $item;
@@ -165,7 +165,7 @@
 		$dlg.item.dialog('close');
 
 		var item = response.codeType;
-		var $item = $('#' + ac.getItemId(item));
+		var $item = $('#' + ac.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
 			$item = ac.getItemRowTemplate();

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cod.js

@@ -58,7 +58,7 @@
 		$('.CodeType', $item).text(item.typeName);
 		$('.CodeCode', $item).text(item.code);
 		$('.CodeDesc', $item).text(item.description);
-		$('.CodeStatusDesc', $item).text(item.statusDesc).removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); }).addClass('sbm-status-' + item.statusCode.toLowerCase());
+		$('.CodeStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
 		// Actions.
 		let fnUpd = function () { ac.updateItem($item, item) };
 		var $bgr = $('.sbm-burger', $item).invisible();
@@ -66,8 +66,8 @@
 		if (!item.deleted)
 		{
 			$mnu.append(ac.getItemMenuOption(sbm.lbl.edit, fnUpd, 'sbm-edit'));
-			$('.CodeDesc', $item).on('click', fnUpd).addClass('sbm-action-text');
-			$item.on('dblclick', fnUpd);
+			$('.CodeDesc', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
+			$item.off('dblclick').on('dblclick', fnUpd);
 		}
 		$bgr.toggleVisibility(!!$('.sbm-dropdown-item', $mnu).length);
 		return $item;
@@ -188,7 +188,7 @@
 		$dlg.item.dialog('close');
 
 		var item = response.code;
-		var $item = $('#' + ac.getItemId(item));
+		var $item = $('#' + ac.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
 			$item = ac.getItemRowTemplate();

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-commodity.js

@@ -5,183 +5,200 @@
 (function (win, doc, undef)
 {
 	"use strict";
-	sbm.itemIdPrefix = 'Itm_';
-	let $pnl = sbm.$pnl;
-	let $frm = sbm.$frm;
-	let $dlg = sbm.$dlg;
+	let co = sbm.Commodities = { data: {}, ajax: {} };
+	let $pnl = co.$pnl = {}, $frm = co.$frm = {}, $dlg = co.$dlg = {};
 
 	//--------------------------------------------------------------
-	sbm.refreshResults = function (delay)
+	co.refreshResults = function (delay)
 	{
 		if (!sbm.awaitingRefreshResponse)
 		{
-			$('.sbm-burger', $pnl.filter).hide();
-			$('.sbm-panel-item-list', $pnl.results).fadeOut(200).empty();
-			$('.sbm-panel-messages', $pnl.results).hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
+			$pnl.bgr.invisible();
+			$pnl.table.find('tbody tr').remove();
+			$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
 		}
-		sbm.ajax.refreshResults = sbm.ajax.refreshResults || { url: sbm.url.base + 'Commodity/Ajax/List', formId: 'frmCommodityFilter', callbackFn: sbm.doRefreshResults };
-		sbm.doAjaxRequest(sbm.ajax.refreshResults, delay || 50);
+		co.ajax.refreshResults = co.ajax.refreshResults || { url: sbm.url.base + 'Commodity/Ajax/List', formId: $frm.filter.prop('id'), callbackFn: co.doRefreshResults };
+		sbm.doAjaxRequest(co.ajax.refreshResults, delay || 50);
 		sbm.awaitingRefreshResponse = true;
 	}
-	sbm.doRefreshResults = function (response)
+	co.doRefreshResults = function (response)
 	{
 		//sbm.debug('doRefreshResults', response);
 		delete sbm.awaitingRefreshResponse;
-		sbm.refreshControlValues(response.controlValues);
-		var $msgs = $('.sbm-panel-messages', $pnl.results).hide().empty();
-		var $items = $('.sbm-panel-item-list', $pnl.results).hide().empty();
-		sbm.refreshPaging(response, '#frmCommodityFilter', sbm.refreshResults);
+		$pnl.msgs.hide().empty();
+		let $table = $('table', $pnl.table).find('tbody tr').remove().end();
+		sbm.refreshPaging(response, '#frmCommodityFilter', co.refreshResults);
 		if (!response.success) return;
-		// Reference data - Statuses.
+
+		// Reference data.
 		if (response.defaultStatusCode) sbm.data.defaultStatusCode = response.defaultStatusCode;
-		if (response.statuses)
-			sbm.populateSelectCodeDesc('#cbCommodityStatus', response.statuses);
+		if (response.statuses) sbm.data.statuses = response.statuses;
+
 		// Menu.
-		var $bgr = $('.sbm-burger', $pnl.filter).hide();
-		var $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.refresh, function () { sbm.refreshResults(); }));
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.create, function () { sbm.createItem(); }));
-		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
+		$pnl.bgr.invisible();
+		$pnl.mnu.empty();
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.refresh, function () { co.refreshResults(); }, 'sbm-refresh'));
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.create, function () { co.createItem(); }, 'sbm-add'));
+		$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', $pnl.mnu).length);
+
 		// Items.
-		var items = response.commodities;
+		var items = response.commodities || [];
 		if (!items.length)
-			return $msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
+			return $pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-			$items.append(sbm.populateItem(sbm.getItemTemplate(), items[itemIdx]));
-		$items.fadeIn(50);
+			$table.append(co.populateItem(co.getItemTemplate(), items[itemIdx]));
 	}
-	sbm.populateItem = function ($item, item)
+	co.populateItem = function ($item, item)
 	{
 		if (!item) return;
-		$item.prop('id', sbm.itemIdPrefix + item.id);
+		$pnl.msgs.hide().empty();
+		$item.prop('id', co.getItemId(item));
+		$('.CommodityType', $item).text(item.typeDesc);
 		$('.CommodityCode', $item).text(item.code);
 		$('.CommodityDesc', $item).text(item.desc);
-		$('.CommodityType', $item).text(item.typeDesc);
-		$('.CommodityAssociationCount', $item).on('click', function () { sbm.onClickAssociationCount(item.id); }).toggle(item.associationCount).find('.AssociationCount').text(item.associationCount);
-		$('.CommodityAddress', $item).text(item.addressSummary);
+		$('.CommoditySalesPrice', $item).text(item.salesPriceFmt);
+		$('.CommoditySalesUnits', $item).text(item.salesUnit);
 		$('.CommodityNotes', $item).text(item.notes);
-		$('.StatusDesc', $item).text(item.statusDesc).addClass('sbm-status-' + item.statusCode.toLowerCase());
-		$('.sbm-caption .sbm-action').toggleClass('sbm-action', !item.deleted);
-		let $mnu = $('ul.sbm-dropdown-menu', $item);
+		$('.CommodityStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
+		// Actions.
+		var $bgr = $('.sbm-burger', $item).hide();
+		let $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
 		if (!item.deleted)
 		{
-			$mnu.append(sbm.getItemMenuOption(sbm.lbl.edit, function () { sbm.updateItem(item.id) }));
-			$('.sbm-header .sbm-action.sbm-item-update', $item).off('click').on('click', function () { sbm.updateItem(item.id) });
-			$item.off('dblclick').on('dblclick', function () { sbm.updateItem(item.id) });
+			let fnUpd = function () { co.updateItem(item) };
+			$mnu.append(co.getItemMenuOption(sbm.lbl.edit, fnUpd, 'sbm-edit'));
+			$('.CommodityCode,.CommodityDesc', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
+			$item.off('dblclick').on('dblclick', fnUpd);
 		}
-		$('.sbm-burger', $item).toggle(!!$('.sbm-dropdown-item', $mnu).length);
-		$('.sbm-panel-messages', $pnl.results).hide().empty();
+		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
 		return $item;
 	}
-
-	//--------------------------------------------------------------
-	sbm.getFilterDropdownTemplate = function ()
+	co.getItemId = function (item)
 	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.CommodityFilter li.sbm-dropdown-item', $pnl.filter).clone();
-	}
-	sbm.getItemTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-panel-item.Commodity', $pnl.results).clone();
-	}
-	sbm.getItemDropdownTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.Commodity li.sbm-dropdown-item', $pnl.results).clone();
-	}
-	sbm.getFilterMenuOption = function (lbl, fn)
-	{
-		return sbm.getMenuOption(sbm.getFilterDropdownTemplate(), lbl, fn);
-	}
-	sbm.getItemMenuOption = function (lbl, fn)
-	{
-		return sbm.getMenuOption(sbm.getItemDropdownTemplate(), lbl, fn);
-	}
-	sbm.getMenuOption = function ($opt, lbl, fn)
-	{
-		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn);
+		return 'Cmd_' + (item || {}).id;
 	}
 
 	//--------------------------------------------------------------
-	sbm.createItem = function ()
+	co.getFilterDropdownTemplate = function ()
 	{
-		let frm = $frm.commodity;
-		$('.CommodityId,.CommodityExists,input[type="text"],textarea,select', frm).val('');
+		return $('.sbm-dropdown-menu.CommodityList li.sbm-dropdown-item', $pnl.tmpls).clone();
+	}
+	co.getItemTemplate = function ()
+	{
+		return $('table tr.sbm-row-item.Commodity', $pnl.tmpls).clone();
+	}
+	co.getItemDropdownTemplate = function ()
+	{
+		return $('.sbm-dropdown-menu.Commodity li.sbm-dropdown-item', $pnl.tmpls).clone();
+	}
+
+	//--------------------------------------------------------------
+	co.getFilterMenuOption = function (lbl, fn, cls)
+	{
+		return co.getMenuOption(co.getFilterDropdownTemplate(), lbl, fn, cls);
+	}
+	co.getItemMenuOption = function (lbl, fn, cls)
+	{
+		return co.getMenuOption(co.getItemDropdownTemplate(), lbl, fn, cls);
+	}
+	co.getMenuOption = function ($opt, lbl, fn, cls)
+	{
+		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn).addClass(cls);
+	}
+
+	//--------------------------------------------------------------
+	co.createItem = function ()
+	{
+		co.clearItem();
+		let frm = $frm.item;
 		$('.CommodityStatus', frm).val(sbm.data.defaultStatusCode);
 		sbm.clearControlErrors();
-		sbm.$dlg.commodity.dialog('option', 'title', sbm.dlg.title.createCommodity);
-		sbm.openDialog(sbm.$dlg.commodity, 600, 600);
+		$dlg.item.dialog('option', 'title', sbm.dlg.title.createCommodity).prop('readonly', false);
+		co.openItemDlg();
+	}
+	co.clearItem = function ()
+	{
+		sbm.clearControlErrors($frm.item);
+		$('.sbm-input,.sbm-textarea,.sbm-select', $frm.item).val('');
+		sbm.populateSelectCodeDesc('#cbCommodityStatus', sbm.data.statuses);
+	}
+	co.openItemDlg = function ()
+	{
+		sbm.openDialog($dlg.item, 600, 640);
 	}
 
 	//--------------------------------------------------------------
-	sbm.updateItem = function (id)
+	co.updateItem = function (item)
 	{
-		$('.CommodityId', $frm.commodityId).val(id);
-		sbm.ajax.updateItem = sbm.ajax.updateItem || { url: sbm.url.base + 'Commodity/Ajax/GetItem', formId: 'frmCommodityId', callbackFn: sbm.onUpdateItem };
-		sbm.doAjaxRequest(sbm.ajax.updateItem, 50);
+		$('.CommodityId', $frm.itemId).val(item.id);
+		co.ajax.updateItem = co.ajax.updateItem || { url: sbm.url.base + 'Commodity/Ajax/GetItem', formId: 'frmCommodityId', callbackFn: co.onUpdateItem };
+		sbm.doAjaxRequest(co.ajax.updateItem, 50);
 	}
-	sbm.onUpdateItem = function (response)
+	co.onUpdateItem = function (response)
 	{
-		sbm.debug('onUpdateItem', response);
-		let frm = $frm.commodity;
-		$('.CommodityId,input[type="text"],textarea,select', frm).val('');
+		//sbm.debug('onUpdateItem', response);
+		co.clearItem();
 		if (!response.success) return;
 		let item = response.commodity;
-		$('.CommodityId', frm).val(item.id);
-		$('.CommodityExists', frm).val(1);
-		$('.CommodityType', frm).val(item.typeCode);
-		$('.CommodityCode', frm).val(item.code);
-		$('.CommodityDesc', frm).val(item.desc);
-		$('.CommodityNotes', frm).val(item.notes);
-		$('.CommodityStatus', frm).val(item.statusCode);
-		sbm.clearControlErrors();
-		sbm.$dlg.commodity.dialog('option', 'title', sbm.dlg.title.updateCommodity);
-		sbm.openDialog(sbm.$dlg.commodity, 600, 600);
+		let $ctrls = $('.sbm-input,.sbm-textarea,.sbm-select', $frm.item);
+		$ctrls.filter('.CommodityId').val(item.id);
+		$ctrls.filter('.CommodityExists').val(1);
+		$ctrls.filter('.CommodityType').val(item.typeCode);
+		$ctrls.filter('.CommodityCode').val(item.code);
+		$ctrls.filter('.CommodityDesc').val(item.desc);
+		$ctrls.filter('.CommodityNotes').val(item.notes);
+		sbm.selectOrAdd($ctrls.filter('.CommodityStatus'), item.statusCode, item.statusDesc);
+		$dlg.item.dialog('option', 'title', sbm.dlg.title.updateCommodity);
+		co.openItemDlg();
 	}
 
 	//--------------------------------------------------------------
-	sbm.storeItem = function ()
+	co.storeItem = function ()
 	{
-		sbm.ajax.storeItem = sbm.ajax.storeItem || { url: sbm.url.base + 'Commodity/Ajax/StoreItem', formId: 'frmCommodity', callbackFn: sbm.onStoreItem };
-		sbm.doAjaxRequest(sbm.ajax.storeItem, 50);
+		co.ajax.storeItem = co.ajax.storeItem || { url: sbm.url.base + 'Commodity/Ajax/StoreItem', formId: 'frmCommodity', callbackFn: co.onStoreItem };
+		sbm.doAjaxRequest(co.ajax.storeItem, 50);
 	}
-	sbm.onStoreItem = function (response)
+	co.onStoreItem = function (response)
 	{
 		//sbm.debug('onStoreItem', response);
 		sbm.refreshControlValues(response.controlValues);
 		if (!response.success) return;
-		sbm.$dlg.commodity.dialog('close');
+		$dlg.item.dialog('close');
 
 		var item = response.commodity;
-		var $item = $('#' + sbm.itemIdPrefix + item.id);
+		var $item = $('#' + co.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
-			$item = sbm.getItemTemplate();
-			$('.sbm-panel-item-list', $pnl.results).prepend($item).show();
+			$item = co.getItemTemplate();
+			$('table tbody', $pnl.table).prepend($item).show();
 		}
-		$item.replaceWith(sbm.populateItem(sbm.getItemTemplate(), item));
+		co.populateItem($item, item);
 	}
 
 	//--------------------------------------------------------------
 	$(function ()
 	{
-		$pnl.commodities = $('.sbm-panel.Commodities');
-		$pnl.filter = $('.sbm-panel-filter', $pnl.commodities);
-		$pnl.results = $('.sbm-panel-results', $pnl.commodities);
-
-		$('.sbm-input, .sbm-textarea').on('input', function () { sbm.clearControlError(this); });
-		$('.sbm-select').on('change', function () { sbm.clearControlError(this); });
+		$pnl.items = $('.sbm-panel.Commodities');
+		$pnl.header = $('.sbm-panel-header', $pnl.items);
+		$pnl.bgr = $('.sbm-burger', $pnl.header);
+		$pnl.mnu = $('ul.sbm-dropdown-menu', $pnl.bgr);
+		$pnl.table = $('.sbm-panel-item-table', $pnl.items);
+		$pnl.msgs = $('.sbm-panel-messages', $pnl.table);
+		$pnl.tmpls = $('.sbm-panel-item-template', $pnl.items);
 
 		$frm.filter = $('#frmCommodityFilter');
-		$('.FilterCommodity', $frm.filter).on('input', function () { sbm.refreshResults(250); });
-		$('.FilterCommodityType,.FilterCommodityStatusCategory', $frm.filter).on('change', function () { sbm.refreshResults(50); });
-		$frm.commodityId = $('#frmCommodityId');
-		$frm.commodity = $('#frmCommodity');
+		$frm.filter.on('input', '.FilterSearch', function () { co.refreshResults(250); }).on('change', '.FilterCommodityType,.FilterStatusCat', function () { co.refreshResults(50); });
+
+		$frm.itemId = $('#frmCommodityId');
+		$frm.item = $('#frmCommodity');
+		$frm.item.on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).on('change', '.sbm-select', function () { sbm.clearControlError(this); });
 
 		var opt = sbm.dlgOpts();
-		opt.buttons[sbm.lbl.ok] = function () { sbm.storeItem(); };
+		opt.buttons[sbm.lbl.ok] = function () { co.storeItem(); };
 		opt.buttons[sbm.lbl.cancel] = function () { $(this).dialog('close'); };
-		sbm.$dlg.commodity = $('#dlgCommodity').dialog(opt);
+		$dlg.item = $('#dlgCommodity').dialog(opt);
 
-		setTimeout(sbm.refreshResults, 250);
+		setTimeout(co.refreshResults, 250);
 	});
 
 }(window, window.document));

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-contact.js

@@ -5,206 +5,254 @@
 (function (win, doc, undef)
 {
 	"use strict";
-	sbm.itemIdPrefix = 'Itm_';
-	let $pnl = sbm.$pnl;
-	let $frm = sbm.$frm;
-	let $dlg = sbm.$dlg;
+	let co = sbm.Contacts = { data: {}, ajax: {} };
+	let $pnl = co.$pnl = {}, $frm = co.$frm = {}, $dlg = co.$dlg = {};
 
 	//--------------------------------------------------------------
-	sbm.refreshResults = function (delay)
+	co.refreshResults = function (delay)
 	{
 		if (!sbm.awaitingRefreshResponse)
 		{
-			$('.sbm-burger', $pnl.filter).hide();
-			$('.sbm-panel-item-list', $pnl.results).fadeOut(200).empty();
-			$('.sbm-panel-messages', $pnl.results).hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
+			$pnl.bgr.invisible();
+			$pnl.table.find('tbody tr').remove();
+			$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
 		}
-		sbm.ajax.refreshResults = sbm.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formId: 'frmContactFilter', callbackFn: sbm.doRefreshResults };
-		sbm.doAjaxRequest(sbm.ajax.refreshResults, delay || 50);
+		co.ajax.refreshResults = co.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formId: $frm.filter.prop('id'), callbackFn: co.doRefreshResults };
+		sbm.doAjaxRequest(co.ajax.refreshResults, delay || 50);
 		sbm.awaitingRefreshResponse = true;
 	}
-	sbm.getFilterDropdownTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.ContactFilter li.sbm-dropdown-item', $pnl.filter).clone();
-	}
-	sbm.getItemTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-panel-item.Contact', $pnl.results).clone();
-	}
-	sbm.getItemDropdownTemplate = function ()
-	{
-		return $('.sbm-panel-item-template .sbm-dropdown-menu.Contact li.sbm-dropdown-item', $pnl.results).clone();
-	}
-	sbm.doRefreshResults = function (response)
+	co.doRefreshResults = function (response)
 	{
 		//sbm.debug('doRefreshResults', response);
 		delete sbm.awaitingRefreshResponse;
-		sbm.refreshControlValues(response.controlValues);
-		var $msgs = $('.sbm-panel-messages', $pnl.results).hide().empty();
-		var $items = $('.sbm-panel-item-list', $pnl.results).hide().empty();
-		sbm.refreshPaging(response, '#frmContactFilter', sbm.refreshResults);
+		$pnl.msgs.hide().empty();
+		let $table = $('table', $pnl.table).find('tbody tr').remove().end();
+		sbm.refreshPaging(response, '#frmContactFilter', co.refreshResults);
 		if (!response.success) return;
-		// Reference data - Statuses.
-		if (response.defaultStatusCode) sbm.data.defaultStatusCode = response.defaultStatusCode;
-		if (response.statuses)
-			sbm.populateSelectCodeDesc('#cbContactStatus', response.statuses);
+
+		// Reference data.
+		co.config = response.config;
+		co.configInd = response.configInd;
+		co.configOrg = response.configOrg;
+		co.configGrp = response.configGrp;
+		co.data.organisationTypes = response.organisationTypes;
+		co.data.titles = response.titles;
+		co.data.salutations = response.salutations;
+		co.data.statuses = response.statuses;
+		co.data.defaultStatusCode = response.defaultStatusCode;
+
 		// Menu.
-		var $bgr = $('.sbm-burger', $pnl.filter).hide();
-		var $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.refresh, function () { sbm.refreshResults(); }));
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.createOrg, function () { sbm.createItem(); }));
-		$mnu.append(sbm.getFilterMenuOption(sbm.lbl.createInd, function () { sbm.createItem(1); }));
-		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
+		$pnl.bgr.invisible();
+		$pnl.mnu.empty();
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.refresh, function () { co.refreshResults(); }, 'sbm-refresh'));
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.createOrg, function () { co.createItem(co.configOrg, sbm.dlg.title.createContact); }, 'sbm-add'));
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.createInd, function () { co.createItem(co.configInd, sbm.dlg.title.createContact); }, 'sbm-add'));
+		$pnl.mnu.append(co.getFilterMenuOption(sbm.lbl.createGrp, function () { co.createItem(co.configGrp, sbm.dlg.title.createContact); }, 'sbm-add'));
+		$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', $pnl.mnu).length);
+
 		// Items.
-		var items = response.affiliates;
+		var items = response.contacts || [];
 		if (!items.length)
-			return $msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
+			return $pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-			$items.append(sbm.populateItem(sbm.getItemTemplate(), items[itemIdx]));
-		$items.fadeIn(50);
+			$table.append(co.populateItem(co.getItemTemplate(), items[itemIdx]));
 	}
-	sbm.populateItem = function ($item, item)
+	co.populateItem = function ($item, item)
 	{
 		if (!item) return;
-		$item.prop('id', sbm.itemIdPrefix + item.id);
+		$pnl.msgs.hide().empty();
+		$item.prop('id', co.getItemId(item));
 		$('.ContactName', $item).text(item.displayName);
 		$('.ContactType', $item).text(item.typeDesc);
-		$('.ContactAssociationCount', $item).on('click', function () { sbm.onClickAssociationCount(item.id); }).toggle(item.associationCount).find('.AssociationCount').text(item.associationCount);
+		if (item.associationCount)
+			$('.ContactAssociationCount', $item).text(item.associationCount).on('click', function () { co.onClickAssociationCount(item); }).addClass('sbm-action-text');
 		$('.ContactAddress', $item).text(item.addressSummary);
+		$('.ContactContact', $item).text(item.contact);
+		$('.ContactPhone', $item).text(item.phone);
 		$('.ContactNotes', $item).text(item.notes);
-		$('.StatusDesc', $item).text(item.statusDesc).addClass('sbm-status-' + item.statusCode.toLowerCase());
-		$('.sbm-caption .sbm-action').toggleClass('sbm-action', !item.deleted);
-		let $mnu = $('ul.sbm-dropdown-menu', $item).empty();
+		$('.ContactStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
+		// Actions.
+		var $bgr = $('.sbm-burger', $item).hide();
+		let $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
 		if (!item.deleted)
 		{
-			$mnu.append(sbm.getItemMenuOption(sbm.lbl.edit, function () { sbm.updateItem(item.id) }));
-			$('.sbm-header .sbm-action.sbm-item-update', $item).off('click').on('click', function () { sbm.updateItem(item.id) });
-			$item.off('dblclick').on('dblclick', function () { sbm.updateItem(item.id) });
+			let fnUpd = function () { co.updateItem(item) };
+			$mnu.append(co.getItemMenuOption(sbm.lbl.edit, fnUpd, 'sbm-edit'));
+			$('.ContactName', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
+			$item.off('dblclick').on('dblclick', fnUpd);
 		}
-		$('.sbm-burger', $item).toggle(!!$('.sbm-dropdown-item', $mnu).length);
-		$('.sbm-panel-messages', $pnl.results).hide().empty();
+		$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
 		return $item;
 	}
-
-	//--------------------------------------------------------------
-	sbm.getFilterMenuOption = function (lbl, fn)
+	co.getItemId = function (item)
 	{
-		return sbm.getMenuOption(sbm.getFilterDropdownTemplate(), lbl, fn);
-	}
-	sbm.getItemMenuOption = function (lbl, fn)
-	{
-		return sbm.getMenuOption(sbm.getItemDropdownTemplate(), lbl, fn);
-	}
-	sbm.getMenuOption = function ($opt, lbl, fn)
-	{
-		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn);
+		return 'Con_' + (item || {}).id;
 	}
 
 	//--------------------------------------------------------------
-	sbm.createItem = function (ind)
+	co.getFilterDropdownTemplate = function ()
 	{
-		let frm = $frm.contact;
-		sbm.clearControlErrors(frm);
-		$('.AffiliateId,.ContactExists,input[type="text"],textarea,select', frm).val('');
-		$('.ContactIndividual', frm).val(!!ind ? 1 : null);
-		$('.ContactStatus', frm).val(sbm.data.defaultStatusCode);
-		sbm.toggleContactControls(ind);
-		$dlg.contact.dialog('option', 'title', sbm.dlg.title.createContact);
-		sbm.openDialog($dlg.contact, 600, 600);
+		return $('.sbm-dropdown-menu.ContactList li.sbm-dropdown-item', $pnl.tmpls).clone();
 	}
-	sbm.toggleContactControls = function (ind)
+	co.getItemTemplate = function ()
 	{
-		let frm = $frm.contact;
-		$('.sbm-form-control.ContactType,.sbm-form-control.ContactName', frm).toggle(!ind).find('input,select').prop('disabled', !!ind);
-		$('.sbm-form-control.ContactFirstName,.sbm-form-control.ContactLastName', frm).toggle(!!ind).find('input,select').prop('disabled', !ind);
+		return $('table tr.sbm-row-item.Contact', $pnl.tmpls).clone();
+	}
+	co.getItemDropdownTemplate = function ()
+	{
+		return $('.sbm-dropdown-menu.Contact li.sbm-dropdown-item', $pnl.tmpls).clone();
 	}
 
 	//--------------------------------------------------------------
-	sbm.updateItem = function (id)
+	co.getFilterMenuOption = function (lbl, fn, cls)
 	{
-		$('.AffiliateId', $frm.contactId).val(id);
-		sbm.ajax.updateItem = sbm.ajax.updateItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formId: 'frmContactId', callbackFn: sbm.onUpdateItem };
-		sbm.doAjaxRequest(sbm.ajax.updateItem, 50);
+		return co.getMenuOption(co.getFilterDropdownTemplate(), lbl, fn, cls);
 	}
-	sbm.onUpdateItem = function (response)
+	co.getItemMenuOption = function (lbl, fn, cls)
+	{
+		return co.getMenuOption(co.getItemDropdownTemplate(), lbl, fn, cls);
+	}
+	co.getMenuOption = function ($opt, lbl, fn, cls)
+	{
+		return $opt.find('div.sbm-label').text(lbl).end().on('click', fn).addClass(cls);
+	}
+
+	//--------------------------------------------------------------
+	co.createItem = function (cfg, title)
+	{
+		co.clearItem(cfg);
+		let frm = $frm.item;
+		$('.ContactStatus', frm).val(co.data.defaultStatusCode).prop('readonly', false);
+		co.configureItemControls(cfg);
+		co.openItemDlg(title);
+	}
+	co.clearItem = function (cfg)
+	{
+		//sbm.debug('clearItem', cfg);
+		let frm = $frm.item;
+		sbm.clearItemForm(frm);
+		if (cfg.isIndividual) $('.ContactIsIndividual', frm).val(1);
+		if (cfg.isGroup) $('.ContactIsGroup', frm).val(1);
+		sbm.populateSelectCodeDesc('#cbContactType', co.data.organisationTypes);
+		sbm.populateSelectCodeDesc('#cbContactTitle', co.data.titles);
+		sbm.selectOrAdd('#cbContactTitle', "", "")
+		sbm.populateSelectCodeDesc('#cbContactSalutation', co.data.salutations);
+		sbm.populateSelectCodeDesc('#cbContactStatus', co.data.statuses);
+	}
+	sbm.clearItemForm = function ($frm)
+	{
+		sbm.clearControlErrors($frm);
+		$('.sbm-input,.sbm-textarea,.sbm-select,.sbm-checkbox', $frm).val('').prop('readonly', false).prop('disabled', false).removeAttr('checked');
+	}
+	co.configureItemControls = function (cfg)
+	{
+		sbm.configureItemControls($frm.item, cfg);
+	}
+	sbm.configureItemControls = function ($frm, cfg)
+	{
+		//sbm.debug('configureItemControls', cfg);
+		let fld = cfg.field || {};
+		let $ctrl = $('.sbm-form-control', $frm.item).show();
+		(fld.hide || []).forEach(function (v, i, a) { $ctrl.filter('.' + cfg.field.prefix + v).hide().find('.sbm-input,.sbm-textarea,.sbm-select,.sbm-checkbox').prop('disabled', true); });
+		(fld.readonly || []).forEach(function (v, i, a) { $ctrl.filter('.' + cfg.field.prefix + v).find('.sbm-input,.sbm.textarea,.sbm-select,.sbm-checkbox').prop('readonly', true).prop('disabled', true); });
+	}
+	co.openItemDlg = function (title)
+	{
+		if (title)$dlg.item.dialog('option', 'title', title);
+		sbm.openDialog($dlg.item, 640, 600);
+	}
+
+	//--------------------------------------------------------------
+	co.updateItem = function (item)
+	{
+		$('.ContactId', $frm.itemId).val(item.id);
+		co.ajax.updateItem = co.ajax.updateItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formId: 'frmContactId', callbackFn: co.onUpdateItem };
+		sbm.doAjaxRequest(co.ajax.updateItem, 50);
+	}
+	co.onUpdateItem = function (response)
 	{
 		//sbm.debug('onUpdateItem', response);
-		let frm = $frm.contact;
-		$('.AffiliateId,input[type="text"],textarea,select', frm).val('');
+		co.clearItem(response.config);
 		if (!response.success) return;
-		let item = response.affiliate;
-		sbm.toggleContactControls(item.individual);
-		$('.AffiliateId', frm).val(item.id);
-		$('.ContactExists', frm).val(1);
-		$('.ContactIndividual', frm).val(!!item.individual ? 1 : null);
-		$('.ContactType', frm).val(item.typeCode);
-		$('.ContactName', frm).val(item.name);
-		$('.ContactFirstName', frm).val(item.firstName);
-		$('.ContactLastName', frm).val(item.lastName);
-		$('.ContactNotes', frm).val(item.notes);
-		$('.ContactStatus', frm).val(item.statusCode);
-		sbm.clearControlErrors();
-		$dlg.contact.dialog('option', 'title', sbm.dlg.title.updateContact);
-		sbm.openDialog($dlg.contact, 600, 600);
+		let item = response.contact;
+		let $ctrls = $('.sbm-input,.sbm-textarea,.sbm-select,.sbm-checkbox', $frm.item);
+		$ctrls.filter('.ContactId').val(item.id);
+		$ctrls.filter('.ContactExists').val(1);
+		$ctrls.filter('.ContactType').val(item.typeCode);
+		$ctrls.filter('.ContactProspect').prop('checked', !!item.prospect);
+		$ctrls.filter('.ContactNotes').val(item.notes);
+		$ctrls.filter('.ContactStatus').val(item.statusCode);
+		sbm.populateFieldValues(response.config, $frm.item, item.field);
+		co.configureItemControls(response.config);
+		co.openItemDlg(sbm.dlg.title.updateContact);
+	}
+	sbm.populateFieldValues = function (cfg, $frm, fld)
+	{
+		let val = (fld || {}).value || [];
+		let $ctrl = $('.sbm-form-control', $frm.item).show();
+		for (var name in val) { $ctrl.filter('.' + cfg.field.prefix + name).find('.sbm-input,.sbm-textarea,.sbm-select').val(val[name]).end().find('.sbm-checkbox').prop('checked',!!val[name]); };
 	}
 
 	//--------------------------------------------------------------
-	sbm.storeItem = function ()
+	co.storeItem = function ()
 	{
-		sbm.ajax.storeItem = sbm.ajax.storeItem || { url: sbm.url.base + 'Contact/Ajax/StoreItem', formId: 'frmContact', callbackFn: sbm.onStoreItem };
-		sbm.doAjaxRequest(sbm.ajax.storeItem, 50);
+		co.ajax.storeItem = co.ajax.storeItem || { url: sbm.url.base + 'Contact/Ajax/StoreItem', formId: 'frmContact', callbackFn: co.onStoreItem };
+		sbm.doAjaxRequest(co.ajax.storeItem, 50);
 	}
-	sbm.onStoreItem = function (response)
+	co.onStoreItem = function (response)
 	{
 		//sbm.debug('onStoreItem', response);
 		sbm.refreshControlValues(response.controlValues);
 		if (!response.success) return;
-		$dlg.contact.dialog('close');
+		$dlg.item.dialog('close');
 
-		var item = response.affiliate;
-		var $item = $('#' + sbm.itemIdPrefix + item.id);
+		var item = response.contact;
+		var $item = $('#' + co.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
-			$item = sbm.getItemTemplate();
-			$('.sbm-panel-item-list', $pnl.results).prepend($item).show();
+			$item = co.getItemTemplate();
+			$('table tbody', $pnl.table).prepend($item).show();
 		}
-		$item.replaceWith(sbm.populateItem(sbm.getItemTemplate(), item));
+		co.populateItem($item, item);
 	}
 
 	//--------------------------------------------------------------
-	sbm.onClickAssociationCount = function (id)
+	co.onClickAssociationCount = function (item)
 	{
-		if (!(id * 1)) return;
+		if (!item.id) return;
 		sbm.doPleaseWait();
-		let frm = $frm.contactId;
-		$('.AffiliateId', frm).val(id);
+		let frm = $frm.itemId;
+		$('.ContactId', frm).val(item.id);
 		frm.prop('action', sbm.url.base + 'Association').submit();
 	}
 
 	//--------------------------------------------------------------
 	$(function ()
 	{
-		$pnl.contacts = $('.sbm-panel.Contacts');
-		$pnl.filter = $('.sbm-panel-filter', $pnl.contacts);
-		$pnl.results = $('.sbm-panel-results', $pnl.contacts);
+		$pnl.items = $('.sbm-panel.Contacts');
+		$pnl.header = $('.sbm-panel-header', $pnl.items);
+		$pnl.bgr = $('.sbm-burger', $pnl.header);
+		$pnl.mnu = $('ul.sbm-dropdown-menu', $pnl.bgr);
+		$pnl.table = $('.sbm-panel-item-table', $pnl.items);
+		$pnl.msgs = $('.sbm-panel-messages', $pnl.table);
+		$pnl.tmpls = $('.sbm-panel-item-template', $pnl.items);
 
-		$('.sbm-input, .sbm-textarea').on('input', function () { sbm.clearControlError(this); });
-		$('.sbm-select').on('change', function () { sbm.clearControlError(this); });
+		$frm.filter = $('#frmContactFilter', $pnl.items);
+		$frm.filter.on('input', '.FilterSearch', function () { co.refreshResults(250); }).on('change', '.FilterContactType', function () { co.refreshResults(50); });
 
-		$frm.filter = $('#frmContactFilter');
-		$('.FilterContact', $frm.filter).on('input', function () { sbm.refreshResults(250); });
-		$('.FilterContactType', $frm.filter).on('change', function () { sbm.refreshResults(50); });
-		$frm.contactId = $('#frmContactId');
-		$frm.contact = $('#frmContact');
+		$frm.itemId = $('#frmContactId');
+		$frm.item = $('#frmContact');
+		$frm.item.on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).on('change', '.sbm-select', function () { sbm.clearControlError(this); });
 
 		var opt = sbm.dlgOpts();
-		opt.buttons[sbm.lbl.ok] = function () { sbm.storeItem(); };
+		opt.buttons[sbm.lbl.ok] = function () { co.storeItem(); };
 		opt.buttons[sbm.lbl.cancel] = function () { $(this).dialog('close'); };
-		$dlg.contact = $('#dlgContact').dialog(opt);
+		$dlg.item = $('#dlgContact').dialog(opt);
 
-		setTimeout(sbm.refreshResults, 250);
+		setTimeout(co.refreshResults, 250);
 	});
 
+	//--------------------------------------------------------------
 }(window, window.document));
 
 /* The End */

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-main.js

@@ -97,6 +97,13 @@
 			return index % 2 == 1 ? (cName || "other") : "";
 		});
 	}
+	sbm.selectOrAdd = function ($sel, code, desc)
+	{
+		$sel = $($sel);
+		if ($sel.val(code).val() == code) return;
+		$sel.append($('<option>').prop('value', code).text(desc));
+		$sel.val(code);
+	}
 	sbm.populateSelect = function ($sel, values, code, desc)
 	{
 		code = code || 'code';
@@ -107,7 +114,7 @@
 	}
 	sbm.populateSelectCodeDesc = function ($sel, values)
 	{
-		sbm.populateSelect($sel, values);
+		sbm.populateSelect($($sel), values);
 	}
 	sbm.checkTextAreaMaxLength = function (ctrl, len)
 	{
@@ -521,6 +528,11 @@
 			return this.css('visibility', function (i, visibility) { return (visibility == 'visible') ? 'hidden' : 'visible'; });
 		};
 
+		$.fn.removeStatusClasses = function ()
+		{
+			return this.removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); });
+		};
+
 		if (sbm.keepLoggedIn)
 			sbm.configureKeepLoggedIn();
 		else if (!sbm.awaitingLogin)

SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-veh-cls.js

@@ -58,7 +58,7 @@
 		$('.VehicleClassModel', $item).text(item.model);
 		$('.VehicleClassDerivative', $item).text(item.derivative);
 		$('.VehicleClassDescription', $item).text(item.descBrief);
-		$('.VehicleClassStatusDesc', $item).text(item.statusDesc).removeClass(function (idx, name) { return (name.match(/(^|\s)sbm-status-\S+/g) || []).join(' '); }).addClass('sbm-status-' + item.statusCode.toLowerCase());
+		$('.VehicleClassStatusDesc', $item).text(item.statusDesc).removeStatusClasses().addClass('sbm-status-' + item.statusCode.toLowerCase());
 		// Actions.
 		let fnUpd = function () { vc.updateItem($item, item) };
 		var $bgr = $('.sbm-burger', $item).invisible();
@@ -166,7 +166,7 @@
 		$dlg.item.dialog('close');
 
 		var item = response.vehicleClass;
-		var $item = $('#' + vc.getItemId(item));
+		var $item = $('#' + vc.getItemId(item), $pnl.table);
 		if (!$item.length)
 		{
 			$item = vc.getItemRowTemplate();