This commit is contained in:
2023-05-05 17:05:23 +08:00
parent d831a707ae
commit e728c66786
25 changed files with 150 additions and 144 deletions

View File

@ -212,6 +212,18 @@
_network.request("JobSite/AddJobSite.aspx?tp=ashx", -1, method, param, callback, error, nolog);
}
function showConfirm1(msg, title, fok, fcancel) {
$("#dialogmask").show();
_dialog.showConfirm(msg, title, function (e) {
$("#dialogmask").hide();
if (typeof fok === 'function') {
fok(e);
}
}, function () {
$("#dialogmask").hide();
});
}
function OnAdd() {
jobsiteid = undefined;
jobsiteitem = undefined;
@ -1781,15 +1793,14 @@
}
function OnSiteChanging(item, input) {
var checked = $(input).prop('checked');
var input_chk = $(input).closest('td').find('input');
var checked = $(input_chk).prop('checked');
var text = GetTextByKey("P_JS_ONSITETIPS", "You have manually assigned a jobsite. This action will disable geofence alerts and jobsite auto-assignment. Do you want to proceed? ");
if (!checked)
text = GetTextByKey("P_JS_ONSITETIPS1", "Are you sure you want to change the on-site of the asset:{0}?").replace('{0}', item.Name);
$("#dialogmask").show();
showConfirm(text, GetTextByKey("P_JS_ONSITECHANGE", "On Site Change"), function () {
$("#dialogmask").hide();
$(input).prop('checked', !$(input).prop('checked')).change();
showConfirm1(text, GetTextByKey("P_JS_ONSITECHANGE", "On Site Change"), function () {
$(input_chk).prop('checked', !$(input_chk).prop('checked')).change();
});
}
@ -1876,7 +1887,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 60, 'text-align': 'center' } },
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 70, 'text-align': 'center' } },
{ name: 'DisplayName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'Name', css: { 'width': 170, 'text-align': 'left' } },
{ name: 'MakeName', caption: GetTextByKey("P_JS_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 90, 'text-align': 'left' } },
{ name: 'ModelName', caption: GetTextByKey("P_JS_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 90, 'text-align': 'left' } },