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

92
Site/Security/AddUser.aspx
View File

@ -140,7 +140,7 @@
line-height: 30px;
margin-left: 20px;
margin-bottom: 15px;
width: 1000px !important;
width: 860px !important;
table-layout: fixed;
}
@ -211,6 +211,30 @@
var editableSelectMachine;
var loadingCount = 0;
function showmaskbg1(flag, noanimation) {
if (window.parent && typeof window.parent.onmaskbg == 'function') {
window.parent.onmaskbg(flag, noanimation);
}
$('#mask_bg').children().hide();
if (noanimation) {
$('#mask_bg').css('display', flag ? '' : 'none');
} else {
if (flag) {
$('#mask_bg').fadeIn(100);
} else {
$('#mask_bg').fadeOut(100);
}
}
}
function showAlert(msg, title, icon, next) {//覆盖FIC的showAlert
if (window.parent && typeof window.parent.showalert == 'function') {
window.parent.showalert(msg, title, icon, next);
} else {
_dialog.showAlert(msg, title, icon, next);
}
}
function userrequest(method, param, callback, error) {
_network.request("Security/AddUser.aspx", -1, method, param, callback, error || function (e) {
console.log(e);
@ -341,6 +365,8 @@
function OnAdd() {
avatarFile = null;
$("#btnNext").hide();
$("#btnPrevious").hide();
$('#span_tooltip').css('padding-top', 70);
$('#dialog_user_id').prop('disabled', false).val('');
$('#dialog_avatar').attr('src', _network.root + "titlelogo.ashx?tp=avatar&uid=0");
@ -408,7 +434,7 @@
}
var u = data;
user = data;
useritem = { IID: { Value: uid }, ExcelExports: true };
useritem = { IID: { Value: uid }, CanExportFile: true };
$('#dialog_user_id').prop('disabled', true).val(u.ID);
$('#dialog_avatar').attr('src', _network.root + "titlelogo.ashx?tp=avatar&uid=" + uid + "&sn=" + Math.random());
$('#dialog_user_name').val(u.DisplayName);
@ -420,7 +446,7 @@
'disabled': isMyself(u.IID)
});
$('#dialog_excelexports').on('change', function (e) {
useritem.ExcelExports = $(this).prop('checked');
useritem.CanExportFile = $(this).prop('checked');
});
$('#dialog_isuser').prop({
'checked': u.IsUser,
@ -892,6 +918,7 @@
uid = data[0];
init(uid);
}
reloadsubscribe();
if (userfiltertemplateloaded)
getUserFilterData();
if (assignmenloaded) {//assignment保存后，需要情况Filter的数据源
@ -930,7 +957,7 @@
}
$("#dialog_workorderfollower").prop("checked", data.WorkOrderFollower);
$("#dialog_excelexports").prop("checked", data.ExcelExports);
useritem.ExcelExports = data.ExcelExports;
useritem.CanExportFile = data.ExcelExports;
$("#dialog_accessallassets").prop("checked", data.AccessAllAssets);
if (data.AccessAllAssets) {
$('#tab_assignment .iconadd').hide();
@ -1004,15 +1031,15 @@
$('#tab_header_subscribe').show();
//$('#tab_header_security').show();
$('#tab_header_email').show();
$('#tab_header_filter').show();
if (!IsDealer)
if (!IsDealer) {
$('.cononly').show();
$('#tab_header_filter').show();
}
else
$('#tab_header_filter').hide();
// prepare subscribe message
var subscribe = new $subscribeMSGpanel();
subscribe.append($('#subscribe_message').empty(), uid, -1, null, true, 450);
//$('#subscribe_message').applyLanguageText(true);
scriber = subscribe;
reloadsubscribe();
OnEdit();
}
@ -1024,7 +1051,7 @@
//$('#tab_header_security').hide();
$('#tab_header_email').hide();
$('#tab_header_filter').hide();
if (!IsDealer)
if (!IsDealer)
$('.cononly').show();
}
$('#tab_header_info').click();
@ -1033,6 +1060,13 @@
assignmenloaded = false;
}
function reloadsubscribe() {
var subscribe = new $subscribeMSGpanel();
subscribe.append($('#subscribe_message').empty(), uid, -1, null, true, 450);
//$('#subscribe_message').applyLanguageText(true);
scriber = subscribe;
}
function getUsers() {
userrequest("GetUsers", JSON.stringify([-1, ""]), function (data) {
var users = [];
@ -1724,7 +1758,8 @@
for (var j = 0; j < feature.AvailablePermissions.length; j++) {
var pm = feature.AvailablePermissions[j];
td = $('<td style="width: 170px;text-align:right;"></td>');
td = $('<td style="text-align:right;"></td>');
td.css('width', (j == 1 || j == 2) ? 170 : 130);
tr.append(td);
var name = "";
if (pm === 0)
@ -1756,7 +1791,8 @@
td.append(ipt);
}
for (var k = feature.AvailablePermissions.length; k < 4; k++) {//目前最多4列，不足4列的补齐4列
td = $('<td style="width: 170px;text-align:right;"></td>');
td = $('<td></td>');
td.css('width', (k == 1 || k == 2) ? 170 : 130);
tr.append(td);
}
$("input:radio[name='feature_" + feature.Id + "'][value='" + features[i].Item2[0] + "']").prop("checked", true);
@ -1897,7 +1933,7 @@
$('#dialog_allowloginintoinspectmobile').prop('checked', false);
$('#dialog_allowloginintofleetmobile').prop('checked', false);
$('#dialog_mobileappbarcodescanner').prop('checked', false);
$('#dialog_excelexports').prop('checked', false);
//$('#dialog_excelexports').prop('checked', false);
}
else {
$('.tr_otheronly').show();
@ -2049,9 +2085,6 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div>
<div id="dialogmask" class="maskbg" style="display: none; z-index: 500;">
<div class="loading_icon icon c-spin"></div>
</div>
<div class="function_title">
<span class="sbutton iconsave" onclick="OnSave(0);" data-lgid="P_UM_SAVE">Save</span>
<span class="sbutton iconsave" onclick="OnSave(1);" data-lgid="P_UM_SAVE1">Save and Exit</span>
@ -2072,7 +2105,7 @@
<li id="tab_header_email" data-href="tab_email" onclick="reshowgrid()" data-lgid="P_UM_EMAILSUBSCRIBING">Email Subscribing</li>
<li id="tab_header_assignment" data-href="tab_assignment" class="cononly" onclick="onassignmentclick()" data-lgid="P_UM_ASSETASSIGNMENT" style="display: none;">Asset Assignment</li>
<li id="tab_header_message" data-href="tab_message" class="cononly" style="display: none;" data-lgid="P_UM_XXX">SMS Messages</li>
<li id="tab_header_filter" data-href="tab_filter" onclick="onuserfilterclick()" data-lgid="P_XXXX">Asset Alert Filter Templates</li>
<li id="tab_header_filter" data-href="tab_filter" onclick="onuserfilterclick()" data-lgid="P_XXXX" style="display: none;">Asset Alert Filter Templates</li>
</ul>
<div id="tab_userinfo" data-page="tab_userinfo">
<div id="div_userinfo" style="overflow: auto; min-width: 800px;">
@ -2197,7 +2230,7 @@
<tr id="tr_hourlyrate" style="display: none;">
<td class="label" data-lgid="P_UM_HOURLYRATE_COLON">Hourly Rate ($):</td>
<td>
<input type="text" id="dialog_hourlyrate" class="inputbox" maxlength="7" tabindex="11" autocomplete="off" /></td>
<input type="text" id="dialog_hourlyrate" maxlength="7" tabindex="11" autocomplete="off" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_UM_EMPLOYEEIDORFOB_COLON">Employee ID or FOB:</td>
@ -2315,7 +2348,7 @@
<div id="subscribe_message" style="overflow: auto; position: relative; padding-left: 50px; min-width: 1045px;"></div>
</div>
<div id="tab_security" data-page="tab_security" style="display: none">
<div id="security_message" style="position: relative; padding-left: 100px; overflow: auto; min-width: 800px;">
<div id="security_message" style="position: relative; padding-left: 20px; overflow: auto; min-width: 800px;">
</div>
</div>
<div id="tab_email" data-page="tab_email" style="display: none">
@ -2412,7 +2445,7 @@
<div id="div_filter" style="overflow: auto; min-width: 800px;">
<div style="margin: 9px 6px 10px 6px;">
<span class="title" data-lgid="P_XXXX">Filter Templates:</span>
<select id="sel_filtertemplate" style="width: 300px;"></select>
<select id="sel_filtertemplate" style="width: 300px; height: 20px;"></select>
<span class="sbutton iconadd" onclick="onOpenFilterTemplate(0);" data-lgid="P_UM_ADD"></span>
<span class="sbutton iconedit" onclick="onOpenFilterTemplate(1);" data-lgid="P_UM_EDIT"></span>
<span class="sbutton iconcopy" onclick="onOpenFilterTemplate(2);" data-lgid="P_IPT_COPY"></span>
@ -2461,6 +2494,9 @@
</div>
</div>
</div>
<div id="dialogmask" class="maskbg" style="display: none;">
<div class="loading_icon icon c-spin"></div>
</div>
</div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
@ -2477,7 +2513,7 @@
<div id="availableassetgrouplist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetSelectAssetGroups();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div class="clear"></div>
</div>
@ -2495,7 +2531,7 @@
<div id="availablejobsitelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetSelectJobSites();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -2512,7 +2548,7 @@
<div id="availableassettypelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetSelectAssetTypes();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -2529,7 +2565,7 @@
<div id="availablefilterassetgrouplist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetGroups();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div class="clear"></div>
</div>
@ -2547,7 +2583,7 @@
<div id="filteravailablejobsitelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectJobSites();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -2564,7 +2600,7 @@
<div id="filteravailableassettypelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetTypes();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -2582,7 +2618,7 @@
</table>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterTemplate();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>

54
Site/Security/CurfewManage.aspx
View File

@ -77,18 +77,6 @@
padding: 0;
}
#dialog_machinegroup {
z-index: 500;
width: 870px;
top: 60px;
left: 150px;
}
.inputbox {
width: 500px;
padding: 1px;
}
.group_table .main_table {
table-layout: fixed;
}
@ -207,16 +195,6 @@
margin-bottom: 1px;
vertical-align: middle;
}
.machine_maskbg {
top: 0;
left: 0;
width: 100%;
height: 100%;
position: absolute;
background: #000;
opacity: 0.2;
}
</style>
<script src="<%=GetFileUrlWithVersion("../js/assetselector.js")%>" type="text/javascript"></script>
<script>
@ -504,12 +482,12 @@
/*************************************************************************/
function OnMachineAdd() {
showmaskbg(true);
$("#dialogmask").show().children().hide();
dialogAssets.exceptSource = grid_dtsm.innerSource.map(function (s) {
return s.Values.ID;
});
dialogAssets.companyId = $('#sel_contractor').val();
dialogAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
var allMachines;
@ -523,7 +501,7 @@
var title = GetTextByKey("P_CM_ASSETASSIGNMENT", 'Asset Assignment');// + "&nbsp;&nbsp;&nbsp;&nbsp;" + jobsite.Name + "&nbsp;&nbsp;&nbsp;&nbsp;" + "Radius_UOM: " + jobsite.Radius_UOM
$('#dialog_managemahchine .dialog-title span.title').html(title);
$('.machine_maskbg').show();
showmaskbg(true);
$('#dialog_managemahchine')
.attr('init', 1)
.css({
@ -670,7 +648,7 @@
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -763,7 +741,7 @@
var title = GetTextByKey("P_CM_JOBSITEASSIGNMENT", "Jobsite Assignment");
$('#dialog_managejobsite .dialog-title span.title').html(title);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_managejobsite')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_managejobsite').height()) / 5,
@ -1066,7 +1044,7 @@
});
$('#dialog_managemahchine').dialog(function () {
$('.machine_maskbg').hide();
showmaskbg(false);
});
$('#dialog_managejobsite').dialog(function () {
@ -1100,7 +1078,7 @@
dialogAssets = new $assetselector('dialog_machines');
dialogAssets.onDialogClosed = function () {
showmaskbg(false);
$("#dialogmask").hide();
};
dialogAssets.onOK = function (source) {
var items = [];
@ -1124,9 +1102,8 @@
curfewid,
JSON.stringify(items.map(function (f) { return f.Values.ID; }))
];
$("#dialogmask").show();
$("#dialogmask").show().children().show();
curfewquery('AssignAssetsToUser', params.join(String.fromCharCode(170)), function (r) {
showmaskbg(false);
$("#dialogmask").hide();
if (r === 'OK') {
grid_dtsm.setData(grid_dtsm.innerSource.concat(items));
@ -1162,14 +1139,13 @@
<div class="clear"></div>
<div id="curfewlist"></div>
<div class="machine_maskbg" style="display: none;"></div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div class="dialog" id="dialog_managemahchine" style="display: none;">
<div id="dialogmask" class="maskbg" style="display: none; z-index: 1;">
<div class="loading_icon icon c-spin"></div>
</div>
<div class="dialog-title"><span class="title" data-lgid="P_CM_ASSETASSIGNMENT">Asset Assignment</span><em class="dialog-close"></em></div>
<div class="machine_filter" style="display: none">
<div class="machine_filter" style="display: none;">
<span data-lgid="P_CM_TYPE_COLON">Type: </span>
<select id="sel_machine_type" tabindex="20"></select>
<input type="text" id="txt_machine_key" tabindex="21" />
@ -1206,11 +1182,11 @@
<input type="button" onclick="OnSaveMachines();" value="OK" data-lgid="P_CM_OK" tabindex="27" style="display: none" />
<div class="clear"></div>
</div>
<div id="dialogmask" class="maskbg" style="display: none;">
<div class="loading_icon icon c-spin"></div>
</div>
</div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div class="dialog" id="dialog_curfew" style="display: none; height: 100%; border-bottom: 0; border-top: 0;">
<iframe id="iframecurfew" src="AddCurfew.aspx" style="width: 100%; height: 100%; display: block; border: none;"></iframe>
<div class="maskbg" style="display: none;"></div>
@ -1222,7 +1198,7 @@
</div>
<div class="dialog-title"><span class="title" data-lgid="P_CM_JOBSITEASSIGNMENT">Jobsite Assignment</span><em class="dialog-close"></em></div>
<div class="machine_filter">
<div class="machine_filter" style="margin: 9px 6px 7px">
<input type="text" id="txt_jobsite_key" style="margin-left: 8px; width: 280px;" tabindex="40" />
<input type="button" class="ybutton" id="button_jobsite_filter" data-lgid="P_CM_FILTER" value="Filter" tabindex="42" />
</div>

12
Site/Security/CurfewMovementTolerance.aspx
View File

@ -73,18 +73,6 @@
padding: 0;
}
#dialog_machinegroup {
z-index: 500;
width: 870px;
top: 60px;
left: 150px;
}
.inputbox {
width: 500px;
padding: 1px;
}
.group_table .main_table {
table-layout: fixed;
}

1
Site/Security/Security.master
View File

@ -76,7 +76,6 @@
function resizeContent() {
if ($('.content_main').length > 0)
$('.content_main').css('min-height', $(window).height() - $('.content_main').offset().top - 4);
$('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
}
$(window).resize(function () {

83
Site/Security/UserGroup.aspx
View File

@ -41,22 +41,6 @@
padding: 0;
}
#dialog_user_group {
z-index: 500;
top: 60px;
left: 150px;
}
.inputbox {
width: 500px;
padding: 1px;
}
#dialog_group_description {
padding: 2px;
height: 60px;
}
.group_table .main_table thead tr {
display: block;
}
@ -90,10 +74,13 @@
line-height: 30px;
margin-left: 20px;
margin-bottom: 15px;
width: 860px !important;
table-layout: fixed;
}
.td_module {
width: 200px;
width: 220px;
font-weight: bold;
}
.label { /*cover tab.css*/
@ -700,46 +687,96 @@
$('#security_message').append(div);
createFeatures(ft.Features);
}
WOFeaturesChange();
}
function createFeatures(features) {
var nonetext = GetTextByKey("P_UM_NONE", "None");
var readonlytext = GetTextByKey("P_UM_READONLY", "Read Only");
var fullcontroltext = GetTextByKey("P_UM_FULLCONTROL", "Full Control");
var requestonlytext = GetTextByKey("P_UM_REQUESTONLY", "Request Only");
var tb = $('<table class="table_module" style="width:640px;"></table>');
var mywotext = GetTextByKey("P_UM_XXX", "My Work Orders");
var locdeptext = GetTextByKey("P_UM_XXX", "My Location Or Department");
var tb = $('<table class="table_module" ></table>');
$('#security_message').append(tb);
for (var i = 0; i < features.length; i++) {
var feature = features[i].Item1;
var tr = $('<tr></tr>');
tb.append(tr);
var td = $('<td class="td_module"></td>').text(feature.CurrentName);
if ([239, 252, 253, 254, 255, 256, 257].indexOf(feature.Id) >= 0)
td.css('padding-left', 30);
tr.append(td);
for (var j = 0; j < feature.AvailablePermissions.length; j++) {
var pm = feature.AvailablePermissions[j];
td = $('<td style="width: 100px;"></td>');
td = $('<td style="text-align:right;"></td>');
td.css('width', (j == 1 || j == 2) ? 170 : 130);
tr.append(td);
var name = "";
if (pm === 0)
name = nonetext;
else if (pm === 1)
name = readonlytext;
else if (pm === 2)
name = mywotext;
else if (pm === 10)
name = requestonlytext;
else if (pm === 11) {
name = locdeptext;
td.css('width', 170);
}
else if (pm === 99999)
name = fullcontroltext;
var lab = $('<label></label>').text(name);
td.append(lab);
var ipt = $('<input type="radio" class="featureradio" />').attr('name', 'feature_' + feature.Id).val(pm).data('featureid', feature.Id);
ipt.change(function () {
WOFeaturesChange();
});
td.append(ipt);
}
for (var k = feature.AvailablePermissions.length; k < 4; k++) {//目前最多4列，不足4列的补齐4列
td = $('<td></td>');
td.css('width', (k == 1 || k == 2) ? 170 : 130);
tr.append(td);
}
$("input:radio[name='feature_" + feature.Id + "'][value='" + features[i].Item2[0] + "']").prop("checked", true);
td = $('<td></td>');
tr.append(td);
}
}
function WOFeaturesChange() {
var wopermission = $("input:radio[name='feature_210']:checked").val();
wopermission = parseInt(wopermission);
if (wopermission === 0) {
$("input:radio[name='feature_253']").prop("disabled", true);
$("input:radio[name='feature_254']").prop("disabled", true);
$("input:radio[name='feature_252']").prop("disabled", true);
$("input:radio[name='feature_255']").prop("disabled", true);
$("input:radio[name='feature_256']").prop("disabled", true);
$("input:radio[name='feature_239']").prop("disabled", true);
}
else if (wopermission === 1) {
$("input:radio[name='feature_253']").prop("disabled", false);
$("input:radio[name='feature_254']").prop("disabled", false);
$("input:radio[name='feature_252']").prop("disabled", true);
$("input:radio[name='feature_255']").prop("disabled", true);
$("input:radio[name='feature_256']").prop("disabled", true);
$("input:radio[name='feature_239']").prop("disabled", true);
}
else if (wopermission === 99999) {
$("input:radio[name='feature_253']").prop("disabled", false);
$("input:radio[name='feature_254']").prop("disabled", false);
$("input:radio[name='feature_252']").prop("disabled", false);
$("input:radio[name='feature_255']").prop("disabled", false);
$("input:radio[name='feature_256']").prop("disabled", false);
$("input:radio[name='feature_239']").prop("disabled", false);
}
}
/**************************End Security********************************/
/*****************************************************************************/
@ -776,7 +813,7 @@
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div class="dialog" id="dialog_user_group" style="display: none; z-index: 500; width: 840px;">
<div class="dialog" id="dialog_user_group" style="display: none; width: 950px;">
<div class="dialog-title"><span class="title" data-lgid="P_UG_ADDUSERGROUP">Add User Group</span><em class="dialog-close"></em></div>
<div class="dialog-content">
<div id="div_container">
@ -790,12 +827,12 @@
<tr style="height: 27px;">
<td class="label" data-lgid="P_UG_USERGROUPNAME_COLON">User Group Name:</td>
<td>
<input type="text" class="inputbox" id="dialog_group_name" tabindex="1" maxlength="100" /></td>
<input type="text" id="dialog_group_name" style="padding: 2px; width:320px;" tabindex="1" maxlength="100" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_UG_DESCRIPTION_COLON">Description:</td>
<td>
<textarea class="inputbox" id="dialog_group_description" tabindex="2" maxlength="200"></textarea></td>
<textarea id="dialog_group_description" style="padding: 2px; height: 60px; width:320px;" tabindex="2" maxlength="200"></textarea></td>
</tr>
</table>
<div class="dialog-subheader" data-lgid="P_UG_GROUPMEMBERS">Group Members</div>
@ -826,7 +863,7 @@
</table>
</div>
<div id="tab_security" data-page="tab_security" style="display: none">
<div id="security_message" style="padding-left: 50px; height: 440px; overflow: auto;">
<div id="security_message" style="padding-left: 20px; height: 440px; overflow: auto;">
</div>
</div>
<div class="mask_loading dialog" style="display: none;"></div>

16
Site/Security/UserManage.aspx
View File

@ -71,18 +71,6 @@
padding: 0;
}
#dialog_machinegroup {
z-index: 500;
width: 870px;
top: 60px;
left: 150px;
}
.inputbox {
width: 500px;
padding: 1px;
}
.group_table .main_table {
table-layout: fixed;
}
@ -1501,7 +1489,7 @@
if (v) {
isSelect = true;
copyuseriid = v.IID;
$('#mask_bg').show();
showmaskbg(true);
$('#tr_copyuser').hide();
$('#dialog_copy_user')
.css({
@ -1512,7 +1500,7 @@
}
else {
isSelect = false;
$('#mask_bg').show();
showmaskbg(true);
$('#tr_copyuser').show();
var source = [];
if (isalluser) {

39
Site/Security/js/adduser.js
View File

@ -12,7 +12,7 @@ $(function () {
dialogAUAssets.allowhidden = false;
dialogAUAssets.allowotherfilter = false;
dialogAUAssets.onDialogClosed = function () {
showbg(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showbg
showmaskbg1(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showmaskbg1
};
dialogAUAssets.onOK = function (source) {
var items = [];
@ -32,19 +32,19 @@ $(function () {
}
}
grid_dtassets.setData(grid_dtassets.innerSource.concat(items));
showbg(false);
showmaskbg1(false);
};
$('#dialog_assetgroup').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_jobsite').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_assettype').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$("#txt_assetgroup_key").keypress(onAssetGroupKeyPress);
@ -91,7 +91,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -160,12 +160,11 @@ function OnAssetAdd() {
}
function OnAssetAdd1() {
showbg(true);
showmaskbg1(true);
dialogAUAssets.exceptSource = grid_dtassets.innerSource.map(function (s) {
return s.Values.ID;
});
dialogAUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnMachineDelete() {
@ -225,7 +224,7 @@ function InitGridSelectedMachineGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -289,7 +288,7 @@ function InitGridAvailableMachineGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -408,7 +407,7 @@ function OnAssetGroupAdd() {
function OnAssetGroupAdd1() {
$('#txt_assetgroup_key').val('');
$('#dialog_assetgroup .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETGROUPS", 'Select Asset Groups'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_assetgroup')
.attr('act', 'edit')
.css({
@ -431,7 +430,7 @@ function OnSetSelectAssetGroups() {
}
showSelectedMachineGroup(_selectedAssetGroups);
$('#dialog_assetgroup').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnAssetGroupDelete() {
@ -474,7 +473,7 @@ function InitGridSelectedJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -539,7 +538,7 @@ function InitGridAvailableJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -665,7 +664,7 @@ function OnJobsiteAdd() {
function OnJobsiteAdd1() {
$('#txt_jobsite_key').val('');
$('#dialog_jobsite .dialog-title span.title').text(GetTextByKey("P_UM_SELECTJOBSITES", 'Select Jobsites'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_jobsite')
.attr('act', 'edit')
.css({
@ -687,7 +686,7 @@ function OnSetSelectJobSites() {
}
showSelectedJobsite(_selectedJobsites);
$('#dialog_jobsite').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnJobsiteDelete() {
@ -732,7 +731,7 @@ function InitGridSelectedAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -797,7 +796,7 @@ function InitGridAvailableAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -923,7 +922,7 @@ function OnAssetTypeAdd() {
function OnAssetTypeAdd1() {
$('#txt_assettype_key').val('');
$('#dialog_assettype .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETTYPES", 'Select Asset Types'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_assettype')
.attr('act', 'edit')
.css({
@ -945,7 +944,7 @@ function OnSetSelectAssetTypes() {
}
showSelectedAssetType(_selectedAssetTypes);
$('#dialog_assettype').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnAssetTypeDelete() {

49
Site/Security/js/userfilter.js
View File

@ -13,7 +13,7 @@ $(function () {
dialogFUAssets.allowotherfilter = false;
dialogFUAssets.uid = uid;
dialogFUAssets.onDialogClosed = function () {
showbg(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showbg
showmaskbg1(false);//showmaskbg被FIC里面的覆盖，使用showmaskbg1
};
dialogFUAssets.onOK = function (source) {
var items = [];
@ -58,23 +58,23 @@ $(function () {
}
grid_dtfilterassets.setData(grid_dtfilterassets.innerSource.concat(items));
showbg(false);
showmaskbg1(false);
};
$('#dialog_filterassetgroup').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filterjobsite').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filterassettype').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filtertemplate').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$("#sel_filtertemplate").change(function () {
@ -121,7 +121,7 @@ function InitGridFilterSelectedAssets() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -173,13 +173,12 @@ function OnFilterAssetAdd() {
if (!filterid)
return;
showbg(true);
showmaskbg1(true);
dialogFUAssets.uid = uid;
dialogFUAssets.exceptSource = grid_dtfilterassets.innerSource.map(function (s) {
return s.Values.ID;
return s.Values.ID || s.Values.Id;
});
dialogFUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnFilterMachineDelete() {
@ -228,7 +227,7 @@ function InitGridFilterSelectedAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -292,7 +291,7 @@ function InitGridFilterAvailableAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -398,7 +397,7 @@ function OnFilterAssetGroupAdd() {
return;
$('#txt_filterassetgroup_key').val('');
$('#dialog_filterassetgroup .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETGROUPS", 'Select Asset Groups'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterassetgroup')
.attr('act', 'edit')
.css({
@ -434,7 +433,7 @@ function OnSetFilterSelectAssetGroups() {
showFilterSelectedAssetGroup(assetgroups);
$('#dialog_filterassetgroup').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetGroupDelete() {
@ -482,7 +481,7 @@ function InitGridFilterSelectedJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -547,7 +546,7 @@ function InitGridFilterAvailableJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -656,7 +655,7 @@ function OnFilterJobsiteAdd() {
$('#txt_filterjobsite_key').val('');
$('#dialog_filterjobsite .dialog-title span.title').text(GetTextByKey("P_UM_SELECTJOBSITES", 'Select Jobsites'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterjobsite')
.attr('act', 'edit')
.css({
@ -692,7 +691,7 @@ function OnSetFilterSelectJobSites() {
showFilterSelectedJobsite(jobsites);
$('#dialog_filterjobsite').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterJobsiteDelete() {
@ -742,7 +741,7 @@ function InitGridFilterSelectedAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -807,7 +806,7 @@ function InitGridFilterAvailableAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -917,7 +916,7 @@ function OnFilterAssetTypeAdd() {
$('#txt_filterassettype_key').val('');
$('#dialog_filterassettype .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETTYPES", 'Select Asset Types'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterassettype')
.attr('act', 'edit')
.css({
@ -954,7 +953,7 @@ function OnSetFilterSelectAssetTypes() {
showFilterSelectedAssetType(assettypes);
$('#dialog_filterassettype').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetTypeDelete() {
@ -1069,7 +1068,7 @@ function OnAddFilterTemplate() {
tile = GetTextByKey('P_XXXX', 'Copy Filter Template');
$('#dialog_filtertemplate .dialog-title span.title').text(tile);
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filtertemplate')
.attr('act', 'add')
.css({
@ -1084,7 +1083,7 @@ function OnEditFilterTemplate() {
$('#dialog_filtertemplatename').val('');
$('#dialog_filtertemplate .dialog-title span.title').text(GetTextByKey('P_XXXX', 'Edit Filter Template'));
var tempname = $('#sel_filtertemplate').find("option:selected").text();
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filtertemplate')
.attr('act', 'edit')
.css({
@ -1129,7 +1128,7 @@ function OnSetFilterTemplate() {
}
$('#dialog_filtertemplate').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}

2
Site/Security/js/usermanage.js
View File

@ -359,7 +359,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,