3.0.2 .Net8
This commit is contained in:
@@ -351,16 +351,31 @@ ul.nav.sbm-burger ul.sbm-dropdown-menu li.sbm-action.sbm-dropdown-item:hover .sb
|
||||
|
||||
.sbm-panel-messages .sbm-message
|
||||
{
|
||||
min-height: 20px;
|
||||
margin: 4px 0;
|
||||
padding-left: 24px;
|
||||
padding-top: 2px;
|
||||
padding-left: 28px;
|
||||
background-position: left top;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 20px 20px;
|
||||
}
|
||||
|
||||
.sbm-panel-messages .sbm-message.sbm-info
|
||||
{
|
||||
color: #28a745;
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%2328a745' viewBox='0 0 512 512'%3e%3cpath d='M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm0 110c23.2 0 42 18.8 42 42s-18.8 42-42 42-42-18.8-42-42 18.8-42 42-42zm56 308c0 6.6-5.4 12-12 12h-88c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h12v-86h-12c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h64c6.6 0 12 5.4 12 12v106h12c6.6 0 12 5.4 12 12v8z'/%3e%3c/svg%3e");
|
||||
}
|
||||
|
||||
.sbm-panel-messages .sbm-message.sbm-warn
|
||||
{
|
||||
color: #ffc107;
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23ffc107' viewBox='0 0 512 512'%3e%3cpath d='M256 48C141.1 48 48 141.1 48 256s93.1 208 208 208 208-93.1 208-208S370.9 48 256 48zm0 96c13.3 0 24 10.7 24 24v112c0 13.3-10.7 24-24 24s-24-10.7-24-24V168c0-13.3 10.7-24 24-24zm0 272a32 32 0 1 1 0-64 32 32 0 1 1 0 64z'/%3e%3c/svg%3e");
|
||||
}
|
||||
|
||||
.sbm-panel-messages .sbm-message.sbm-error
|
||||
{
|
||||
color: #e3120b;
|
||||
background-image: url("../img/icon/error-18.png");
|
||||
color: #dc3545;
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23dc3545' viewBox='0 0 576 512'%3e%3cpath d='M569.5 440.6 327.4 69.5c-18.8-29.3-61.1-29.3-79.9 0L6.5 440.6C-12.3 469.9 9.5 512 48 512h480c38.5 0 60.3-42.1 41.5-71.4zM288 392c-22.1 0-40-17.9-40-40s17.9-40 40-40 40 17.9 40 40-17.9 40-40 40zm44-144c0 6.6-5.4 12-12 12h-64c-6.6 0-12-5.4-12-12v-72c0-6.6 5.4-12 12-12h64c6.6 0 12 5.4 12 12v72z'/%3e%3c/svg%3e");
|
||||
}
|
||||
|
||||
/* Item List table */
|
||||
|
||||
@@ -29,7 +29,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 + 'Address/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { ad.doRefreshResults(env, response); } };
|
||||
env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Address/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { ad.doRefreshResults(env, response); } };
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults, delay || 50);
|
||||
ad.awaitingRefreshResponse = true;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
env.$pnl.table.find('tbody tr').remove();
|
||||
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.assetCategories = env.ajax.assetCategories || { url: sbm.url.base + 'Assets/AssetCategory/Ajax/GetAssetCategories', formSel: env.$frm.filter, callbackFn: function (response) { ac.doRefreshResults(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.assetCategories = env.ajax.assetCategories || { url: sbm.url.base + 'Assets/AssetCategory/Ajax/GetAssetCategories', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { ac.doRefreshResults(env, response); } }, delay || 50);
|
||||
env.data.awaitingRefreshResponse = true;
|
||||
}
|
||||
ac.doRefreshResults = function (env, response)
|
||||
|
||||
@@ -30,7 +30,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.assets = env.ajax.assets || { url: sbm.url.base + 'Assets/Asset/Ajax/GetAssets', formSel: env.$frm.filter, callbackFn: function (response) { as.doRefreshResults(env, response); } };
|
||||
env.ajax.assets = env.ajax.assets || { url: sbm.url.base + 'Assets/Asset/Ajax/GetAssets', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { as.doRefreshResults(env, response); } };
|
||||
sbm.doAjaxRequest(env.ajax.assets, delay || 50);
|
||||
env.data.awaitingRefreshResponse = true;
|
||||
}
|
||||
|
||||
@@ -26,7 +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);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Association/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { as.doRefreshResults(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Association/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { as.doRefreshResults(env, response); } }, delay || 50);
|
||||
as.awaitingRefreshResponse = true;
|
||||
}
|
||||
as.doRefreshResults = function (env, response)
|
||||
|
||||
@@ -29,7 +29,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 + 'Commodity/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { co.doRefreshResults(env, response); } };
|
||||
env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Commodity/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { co.doRefreshResults(env, response); } };
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults, delay || 50);
|
||||
co.awaitingRefreshResponse = true;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
env.$pnl.table.find('tbody tr').remove();
|
||||
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.codeTypes = env.ajax.codeTypes || { url: sbm.url.base + 'Codes/CodeType/Ajax/GetCodeTypes', formSel: env.$frm.filter, callbackFn: function (response) { ct.handleCodeTypes(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.codeTypes = env.ajax.codeTypes || { url: sbm.url.base + 'Codes/CodeType/Ajax/GetCodeTypes', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { ct.handleCodeTypes(env, response); } }, delay || 50);
|
||||
ct.awaitingRefreshResponse = true;
|
||||
}
|
||||
ct.handleCodeTypes = function (env, response)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
env.$pnl.table.find('tbody tr').remove();
|
||||
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.codes = env.ajax.codes || { url: sbm.url.base + 'Codes/Code/Ajax/GetCodes', formSel: env.$frm.filter, callbackFn: function (response) { cd.handleCodes(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.codes = env.ajax.codes || { url: sbm.url.base + 'Codes/Code/Ajax/GetCodes', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { cd.handleCodes(env, response); } }, delay || 50);
|
||||
cd.awaitingRefreshResponse = true;
|
||||
}
|
||||
cd.handleCodes = function (env, response)
|
||||
|
||||
@@ -26,7 +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);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { co.doRefreshResults(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { co.doRefreshResults(env, response); } }, delay || 50);
|
||||
co.awaitingRefreshResponse = true;
|
||||
}
|
||||
co.doRefreshResults = function (env, response)
|
||||
|
||||
@@ -386,9 +386,19 @@
|
||||
{
|
||||
if (!ajax.noWaitIcon) sbm.hidePleaseWait();
|
||||
ajax.status = status;
|
||||
if (response.notification)
|
||||
sbm.showNotification(response.notification.title, response.notification.message, ajax.selNotifyParent);
|
||||
if (response.message)
|
||||
ajax.$msgs?.hide().empty();
|
||||
const notifyMsg = response.notifyMesage;
|
||||
if (notifyMsg)
|
||||
sbm.showNotification(notifyMsg.title, notifyMsg.message, ajax.selNotifyParent);
|
||||
let popupMsg = response.popupMessage;
|
||||
const inlineMsg = response.inlineMessage;
|
||||
if (inlineMsg)
|
||||
{
|
||||
console.log(ajax.$msgs, inlineMsg);
|
||||
if (ajax.$msgs?.length) ajax.$msgs.append($(`<div class="sbm-message sbm-${inlineMsg.error ? 'error' : inlineMsg.warning ? 'warn' : 'info'}">'${inlineMsg.text.replace('\n', '<br>')}</div>`)).fadeIn(500);
|
||||
else if (!popupMsg) popupMsg = { title: inlineMsg.error ? 'Error' : inlineMsg.warning ? 'Warning' : 'Info', text: inlineMsg.text };
|
||||
}
|
||||
if (popupMsg)
|
||||
{
|
||||
var fnCloseAlert = function ()
|
||||
{
|
||||
@@ -396,7 +406,7 @@
|
||||
if (response.goHome) return sbm.redirectHome();
|
||||
if (ajax.callbackFn) ajax.callbackFn(response);
|
||||
}
|
||||
sbm.doAlert(response.message.title, response.message.text, function () { fnCloseAlert(); });
|
||||
sbm.doAlert(popupMsg.title, popupMsg.text, function () { fnCloseAlert(); });
|
||||
}
|
||||
else if (response.sessionExpired)
|
||||
return sbm.redirectHomeExp();
|
||||
@@ -409,6 +419,7 @@
|
||||
{
|
||||
if (!ajax.noWaitIcon) sbm.hidePleaseWait();
|
||||
ajax.status = status;
|
||||
ajax.$msgs?.hide().empty();
|
||||
if (status == "abort") return;
|
||||
sbm.doAlert(sbm.dlg.title.alert, sbm.msg.somethingGoneWrong, sbm.redirectHome);
|
||||
},
|
||||
|
||||
@@ -26,7 +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);
|
||||
}
|
||||
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);
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Requirement/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { re.doRefreshResults(env, response); } }, delay || 50);
|
||||
re.awaitingRefreshResponse = true;
|
||||
}
|
||||
re.doRefreshResults = function (env, response)
|
||||
|
||||
@@ -26,7 +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);
|
||||
}
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Transaction/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { tr.displayItems(env, response); } }, delay || 50);
|
||||
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Transaction/Ajax/List', formSel: env.$frm.filter, $msgs: env.$pnl.msgs, callbackFn: function (response) { tr.displayItems(env, response); } }, delay || 50);
|
||||
tr.awaitingRefreshResponse = true;
|
||||
}
|
||||
tr.displayItems = function (env, response)
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
$pnl.table.find('tbody tr').remove();
|
||||
$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
|
||||
}
|
||||
vc.ajax.vehicleClasses = vc.ajax.vehicleClasses || { url: sbm.url.base + 'Assets/VehicleClass/Ajax/GetVehicleClasses', formId: $frm.filter.prop('id'), callbackFn: vc.handleVehicleClasses };
|
||||
vc.ajax.vehicleClasses = vc.ajax.vehicleClasses || { url: sbm.url.base + 'Assets/VehicleClass/Ajax/GetVehicleClasses', formId: $frm.filter.prop('id'), $msgs: env.$pnl.msgs, callbackFn: vc.handleVehicleClasses };
|
||||
sbm.doAjaxRequest(vc.ajax.vehicleClasses, delay || 50);
|
||||
vc.awaitingRefreshResponse = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user