tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Chen Lily
2023-05-30 17:34:56 +08:00
parent e728c66786
commit 9da1c4cf30
194 changed files with 10680 additions and 9060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Site/JobSite/AddJobSite.aspx
View File

@ -580,10 +580,13 @@
if (!sel || sel == "")
exists = true;
showloading(true);
var selector = $('#dialog_region');
var selCurrent = selector.val();
selector.empty();
_network.jobsitequery('GetRegions', '', function (data) {
showloading(false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_AM_ERROR", 'Error'));
return;
@ -606,6 +609,8 @@
selector.val(sel);
else if (selCurrent)
selector.val(selCurrent);
}, function () {
showloading(false);
});
}
@ -1730,6 +1735,7 @@
var dialogAssets = new $assetselector('dialog_machines');
dialogAssets.jobsiteId = jobsiteid;
dialogAssets.allowotherfilter = false;
dialogAssets.onDialogClosed = function () {
$('#dialogmask').hide();
$('#dialog_machines').remove();
@ -1761,7 +1767,7 @@
function OnMachineDeleteSingle(item) {
$("#dialogmask").show();
var alerttitle = GetTextByKey("P_JS_ASSETASSIGNMENT", "Asset Assignment");
showConfirm(GetTextByKey("P_JS_DELETEASSIGNEDASSET", 'Are you sure you want to delete the assigned asset:{0}?').replace('{0}', item.Name), alerttitle, function () {
showConfirm1(GetTextByKey("P_JS_DELETEASSIGNEDASSET", 'Are you sure you want to delete the assigned asset:{0}?').replace('{0}', item.Name), alerttitle, function () {
var params = [
'', jobsiteid,
JSON.stringify([item.AssetId])
@ -1794,7 +1800,9 @@
function OnSiteChanging(item, input) {
var input_chk = $(input).closest('td').find('input');
var checked = $(input_chk).prop('checked');
var checked = !$(input_chk).prop('checked');
if (navigator.userAgent.toUpperCase().indexOf("FIREFOX") >= 0)
checked = !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);
@ -1830,7 +1838,7 @@
return;
}
$('#mask_bg').show();
showmaskbg(true);
$('#machine-name').text(jobsiteitem.Name);
_selectedMachines = jobsiteitem.Machines == null ? [] : jobsiteitem.Machines;
_showSelectedMachines = jobsiteitem.Machines == null ? [] : jobsiteitem.Machines;
@ -1843,7 +1851,7 @@
.css({
'top': (document.documentElement.clientHeight - $('#dialog_managemahchine').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_managemahchine').width()) / 2
}).showDialog();
}).showDialogfixed();
grid_dtsm.setData([]);
$('#selectedmachinelist input[type="checkbox"]').prop('checked', false);