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

7
Site/AssetView/AssetMapView.aspx.cs
View File

@ -161,7 +161,7 @@ public partial class AssetMapView : ContractorBasePage
if (SystemParams.IsDealer)
{
AssetBasicInfo m = null;
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
if (string.IsNullOrEmpty(machineid))
{
m = client.FromAdminAssetBasicInfoByVin(vin);
@ -190,11 +190,14 @@ public partial class AssetMapView : ContractorBasePage
private string GetCompanyID(string machineid, string vin)
{
var session = GetCurrentLoginSession();
if (session == null)
return null;
string companyid = "";
if (SystemParams.IsDealer)
{
AssetBasicInfo m = null;
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
if (string.IsNullOrEmpty(machineid))
{
m = client.FromAdminAssetBasicInfoByVin(vin);

103
Site/AssetView/AssetTimeline.aspx
View File

@ -1,47 +1,54 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/AssetView/AssetViewBase.master" AutoEventWireup="true" CodeFile="AssetTimeline.aspx.cs" Inherits="AssetView_AssetTimeline" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
<link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
<script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
<style type="text/css">
.table-container {
margin: 4px 10px 0 26px;
}
.table-timeline {
width: 100%;
border-spacing: 0;
table-layout: fixed;
}
.table-timeline th {
width: 4.17%;
border-right: 1px solid white;
background: #444;
color: white;
font-weight: normal;
font-size: 13px;
height: 26px;
}
.table-timeline th,
.table-timeline td {
padding: 0;
}
.table-timeline th {
width: 4.17%;
border-right: 1px solid white;
background: #444;
color: white;
font-weight: normal;
font-size: 13px;
height: 26px;
}
.table-timeline th,
.table-timeline td {
padding: 0;
}
#td-timeline {
height: 30px;
position: relative;
}
#td-timeline div {
height: 26px;
position: absolute;
background: #64965a;
top: 2px;
border-radius: 6px;
}
#td-timeline div.no-start {
border-radius: 0 6px 6px 0;
}
#td-timeline div.no-end {
border-radius: 6px 0 0 6px;
}
#td-timeline div {
height: 26px;
position: absolute;
background: #64965a;
top: 2px;
border-radius: 6px;
}
#td-timeline div.no-start {
border-radius: 0 6px 6px 0;
}
#td-timeline div.no-end {
border-radius: 6px 0 0 6px;
}
</style>
<script type="text/javascript">
_network.root = '<%=Page.ResolveUrl("~/")%>';
@ -143,7 +150,7 @@
}
function OnRefresh(dt) {
if (dict.id != null) {
if (dict && dict.id != null) {
getAssetTimeline(dict.id, dt);
}
}
@ -159,15 +166,19 @@
}
</script>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div class="table-container">
<div style="width: 100px; float: left">
<table class="table-timeline">
<thead>
<tr><th data-lgid="P_MV_TYPE">Type</th></tr>
<tr>
<th data-lgid="P_MV_TYPE">Type</th>
</tr>
</thead>
<tbody>
<tr><td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td></tr>
<tr>
<td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td>
</tr>
</tbody>
</table>
</div>
@ -175,12 +186,30 @@
<table class="table-timeline">
<thead>
<tr id="tr-header">
<th>0:00</th><th>1:00</th><th>2:00</th><th>3:00</th>
<th>4:00</th><th>5:00</th><th>6:00</th><th>7:00</th>
<th>8:00</th><th>9:00</th><th>10:00</th><th>11:00</th>
<th>12:00</th><th>13:00</th><th>14:00</th><th>15:00</th>
<th>16:00</th><th>17:00</th><th>18:00</th><th>19:00</th>
<th>20:00</th><th>21:00</th><th>22:00</th><th>23:00</th>
<th>0:00</th>
<th>1:00</th>
<th>2:00</th>
<th>3:00</th>
<th>4:00</th>
<th>5:00</th>
<th>6:00</th>
<th>7:00</th>
<th>8:00</th>
<th>9:00</th>
<th>10:00</th>
<th>11:00</th>
<th>12:00</th>
<th>13:00</th>
<th>14:00</th>
<th>15:00</th>
<th>16:00</th>
<th>17:00</th>
<th>18:00</th>
<th>19:00</th>
<th>20:00</th>
<th>21:00</th>
<th>22:00</th>
<th>23:00</th>
</tr>
</thead>
<tbody>

10
Site/AssetView/AssetViewBase.master
View File

@ -86,16 +86,6 @@
$(document.body).click(window.parent.ondocumentclick);
}
function resizeContent() {
$('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
}
$(window).resize(function () {
resizeContent();
});
//window.onresize = resizeContent;
resizeContent();
window.ondocumentclick = function (e) {
$(document.body).click();
};

2
Site/AssetView/SingleAssetView.aspx
View File

@ -473,7 +473,7 @@
setTimeout(function () {
timelineLoaded = true;
OnRefresh();
});
},100);
});
$('#div_timeline').show();
}

4
Site/AssetView/js/assetpm.js
View File

@ -61,7 +61,7 @@ function InitPMGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'PmScheduleName', caption: GetTextByKey("P_MV_SCHEDULENAME", "Schedule Name"), valueIndex: 'PmScheduleName', css: { 'width': 200, 'text-align': 'left' } },
{ name: 'StartValue', caption: GetTextByKey("P_MV_INITIALSERVICEVALUE", "Initial Service Value"), valueIndex: 'StartValue', css: { 'width': 120, 'text-align': 'right' } },
{ name: 'LastAlertTimeString', caption: GetTextByKey("P_MV_LASTSERVICEDATE", "Last Service Date"), valueIndex: 'LastAlertTimeString', css: { 'width': 120, 'text-align': 'left' } },
@ -454,7 +454,7 @@ function createTBMContent(contentctrl, pmschedule) {
item.PmScheduleID = pmschedule.PmScheduleID;
//item.PMType = pmschedule.PmScheduleType;
if (radio1.prop("checked")) {
item.StartDate = nowdate;
item.StartDate = currentdate;
}
else {
item.StartDate = txtLastServiceDate.val();

14
Site/Contact/ManageContact.aspx
View File

@ -204,7 +204,7 @@
$('#dialog_textaddress').val('');
$('#dialog_contact .dialog-title span.title').text('Add Contact');
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_contact')
.attr('act', 'add')
.css({
@ -233,7 +233,7 @@
$('#dialog_textaddress').val(contact.TextAddress);
$('#dialog_contact .dialog-title span.title').text('Edit Contact');
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_contact')
.attr('act', 'edit')
.css({
@ -445,7 +445,7 @@
var title = "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);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_managemahchine')
.css({
'height': 500,
@ -766,7 +766,7 @@
var title = "Jobsite Assignment";
$('#dialog_managejobsite .dialog-title span.title').html(title);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_managejobsite')
.css({
'height': 500,
@ -1076,15 +1076,15 @@
$('#dialog_contact').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#dialog_managemahchine').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#dialog_managejobsite').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#sel_machine_type').change(getMatchAvailableMachines);

1
Site/Credentials/Credentials.master
View File

@ -66,7 +66,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 () {

6
Site/Credentials/ManageAPICredential.aspx
View File

@ -88,7 +88,7 @@
$('#dialog_apitokensecret').val('');
$('#dialog_enabled').attr('checked', false);
$('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_APICRE_ADDMANUFACTURE", 'Add Credential'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'add')
.css({
@ -166,7 +166,7 @@
$('#dialog_enabled').attr("checked", cre.IsEnabled);
$('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_APICRE_EDITMANUFACTURE", 'Edit Credential'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'edit')
.css({
@ -381,7 +381,7 @@
setInput(dic);
})
$('#dialog_credential').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
OnRefresh();
$(window).resize(function () {

6
Site/Credentials/ManageCredential.aspx
View File

@ -83,7 +83,7 @@
$('#dialog_orgid').val('');
$('#dialog_notes').val('');
$('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_CRE_ADDMANUFACTURE", 'Add Credential'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'add')
.css({
@ -111,7 +111,7 @@
$('#dialog_orgid').val(cre.OrgnizationID);
$('#dialog_notes').val(cre.Notes);
$('#dialog_credential .dialog-title span.title').text(GetTextByKey("P_CRE_EDITMANUFACTURE", 'Edit Credential'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'edit')
.css({
@ -277,7 +277,7 @@
InitGridData();
$('#dialog_credential').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
OnRefresh();
$(window).resize(function () {

4
Site/Credentials/ManageJDLink.aspx
View File

@ -355,7 +355,7 @@
function OnAddNotification() {
$('#dialog_displayname').val('');
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'add')
.css({
@ -613,7 +613,7 @@
OnRefreshNotification();
$('#dialog_credential').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#dialog_myorganization').dialog(function () {

4
Site/Credentials/ManageJDNotifications.aspx
View File

@ -70,7 +70,7 @@
$('#dialog_Verifierd').val('');
$('#dialog_displayname').val('');
$('#dialog_password').val('');
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_credential')
.attr('act', 'add')
.css({
@ -232,7 +232,7 @@
InitGridData();
$('#dialog_credential').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
OnRefresh();
$(window).resize(function () {

15
Site/FITracker.aspx
View File

@ -306,14 +306,14 @@
function OnEditAccuracy() {
if (deviceid == undefined || deviceid <= 0) return;
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_accuracy')
.attr('act', 'add')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_accuracy').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_accuracy').width()) / 2
})
.showDialog();
.showDialogfixed();
$('#dialog_accuracyvalue').val($("#txtAccuracy").val()).select();
}
@ -340,7 +340,6 @@
else {
$("#txtAccuracy").val(accuracy);
deviceinfovm.device.AcceptableAccuracy = accuracy;
$('#mask_bg').hide();
$('#dialog_accuracy').hideDialog();
}
}, function (err) {
@ -496,7 +495,7 @@
}
function sendLocation() {
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_map')
.attr('act', 'add')
.css({
@ -516,7 +515,7 @@
msg += "Location";
postMessage(msg, 2);
$('#dialog_map').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
}
else {
showAlert(GetTextByKey("P_M3_PLEASESELECTALOCATIONTOSENDTO", 'Please select a location to send to.'), GetTextByKey("P_M3_SENDLOCATION", 'Send Location'));
@ -734,11 +733,11 @@
});
$('#dialog_map').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#dialog_accuracy').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
loadMap();
@ -889,7 +888,7 @@
<tr>
<td class="label" style="width: 100px;" data-lgid="P_M3_NOTE_COLON">Note:</td>
<td>
<textarea id="dialog_accuracynote" class="inputbox" maxlength="1000" tabindex="51" style="width: 240px; height: 100px; max-width: unset;"></textarea>
<textarea id="dialog_accuracynote" maxlength="1000" tabindex="51" style="width: 240px; height: 100px; max-width: unset;"></textarea>
</td>
</tr>
</table>

18
Site/Inspection/FuelReport.aspx
View File

@ -214,12 +214,12 @@
function showRightPopup(state) {
if (state) {
$('#content').css('overflow', 'hidden');
$("#mask_bg").show();
showmaskbg(true);
$("#right_popup").css("left", $("#set_left").width()).show();
}
else {
$('#content').css('overflow', '');
$("#mask_bg").hide();
showmaskbg(false);
$("#right_popup").hide();
}
}
@ -355,7 +355,7 @@
{ name: 'UID', caption: GetTextByKey("P_IPT_CONTACTNAME", "Contact Name"), valueIndex: 'UID', css: { 'width': 320, 'text-align': 'left' } },
//{ name: 'ContactType', caption: GetTextByKey("P_IPT_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactType', css: { 'width': 148, 'text-align': 'left' } },
//{ name: 'Text', caption: GetTextByKey("P_MV_TEXT", "Text"), valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } }
{ name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 60, 'text-align': 'center' } }
];
var columns = [];
// head
@ -428,7 +428,7 @@
GetFuelReport();
$('#dialog_sendemail').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#sendlocation_search').bind('input propertychange', function () {
@ -510,6 +510,7 @@
emails.push(m);
}
}
emails = emails.sort(function (a, b) { return (b.Selected ? 1 : 0) - (a.Selected ? 1 : 0) })
showEmailList(emails);
}
}
@ -526,9 +527,8 @@
$('#sendlocation_otheremailaddress').val('');
$('#sendlocation_desc').val('');
$('#mask_bg').show();
$('#dialog_sendemail .dialog-title span.title').text(GetTextByKey("P_IPT_SENDEMAIL", 'Send Email'));
//$('#mask_bg').show();
showmaskbg(true);
$('#dialog_sendemail')
.attr('act', 'edit')
.css({
@ -546,7 +546,7 @@
function onSendEmail() {
if (grid_dtemail.source.length == 0) {
$('#dialog_sendemail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
return;
}
@ -570,7 +570,7 @@
if (emailaddress.length == 0) {
$('#dialog_sendemail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
return;
}
@ -582,7 +582,7 @@
else {
//showAlert(GetTextByKey("P_IPT_MESSAGESENT", 'Message sent.'), GetTextByKey("P_IPT_SENDEMAIL", 'Send Email'));
$('#dialog_sendemail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
}
}, function (err) {

132
Site/Inspection/Inspection.aspx
View File

@ -96,11 +96,11 @@
function showRightPopup(state) {
if (state) {
$("#mask_bg").show();
showmaskbg(true);
$("#right_popup").css("left", $("#set_left").width()).show();
}
else {
$("#mask_bg").hide();
showmaskbg(false);
$("#right_popup").hide();
}
}
@ -122,6 +122,34 @@
iframe.contentWindow.print();
}
function openPrintFrame(rid) {
if (navigator.userAgent.indexOf('Firefox') >= 0 ||
navigator.userAgent.indexOf('Opera') >= 0) {
setTimeout(function () {
window.open("Inspection.aspx?rt=f&t=2&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
});
}
else {
var frame = $("<iframe style='display:none;'></iframe>");
$(document.body).after(frame);
frame.attr('src', "Inspection.aspx?rt=f&t=2&id=" + rid);
frame.on('load', function () {
setTimeout(function () {
frame[0].contentWindow.print();
});
setTimeout(function () {
frame.remove();
}, 60000);
});
}
}
function openDownloadFrame(rid) {
setTimeout(function () {
window.open("Inspection.aspx?rt=f&t=1&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
});
}
function createSubMenus(items) {
var maintenancesubmenu = $("#inspectsubmenu").empty();
var ulsubmenus = $('<ul class="lefttitlemenu_ul" style="line-height:32px;"></ul>');
@ -145,8 +173,8 @@
return;
}
var items = [{ ID: 'templates/0', Title: GetTextByKey("P_DRAFT", "Draft") },
{ ID: 'templates/1', Title: GetTextByKey("P_PUBLISHED", "Published") },
{ ID: 'layouts/0', Title: GetTextByKey("P_LAYOUTS", "Layouts") }];
{ ID: 'templates/1', Title: GetTextByKey("P_PUBLISHED", "Published") },
{ ID: 'layouts/0', Title: GetTextByKey("P_LAYOUTS", "Layouts") }];
createSubMenus(items);
var left = $(this).offset().left;
@ -172,7 +200,7 @@
return;
}
var items = [{ ID: 'exportpackages', Title: GetTextByKey("P_IPT_EXPORTPACKAGES", "Export Packages") },
{ ID: 'importpackages', Title: GetTextByKey("P_IPT_IMPORTPACKAGES", "Import Packages") }];
{ ID: 'importpackages', Title: GetTextByKey("P_IPT_IMPORTPACKAGES", "Import Packages") }];
createSubMenus(items);
var left = $(this).offset().left;
@ -190,6 +218,25 @@
});
return false;
});
$('#nav_temparrow').click(function () {
var flag = !$('#nav_temparrow').prop('isexpanded');
var left_flag = !$('#set_left').prop('isexpanded');
$('#nav_temparrow').stop()
.prop('isexpanded', flag);
if (flag)
$('#set_left').find(".tempdesign").show();
else
$('#set_left').find(".tempdesign").hide();
if (left_flag)
$('#span_tempdesign').hide();
$('#nav_temparrow div').attr('class', 'icn')
.addClass(flag ? 'expand' : 'collapse');
});
$('#nav_temparrow').click();
});
</script>
</asp:Content>
@ -199,9 +246,44 @@
<li id="nav_arrow">
<div class="icn collapse"></div>
</li>
<%if (ShowReport)
{%>
<li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
<div>
<em class="fa icon-menu icon-report"></em>
</div>
<span data-lgid="P_INSPECTIONS">Inspections</span></a>
</li>
<%} %>
<%if (ShowFuelLog)
{%>
<li class="nav_item" data-module="fuellog" data-title-lgid="P_IPT_FUELLOG"><a href="#fuellog">
<div>
<em class="fa icon-menu icon-fuellog"></em>
</div>
<span data-lgid="P_IPT_FUELLOG">Fuel Log</span></a>
</li>
<%} %>
<%if (ShowReport || ShowFuelLog)
{%>
<li style="height: 10px;">
<hr style="background-color: #d8d8d8; border: none; height: 1px;" />
</li>
<%} %>
<%if (ShowGlobalSections || ShowTemplate)
{%>
<li id="nav_temparrow">
<div class="icn expand"></div>
<span id="span_tempdesign" class="subitem" data-lgid="P_XXX" style="margin-left: 15px; font-weight: bold;">Template Design</span>
</li>
<%} %>
<%if (ShowGlobalSections)
{%>
<li class="nav_item" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections">
<li class="nav_item tempdesign" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections" style="padding-left: 10px;">
<div>
<em class="fa icon-menu icon-sections"></em>
</div>
@ -210,23 +292,23 @@
<%} %>
<%if (ShowTemplate)
{%>
<li class="nav_item" data-title-lgid="P_TEMPLATES"><a id="atemplates">
<li id="litem" class="nav_item tempdesign" data-title-lgid="P_TEMPLATES"><a id="atemplates" style="padding-left: 10px;">
<div>
<em class="fa icon-menu icon-templates"></em>
</div>
<span data-lgid="P_TEMPLATES">Templates</span></a>
</li>
<li class="nav_item subitem" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
<li class="nav_item subitem tempdesign" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_DRAFT">Draft</span></a>
</li>
<li class="nav_item subitem" data-module="templates/1" data-title-lgid="P_PUBLISHED" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
<li class="nav_item subitem tempdesign" data-module="templates/1" data-title-lgid="P_PUBLISHED" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_PUBLISHED">Published</span></a>
</li>
<li class="nav_item subitem" data-module="layouts/0" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/0">
<li class="nav_item subitem tempdesign" data-module="layouts/0" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/0">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_LAYOUTS">Layouts</span></a>
@ -256,32 +338,6 @@
</li>
<%} %>
<%} %>
<%if (ShowReport || ShowFuelLog)
{%>
<li style="height: 10px;">
<hr style="background-color: #d8d8d8; border: none; height: 1px;" />
</li>
<%} %>
<%if (ShowReport)
{%>
<li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
<div>
<em class="fa icon-menu icon-report"></em>
</div>
<span data-lgid="P_INSPECTIONS">Inspections</span></a>
</li>
<%} %>
<%if (ShowFuelLog)
{%>
<li class="nav_item" data-module="fuellog" data-title-lgid="P_IPT_FUELLOG"><a href="#fuellog">
<div>
<em class="fa icon-menu icon-fuellog"></em>
</div>
<span data-lgid="P_IPT_FUELLOG">Fuel Log</span></a>
</li>
<%} %>
</ul>
<div class="hostmask maskbg" style="display: none;"></div>
</div>
@ -297,7 +353,9 @@
<div class="trigle white" style="left: -12px; right: auto;"></div>
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div id="right_popup" style="display: none; position: absolute; left: 250px; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;">
</div>
<div id="right_popup1" style="display: none; position: absolute; left: 250px; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;"></div>

70
Site/Inspection/Report.aspx
View File

@ -60,7 +60,7 @@
.page {
/*background-color: #d3d3d3;*/
/*height: 52px;*/
line-height: 52px;
line-height: 25px;
margin-top: 8px;
padding-left: 10px;
padding-right: 10px;
@ -72,7 +72,7 @@
.section {
/*background-color: #eaeaea;*/
/*height: 40px;*/
line-height: 40px;
line-height: 20px;
padding-left: 30px;
padding-right: 10px;
font-size: 20px;
@ -81,8 +81,8 @@
}
.question {
min-height: 30px;
line-height: 30px;
min-height: 24px;
line-height: 24px;
padding-left: 70px;
padding-right: 10px;
font-size: 14px;
@ -92,12 +92,21 @@
}
.answer {
min-height: 30px;
line-height: 30px;
min-height: 24px;
line-height: 24px;
padding-left: 90px;
padding-right: 10px;
}
.table_content {
padding-left: 3px;
padding-right: 3px;
}
.pagedoublespace {
line-height: 50px;
}
.media {
width: 120px;
height: 120px;
@ -176,6 +185,33 @@
display: block;
}
}
.question_line {
border-collapse: collapse;
border-top: 1px solid #dbdbdb;
border-bottom: 1px solid #dbdbdb;
}
.question_table_grid {
border-collapse: collapse;
}
.question_table_grid td {
border: 1px solid #dbdbdb;
}
.question_div_grid {
border: 1px solid #dbdbdb;
}
.mediacaption {
text-align: center;
clear: both;
height: 25px;
width: 120px;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
<script src="<%=GetFileUrlWithVersion("../js/controls.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("../js/vue.min.js")%>"></script>
@ -196,12 +232,12 @@
function showRightPopup(state) {
if (state) {
$('#content').css('overflow', 'hidden');
$("#mask_bg").show();
showmaskbg(true);
$("#right_popup").css("left", $("#set_left").width()).show();
}
else {
$('#content').css('overflow', '');
$("#mask_bg").hide();
showmaskbg(false);
$("#right_popup").hide();
}
}
@ -249,7 +285,19 @@
<span id="spPrint" id="button-print" class="sbutton iconprint" style="margin-right: 20px;" onclick="OnPrint();" data-lgid="P_IPT_PRINT">Print</span>
</div>
<div id="divreport" style="width: 1100px; margin: 0 auto;">
<img id="reportlayoutlogo" style="width: 100px; margin-top: 5px; display: none;" />
<div v-if="report.ReportLayout!=null">
<table class="maintable" style="width: 100%;">
<tr class="assettr">
<td style="width: 33%; text-align: left;">
<img id="reportlayoutlogo" style="width: 100px; margin-top: 5px; display: none;" /></td>
<td style="width: 33%; text-align: center;">
<img id="reportlayoutcenterlogo" style="width: 100px; margin-top: 5px; display: none;" /></td>
<td style="width: 33%; text-align: right;">
<img id="reportlayoutrightlogo" style="width: 100px; margin-top: 5px; display: none;" />
</td>
</tr>
</table>
</div>
<h1 style="text-align: center;" v-show="report.Template.DisplayInspectionTitle">{{report.Template.Name}}</h1>
<div style="text-align: center; margin-bottom: 10px;"><span v-show="report.Template.DisplayCommitTime">{{report.CommitTimeLocalStr}}</span><span v-show="report.Template.DisplayCommitBy"> by {{report.CommitedByUserName}}</span></div>
<table class="maintable">
@ -362,7 +410,9 @@
</tr>
</table>
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div id="right_popup" style="display: none; position: absolute; top: 0; right: 0; bottom: 0; background-color: white; overflow: auto;">
</div>
<iframe id="ifdiv" style="height: 1px; width: 1px; display: none;"></iframe>

4
Site/Inspection/ReportForWorkOrder.aspx
View File

@ -196,12 +196,12 @@
function showRightPopup(state) {
if (state) {
$('#content').css('overflow', 'hidden');
$("#mask_bg").show();
showmaskbg(true);
$("#right_popup").css("left", $("#set_left").width()).show();
}
else {
$('#content').css('overflow', '');
$("#mask_bg").hide();
showmaskbg(false);
$("#right_popup").hide();
}
}

100
Site/Inspection/TeamIntelligence.aspx
View File

@ -79,7 +79,7 @@
var ShowTemplate =<%=ShowTemplate ?"true":"false"%>;
var ShowReport =<%=ShowReport ?"true":"false"%>;
var ReportReadonly =<%=ReportReadonly ?"true":"false"%>;
var IsCustomerRecord = false;
var IsCustomerRecord = false;
function inspectionrequest(method, param, callback, error) {
_network.request("Inspection/Inspection.aspx", -1, method, param, callback, error || function (e) {
@ -89,11 +89,11 @@
function showRightPopup(state) {
if (state) {
$("#mask_bg").show();
showmaskbg(true);
$("#right_popup").css("left", $("#set_left").width()).show();
}
else {
$("#mask_bg").hide();
showmaskbg(false);
$("#right_popup").hide();
}
}
@ -115,6 +115,34 @@
iframe.contentWindow.print();
}
function openPrintFrame(rid) {
if (navigator.userAgent.indexOf('Firefox') >= 0 ||
navigator.userAgent.indexOf('Opera') >= 0) {
setTimeout(function () {
window.open("Inspection.aspx?rt=f&t=2&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
});
}
else {
var frame = $("<iframe style='display:none;'></iframe>");
$(document.body).after(frame);
frame.attr('src', "Inspection.aspx?rt=f&t=2&id=" + rid);
frame.on('load', function () {
setTimeout(function () {
frame[0].contentWindow.print();
});
setTimeout(function () {
frame.remove();
}, 60000);
});
}
}
function openDownloadFrame(rid) {
setTimeout(function () {
window.open("Inspection.aspx?rt=f&t=1&id=" + rid + "&team=" + (teamintelligence ? 1 : 0), '_blank');
});
}
function createSubMenus(items) {
var maintenancesubmenu = $("#inspectsubmenu").empty();
var ulsubmenus = $('<ul class="lefttitlemenu_ul" style="line-height:32px;"></ul>');
@ -183,6 +211,26 @@
});
return false;
});
$('#nav_temparrow').click(function () {
var flag = !$('#nav_temparrow').prop('isexpanded');
var left_flag = !$('#set_left').prop('isexpanded');
$('#nav_temparrow').stop()
.prop('isexpanded', flag);
if (flag)
$('#set_left').find(".tempdesign").show();
else
$('#set_left').find(".tempdesign").hide();
if (left_flag)
$('#span_tempdesign').hide();
$('#nav_temparrow div').attr('class', 'icn')
.addClass(flag ? 'expand' : 'collapse');
});
$('#nav_temparrow').click();
});
</script>
</asp:Content>
@ -192,9 +240,35 @@
<li id="nav_arrow">
<div class="icn collapse"></div>
</li>
<%if (ShowReport)
{%>
<li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
<div>
<em class="fa icon-menu icon-report"></em>
</div>
<span data-lgid="P_INSPECTIONS">Inspections</span></a>
</li>
<%} %>
<%if (ShowReport)
{%>
<li style="height: 10px;">
<hr style="background-color: #d8d8d8; border: none; height: 1px;" />
</li>
<%} %>
<%if (IsSupperAdmin || ShowTemplate)
{%>
<li id="nav_temparrow">
<div class="icn expand"></div>
<span id="span_tempdesign" class="subitem" data-lgid="P_XXX" style="margin-left: 15px; font-weight: bold;">Template Design</span>
</li>
<%} %>
<%if (IsSupperAdmin)
{%>
<li class="nav_item" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections">
<li class="nav_item tempdesign" data-module="globalsections" data-title-lgid="P_GLOBALSECTIONS"><a href="#globalsections" style="padding-left: 10px;">
<div>
<em class="fa icon-menu icon-sections"></em>
</div>
@ -203,23 +277,23 @@
<%} %>
<%if (ShowTemplate)
{%>
<li class="nav_item" data-title-lgid="P_TEMPLATES"><a id="atemplates">
<li class="nav_item tempdesign" data-title-lgid="P_TEMPLATES"><a id="atemplates" style="padding-left: 10px;">
<div>
<em class="fa icon-menu icon-templates"></em>
</div>
<span data-lgid="P_TEMPLATES">Templates</span></a>
</li>
<li class="nav_item subitem" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
<li class="nav_item subitem tempdesign" data-module="templates/0" data-title-lgid="P_DRAFT" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/0">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_DRAFT">Draft</span></a>
</li>
<li class="nav_item subitem" data-module="templates/1" data-title-lgid="Published" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
<li class="nav_item subitem tempdesign" data-module="templates/1" data-title-lgid="Published" style="height: 32px; line-height: 32px; display: none;"><a href="#templates/1">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_PUBLISHED">Published</span></a>
</li>
<li class="nav_item subitem" data-module="layouts/1" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/1">
<li class="nav_item subitem tempdesign" data-module="layouts/1" data-title-lgid="P_LAYOUTS" style="height: 32px; line-height: 32px; display: none;"><a href="#layouts/1">
<div style="width: 64px;">
</div>
<span style="color: #666;" data-lgid="P_LAYOUTS">Layouts</span></a>
@ -249,16 +323,6 @@
</li>
<%} %>
<%} %>
<%if (ShowReport)
{%>
<li class="nav_item" data-module="inspections" data-title-lgid="P_INSPECTIONS"><a href="#inspections">
<div>
<em class="fa icon-menu icon-report"></em>
</div>
<span data-lgid="P_INSPECTIONS">Inspections</span></a>
</li>
<%} %>
</ul>
<div class="hostmask maskbg" style="display: none;"></div>
</div>

134
Site/Inspection/css/sections.css
View File

@ -14,11 +14,13 @@
.section-holder {
background: #e9e9e9;
font-size: 16px;
margin-bottom:2px;
}
.section-holder:hover {
background-color: #d9d9d9;
margin-bottom: 2px;
}
.section-holder:hover {
background-color: #d9d9d9;
}
.section-input {
padding: 2px 6px;
min-height: 20px;
@ -27,30 +29,36 @@
border: 1px solid #e9e9e9;
border-radius: 4px;
}
.section-input:hover{
border: 1px solid #666;
}
.section-input:disabled{
background: rgba(255,255,255,0);
border-color: rgba(255,255,255,0);
}
.section-input:hover {
border: 1px solid #666;
}
.section-input:disabled {
background: rgba(255,255,255,0);
border-color: rgba(255,255,255,0);
}
.question-holder .question-icon,
.section-holder .section-icon {
flex-shrink: 0;
}
.question-holder .question-icon em {
/*cursor: row-resize;*/
/*margin-left: 6px;*/
color: #666;
}
.question-holder .question-icon em {
/*cursor: row-resize;*/
/*margin-left: 6px;*/
color: #666;
}
.holder-even {
background: #f9f9f9;
}
.question-holder:hover {
background-color: #d9d9d9;
}
.question-input {
padding: 2px 6px;
min-height: 20px;
@ -58,17 +66,21 @@
border: 1px solid #fff;
border-radius: 4px;
}
.question-input:hover {
border: 1px solid #666;
}
.question-input:disabled {
background: rgba(255,255,255,0);
border-color: rgba(255,255,255,0);
}
.question-input:hover {
border: 1px solid #666;
}
.question-input:disabled {
background: rgba(255,255,255,0);
border-color: rgba(255,255,255,0);
}
.question-holder .question-notes {
flex-grow: 1;
line-height: 24px;
}
.question-holder .question-name span:hover,
.question-holder .template-name span:hover,
.question-holder .question-display span:hover,
@ -77,6 +89,7 @@
text-decoration: underline;
cursor: pointer;
}
.question-holder .question-cell,
.section-holder .section-cell {
display: inline-block;
@ -84,23 +97,29 @@
text-overflow: ellipsis;
overflow: hidden;
}
.question-holder .question-cell.fa,
.section-holder .section-cell .fa {
line-height: 40px;
}
.question-holder .question-cell.value-true::before {
content: '\f00c';
}
.section-holder .section-cell .add {
cursor: pointer;
}
.section-holder .section-cell .add::before {
content: '\f0fe';
}
.question-holder .question-cell.fa,
.section-holder .section-cell .fa {
line-height: 40px;
}
.question-holder .question-cell.value-true::before {
content: '\f00c';
}
.section-holder .section-cell .add {
cursor: pointer;
}
.section-holder .section-cell .add::before {
content: '\f0fe';
}
.rowdrag {
font-size: 14px;
cursor:move;
cursor: move;
}
.form-control {
/*display: block;
width: 100%;*/
@ -137,6 +156,7 @@
flex-direction: row;
padding: 4px 0;
}
.editor-top > span {
flex: 1 1 auto;
}
@ -146,14 +166,14 @@
margin-left: 4px;
}
.editor-toolbar a[data-edit],
.svg-button {
display: inline-block;
width: 22px;
height: 22px;
cursor: pointer;
user-select: none;
}
.editor-toolbar a[data-edit],
.svg-button {
display: inline-block;
width: 22px;
height: 22px;
cursor: pointer;
user-select: none;
}
.editor-toolbar a[data-edit] > svg,
.svg-button > svg {
@ -206,4 +226,26 @@
.img-icon-filename {
max-width: 100px;
margin-left: 6px;
}
}
.img-icon-centerfilename {
max-width: 100px;
margin-left: 6px;
}
.img-icon-rightfilename {
max-width: 100px;
margin-left: 6px;
}
.select-layout-name {
margin-left: 20px;
}
.select-layout {
border: 1px solid #a9a9a9;
margin-left: 4px;
width: 100px;
height: 18px;
}

2
Site/Inspection/js/common.js
View File

@ -81,7 +81,6 @@ define(function () {
};
$.fn.showDialog = function (selfmask) {
//$('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
if (this.attr("init") !== "1") {
this.attr("init", "1");
var _this = this;
@ -92,7 +91,6 @@ define(function () {
this.before(mask);
}
$(window).resize(function () {
//_this.height(_this.parent().outerHeight(false) - 64).width(_this.parent().outerWidth(false) - left - 2);
if (_this.mask)
_this.mask.height($(document).outerHeight(false) - 64).width($(document).outerWidth(false));
});

5
Site/Inspection/js/main.js
View File

@ -5,7 +5,7 @@ require.config({
//spectrum: "../../js/spectrum"
},
waitSeconds: 0,
urlArgs: "v=437" //+ Math.random()
urlArgs: "v=455" //+ Math.random()
})
requirejs(['modules/pageloader'], function (loader) {
@ -25,8 +25,9 @@ requirejs(['modules/pageloader'], function (loader) {
.animate({ 'width': flag ? 250 : 50 }, ANIMATION_DURATION)
//.find('li a').css('display', flag ? 'none' : '')
;
if (flag)
if (flag) {
$('#set_left').find(".subitem").show();
}
else
$('#set_left').find(".subitem").hide();

3
Site/Inspection/js/modules/fuellog.js
View File

@ -188,16 +188,15 @@ define([], function () {
};
var p = [false, htmlencode(JSON.stringify(item))];
inspectionrequest('UpdateFuelReportHeaderFooter', JSON.stringify(p), function (r) {
loading.hide();
if (r == 'OK') {
showAlert(GetTextByKey("P_MV_SAVSUCCESSFULLY", 'Saved successfully.'), alerttitle, null, function () {
loading.fadeOut(100);
if (exit) {
showRightPopup(false);
}
});
} else {
showAlert(GetTextByKey("P_IPT_FUELRPT_SAVEERROR", 'Failed to save fuel report page settings.'), alerttitle, null, function () {
loading.fadeOut(100);
});
}
}, 1000);

10
Site/Inspection/js/modules/globalsections.js
View File

@ -46,12 +46,12 @@ define(['modules/sections/section', 'modules/sections/addsection'], function (Se
dataheader.append('<div style="width:60px; flex-shrink: 0"></div>');
dataheader.append('<div class="question-cell" style="width: 200px">' + GetTextByKey("P_IPT_NAME", "Name") + '</div>');
dataheader.append('<div class="question-cell" style="width: 310px">' + GetTextByKey("P_IPT_DISPLAYTEXT", "Display Text") + '</div>');
dataheader.append('<div class="question-cell" style="width: 420px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
dataheader.append('<div class="question-cell" style="width: 400px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
dataheader.append('<div class="question-cell" style="width: 80px; text-align: center">' + GetTextByKey("P_IPT_REQUIRED", "Required") + '</div>');
dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_CANCOMMENT", "Can Comment") + '</div>');
dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
dataheader.append('<div class="question-cell" style="width: 65px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_XXX", "Include Comment") + '</div>');
dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
dataheader.append('<div class="question-cell" style="width: 80px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
dataheader.append('<div style="flex-grow: 1" style="width: 160px">' + GetTextByKey("P_IPT_NOTES", "Notes") + '</div>');
if (sectiontype === 0)
dataheader.append('<div class="question-cell" style="width: 120px;">' + GetTextByKey("P_IPT_CREATEDBY", "Created By") + '</div>');

8
Site/Inspection/js/modules/importpackages.js
View File

@ -27,7 +27,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'TemplateName', caption: GetTextByKey("P_TEMPLATE", "Template"), valueIndex: 'Name', css: { 'width': 320, 'text-align': 'left' } },
{ name: 'AssetName', caption: GetTextByKey("P_IPT_NOTES", "Notes"), valueIndex: 'Notes', css: { 'width': 400, 'text-align': 'left' } }
];
@ -84,7 +84,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'SectionName', caption: GetTextByKey("P_IPT_SECTION", "Section"), valueIndex: 'ItemName', css: { 'width': 320, 'text-align': 'left' } },
{ name: 'AssetName', caption: GetTextByKey("P_IPT_NOTES", "Notes"), valueIndex: 'Notes', css: { 'width': 400, 'text-align': 'left' } }
];
@ -247,10 +247,12 @@
this.content = content;
var funcs = $('<div class="function_title"></div>');
var btn = $('<span class="sbutton iconsave">' + GetTextByKey('P_IPT_IMPORT', 'Import') + '</span>').click(function () {
showConfirm(GetTextByKey("P_IPT_DOYOUWANTTOOVERWRITETHEITEMSWHICHHAVEANEWERVERSION", 'Do you want to overwrite the items which have a higher version?'), GetTextByKey("P_IPT_IMPORTPACKAGE", 'Import Package'), function () {
showConfirmYesNoCancel(GetTextByKey("P_IPT_DOYOUWANTTOOVERWRITETHEITEMSWHICHHAVEANEWERVERSION", 'Do you want to overwrite the items which have a higher version?'), GetTextByKey("P_IPT_IMPORTPACKAGE", 'Import Package'), function () {
onImport(_this, 1);
}, function () {
onImport(_this, 0);
}, function () {
return;
});
});
funcs.append(btn);

42
Site/Inspection/js/modules/inspections.js
View File

@ -85,6 +85,33 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
}
});
func.append(iconResetPivots);
var iconprints = $('<span class="sbutton iconprint">' + GetTextByKey("P_IPT_XXXXXX", "Print") + '</span>').click(function () {
for (var i = 0; i < grid_dt.source.length; i++) {
var inspect = grid_dt.source[i].Values;
if (inspect.Selected) {
if (navigator.userAgent.indexOf('Firefox') >= 0 ||
navigator.userAgent.indexOf('Opera') >= 0) {
window.open("Inspection.aspx?rt=f&t=2&id=" + inspect.Id + "&team=" + (teamintelligence ? 1 : 0), '_blank');
}
else
openPrintFrame(inspect.Id);
}
}
});
func.append(iconprints);
var icondownloads = $('<span class="sbutton icondownload">' + GetTextByKey("P_IPT_XXXXXX", "Download") + '</span>').click(function () {
for (var i = 0; i < grid_dt.source.length; i++) {
var inspect = grid_dt.source[i].Values;
if (inspect.Selected) {
openDownloadFrame(inspect.Id);
}
}
});
func.append(icondownloads);
header.append(func)
return header;
@ -121,7 +148,18 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
{ name: 'Print', caption: "", css: { 'width': 30, 'text-align': 'center' } },
{ name: 'ViewChangeHistory', caption: "", css: { 'width': 30, 'text-align': 'center' } }
];
var columns = [];
var columns = [
{
// checkbox
name: 'check',
key: 'Selected',
width: 45,
align: 'center',
sortable: false,
allcheck: true,
type: 3
}
];
// head
for (var hd in list_columns) {
var col = {};
@ -246,7 +284,7 @@ define(['modules/inspects/inspect', 'modules/inspects/editinspection'], function
if (item.Id === "")
return htmldecode(item.WorkOrderNumber);
var div = $('<div class="dropdown" style="width: 200px;"></div>');
var div = $('<div class="dropdown" style="width: 185px;"></div>');
div.dropdown(item.WorkOrders || [{ Id: -1, WorkOrderNumber: "Not Assigned" }], {
search: false,
textKey: 'WorkOrderNumber',

186
Site/Inspection/js/modules/layouts.js
View File

@ -273,7 +273,7 @@
$('<option value="[Model]">Model</option>'),
$('<option value="[VIN]">VIN/SN</option>'),
$('<option value="[Work_Order_Number]">Work Order Number</option>'),
$('<option value="[Work_Order_Type]">Work Order Type</option>'),
$('<option value="[Work_Order_Type]">Work Order Type</option>'),
$('<option value="[Parts_Order_Number]">Parts Order Number</option>'),
$('<option value="[Year]">Year</option>')
);
@ -318,9 +318,12 @@
}
function editLayout(info) {
$('#right_popup').load('js/modules/layouts/addlayout.html?v=2', function () {
$('#right_popup').load('js/modules/layouts/addlayout.html?v=5', function () {
var modified = false;
var deleteIcon = false;
var deleteCenterIcon = false;
var deleteRightIcon = false;
initColorCtrl();
var content = $(this).applyFleetLanguageText(true);
content.find('.button-exit').on('click', function () {
if (modified) {
@ -342,7 +345,7 @@
}
});
content.find('.button-icon-upload').on('click', function () {
content.find('.icon-file file').remove();
content.find('.icon-file input[type="file"]').remove();
$('<input type="file" accept="image/png,image/jpeg" />')
.hide().appendTo(content.find('.icon-file'))
.on('change', function () {
@ -365,7 +368,78 @@
content.find('.button-icon-delete').on('click', function () {
deleteIcon = true;
content.find('.img-icon-filename').remove();
content.find('.icon-file input[type="file"]').remove();
});
content.find('.button-icon-centerupload').on('click', function () {
content.find('.icon-centerfile input[type="file"]').remove();
$('<input type="file" accept="image/png,image/jpeg" />')
.hide().appendTo(content.find('.icon-centerfile'))
.on('change', function () {
if (!/image\/\w+/.test(this.files[0].type)) {
showAlert(GetTextByKey("P_LAYOUT_UPLOADICONTIPS", 'The file type for the logo is invalid. The file must be JPG or PNG.'), GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout'));
$(this).remove();
return;
}
var file = this.files[0];
var reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = function (e) {
setTimeout(function () {
content.find('.img-icon-centerfilename').remove();
$('<img class="img-icon-centerfilename" />').attr('src', e.target.result).insertAfter(content.find('.icon-centerfile-title'));
});
};
}).click();
});
content.find('.button-icon-centerdelete').on('click', function () {
deleteCenterIcon = true;
content.find('.img-icon-centerfilename').remove();
content.find('.icon-centerfile input[type="file"]').remove();
});
content.find('.button-icon-rightupload').on('click', function () {
content.find('.icon-rightfile input[type="file"]').remove();
$('<input type="file" accept="image/png,image/jpeg" />')
.hide().appendTo(content.find('.icon-rightfile'))
.on('change', function () {
if (!/image\/\w+/.test(this.files[0].type)) {
showAlert(GetTextByKey("P_LAYOUT_UPLOADICONTIPS", 'The file type for the logo is invalid. The file must be JPG or PNG.'), GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout'));
$(this).remove();
return;
}
var file = this.files[0];
var reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = function (e) {
setTimeout(function () {
content.find('.img-icon-rightfilename').remove();
$('<img class="img-icon-rightfilename" />').attr('src', e.target.result).insertAfter(content.find('.icon-rightfile-title'));
});
};
}).click();
});
content.find('.button-icon-rightdelete').on('click', function () {
deleteRightIcon = true;
content.find('.img-icon-rightfilename').remove();
content.find('.icon-rightfile input[type="file"]').remove();
});
content.find('#layout-style').on('change', function () {
var style = $('#layout-style').val();
if (parseInt(style) === 2) {
$('#layout-picturesdisplay').val(1);
$('#layout-picturesdisplay').prop('disabled', true);
}
else {
$('#layout-picturesdisplay').prop('disabled', false);
}
});
content.find('#layout-highlightcolor-input').keyup(null, function () {
$("#layout-highlightcolor-selector").spectrum("set", $('#layout-highlightcolor-input').val());
})
var save = function (exit) {
return function () {
var title = GetTextByKey('P_LAYOUT_SAVEINSPECTLAYOUT', 'Save Inspection Layout');
@ -379,20 +453,26 @@
);
return;
}
var layout = {
Id: info && info.Id,
Target: layouts.isteam ? 1 : 0,
Name: name,
IncludeLOGO: content.find('#layout-include-logo').prop('checked'),
Notes: content.find('.text-layout-notes').val(),
PageHeaderLeft: content.find('.layout-headers-left .editor-content').val(),
PageHeaderCenter: content.find('.layout-headers-middle .editor-content').val(),
PageHeaderRight: content.find('.layout-headers-right .editor-content').val(),
PageFooterLeft: content.find('.layout-footers-left .editor-content').val(),
PageFooterCenter: content.find('.layout-footers-middle .editor-content').val(),
PageFooterRight: content.find('.layout-footers-right .editor-content').val()
PageFooterRight: content.find('.layout-footers-right .editor-content').val(),
Style: content.find('#layout-style').val(),
Spacing: content.find('#layout-spacing').val(),
PicturesDisplay: content.find('#layout-picturesdisplay').val(),
CaptionImages: content.find('#layout-captionimages').prop('checked'),
Divider: content.find('#layout-divider').val(),
HighlightColor: content.find('#layout-highlightcolor-input').val()
};
if (layout.Style === "")
layout.Style = -1;
var data = new FormData();
var files = content.find('.icon-file input[type="file"]').prop('files');
if (files && files[0]) {
@ -401,6 +481,23 @@
var logo = content.find('.img-icon-filename').prop('src');
layout.LOGO = logo.substr(logo.indexOf(';base64,') + 8);
}
var centerfiles = content.find('.icon-centerfile input[type="file"]').prop('files');
if (centerfiles && centerfiles[0]) {
data.append('iconCenterFile', centerfiles && centerfiles[0]);
} else if (!deleteCenterIcon) {
var logo = content.find('.img-icon-centerfilename').prop('src');
layout.CenterLOGO = logo.substr(logo.indexOf(';base64,') + 8);
}
var rightfiles = content.find('.icon-rightfile input[type="file"]').prop('files');
if (rightfiles && rightfiles[0]) {
data.append('iconRightFile', rightfiles && rightfiles[0]);
} else if (!deleteRightIcon) {
var logo = content.find('.img-icon-rightfilename').prop('src');
layout.RightLOGO = logo.substr(logo.indexOf(';base64,') + 8);
}
data.append('MethodName', 'SaveInspectLayout');
data.append('ClientData', encodeURIComponent(JSON.stringify(layout)));
$.ajax({
@ -459,10 +556,15 @@
var onchange = function () { modified = true };
if (info != null) {
content.find('.text-layout-name').val(info.Name);
content.find('#layout-include-logo').prop('checked', info.IncludeLOGO);
if (info.LOGO != null) {
content.find('.img-icon-filename').attr('src', 'data:image/png;base64,' + info.LOGO);
}
if (info.CenterLOGO != null) {
content.find('.img-icon-centerfilename').attr('src', 'data:image/png;base64,' + info.CenterLOGO);
}
if (info.RightLOGO != null) {
content.find('.img-icon-rightfilename').attr('src', 'data:image/png;base64,' + info.RightLOGO);
}
content.find('.text-layout-notes').val(info.Notes);
content.find('.layout-headers-left .editor-content').val(info.PageHeaderLeft);
content.find('.layout-headers-middle .editor-content').val(info.PageHeaderCenter);
@ -470,9 +572,17 @@
content.find('.layout-footers-left .editor-content').val(info.PageFooterLeft);
content.find('.layout-footers-middle .editor-content').val(info.PageFooterCenter);
content.find('.layout-footers-right .editor-content').val(info.PageFooterRight);
content.find('#layout-style').val(info.Style);
content.find('#layout-spacing').val(info.Spacing);
content.find('#layout-picturesdisplay').val(info.PicturesDisplay);
content.find('#layout-captionimages').prop('checked', info.CaptionImages);
content.find('#layout-divider').val(info.Divider);
content.find('#layout-highlightcolor-input').val(info.HighlightColor);
content.find('#layout-highlightcolor-selector').spectrum("set", info.HighlightColor);
}
content.find('.text-layout-name').on('change', onchange);
content.find('#layout-include-logo').on('change', onchange);
//content.find('#layout-style').on('change', onchange);
content.find('.text-layout-notes').on('change', onchange);
content.find('.layout-headers-left .editor-content').on('change', onchange);
content.find('.layout-headers-middle .editor-content').on('change', onchange);
@ -480,6 +590,12 @@
content.find('.layout-footers-left .editor-content').on('change', onchange);
content.find('.layout-footers-middle .editor-content').on('change', onchange);
content.find('.layout-footers-right .editor-content').on('change', onchange);
content.find('#layout-style').on('change', onchange);
content.find('#layout-spacing').on('change', onchange);
content.find('#layout-picturesdisplay').on('change', onchange);
content.find('#layout-captionimages').on('change', onchange);
content.find('#layout-divider').on('change', onchange);
content.find('#layout-highlightcolor-input').on('change', onchange);
content.find('.text-layout-name').focus();
});
@ -509,5 +625,59 @@
}
});
function initColorCtrl() {
$('#layout-highlightcolor-selector').spectrum({
allowEmpty: true,
color: "#FFF",
showInput: true,
containerClassName: "full-spectrum",
showInitial: true,
showPalette: true,
showSelectionPalette: true,
showAlpha: true,
maxPaletteSize: 10,
preferredFormat: "hex",
localStorageKey: "spectrum.demo",
chooseText: GetTextByKey("P_IPT_OK", "OK"),
cancelText: GetTextByKey("P_IPT_CANCEL", "Cancel"),
clearText: GetTextByKey("P_SPECTRUM_CLEARCOLORSELECTION", "Clear Color Selection"),
noColorSelectedText: GetTextByKey("P_SPECTRUM_NOCOLORSELECTED", "No Color Selected"),
move: function (color) {
if (color)
$('#layout-highlightcolor-input').val(color.toHexString().toUpperCase()); // #ff0000
},
show: function () {
},
beforeShow: function () {
},
hide: function (color) {
if (color) {
$('#layout-highlightcolor-input').val(color.toHexString().toUpperCase()); // #ff0000
}
},
palette: [
["rgb(0, 0, 0)", "rgb(67, 67, 67)", "rgb(102, 102, 102)", /*"rgb(153, 153, 153)","rgb(183, 183, 183)",*/
"rgb(204, 204, 204)", "rgb(217, 217, 217)", /*"rgb(239, 239, 239)", "rgb(243, 243, 243)",*/ "rgb(255, 255, 255)"],
["rgb(152, 0, 0)", "rgb(255, 0, 0)", "rgb(255, 153, 0)", "rgb(255, 255, 0)", "rgb(0, 255, 0)",
"rgb(0, 255, 255)", "rgb(74, 134, 232)", "rgb(0, 0, 255)", "rgb(153, 0, 255)", "rgb(255, 0, 255)"],
["rgb(230, 184, 175)", "rgb(244, 204, 204)", "rgb(252, 229, 205)", "rgb(255, 242, 204)", "rgb(217, 234, 211)",
"rgb(208, 224, 227)", "rgb(201, 218, 248)", "rgb(207, 226, 243)", "rgb(217, 210, 233)", "rgb(234, 209, 220)",
"rgb(221, 126, 107)", "rgb(234, 153, 153)", "rgb(249, 203, 156)", "rgb(255, 229, 153)", "rgb(182, 215, 168)",
"rgb(162, 196, 201)", "rgb(164, 194, 244)", "rgb(159, 197, 232)", "rgb(180, 167, 214)", "rgb(213, 166, 189)",
"rgb(204, 65, 37)", "rgb(224, 102, 102)", "rgb(246, 178, 107)", "rgb(255, 217, 102)", "rgb(147, 196, 125)",
"rgb(118, 165, 175)", "rgb(109, 158, 235)", "rgb(111, 168, 220)", "rgb(142, 124, 195)", "rgb(194, 123, 160)",
"rgb(166, 28, 0)", "rgb(204, 0, 0)", "rgb(230, 145, 56)", "rgb(241, 194, 50)", "rgb(106, 168, 79)",
"rgb(69, 129, 142)", "rgb(60, 120, 216)", "rgb(61, 133, 198)", "rgb(103, 78, 167)", "rgb(166, 77, 121)",
/*"rgb(133, 32, 12)", "rgb(153, 0, 0)", "rgb(180, 95, 6)", "rgb(191, 144, 0)", "rgb(56, 118, 29)",
"rgb(19, 79, 92)", "rgb(17, 85, 204)", "rgb(11, 83, 148)", "rgb(53, 28, 117)", "rgb(116, 27, 71)",*/
"rgb(91, 15, 0)", "rgb(102, 0, 0)", "rgb(120, 63, 4)", "rgb(127, 96, 0)", "rgb(39, 78, 19)",
"rgb(12, 52, 61)", "rgb(28, 69, 135)", "rgb(7, 55, 99)", "rgb(32, 18, 77)", "rgb(76, 17, 48)"]
]
});
}
return layouts;
});

80
Site/Inspection/js/modules/layouts/addlayout.html
View File

@ -8,30 +8,74 @@
<span class="sbutton iconexit button-exit" data-lgid="P_IPT_SAVE2">Exit Without Saving</span>
</div>
<div class="page_title" data-lgid="P_LAYOUT_GENERAL">General</div>
<div style="display: flex">
<div class="settings-line">
<span>
<span data-lgid="P_LAYOUT_NAMECOLON">Layout Name:</span>
<b style="color: red">*</b>
<input type="text" class="text-layout-name" maxlength="200" />
</span>
<span>
<label for="layout-include-logo" data-lgid="P_LAYOUT_INCLUDELOGO">Include Logo:</label>
<input type="checkbox" id="layout-include-logo" />
</span>
<div class="settings-line">
<span>
<span data-lgid="P_LAYOUT_NAMECOLON">Layout Name:</span>
<b style="color: red">*</b>
<input type="text" class="text-layout-name" maxlength="200" />
<label data-lgid="P_LAYOUT_XXX" class="select-layout-name">Style:</label>
<select id="layout-style" class="select-layout">
<option value="0">Standard</option>
<option value="1">Compressed</option>
<option value="2">Split</option>
</select>
</span>
<span>
<span class="icon-file">
<span class="icon-file-title" data-lgid="P_LAYOUT_ICONFILENAME">Logo file:</span>
<span class="icon-file-title" data-lgid="P_LAYOUT_XX">Left Logo file:</span>
<img class="img-icon-filename" />
<span class="svg-button button-icon-upload"><svg><use href="#symbol-upload"></use></svg></span>
<span class="svg-button button-icon-delete"><svg><use href="#symbol-close"></use></svg></span>
</span>
</div>
<div class="settings-line" style="flex: 1 1 auto">
<span style="display: flex">
<span data-lgid="P_LAYOUT_NOTESCOLON" style="vertical-align:top; white-space:nowrap">Notes:</span>
<textarea class="text-layout-notes" style="height:100px; width:100%; box-sizing:border-box; margin-left:8px"></textarea>
<span class="icon-centerfile" style="margin-left:30px;">
<span class="icon-centerfile-title" data-lgid="P_LAYOUT_XXX">Center Logo file:</span>
<img class="img-icon-centerfilename" />
<span class="svg-button button-icon-centerupload"><svg><use href="#symbol-upload"></use></svg></span>
<span class="svg-button button-icon-centerdelete"><svg><use href="#symbol-close"></use></svg></span>
</span>
</div>
<span class="icon-rightfile" style="margin-left:30px;">
<span class="icon-rightfile-title" data-lgid="P_LAYOUT_XXX">Right Logo file:</span>
<img class="img-icon-rightfilename" />
<span class="svg-button button-icon-rightupload"><svg><use href="#symbol-upload"></use></svg></span>
<span class="svg-button button-icon-rightdelete"><svg><use href="#symbol-close"></use></svg></span>
</span>
</span>
<span style="display: flex">
<span data-lgid="P_LAYOUT_NOTESCOLON" style="vertical-align:top; white-space:nowrap">Notes:</span>
<textarea class="text-layout-notes" style="height:100px; width:100%; box-sizing:border-box; margin-left:8px"></textarea>
</span>
</div>
<div class="page_title" data-lgid="P_LAYOUT_XXX">Options</div>
<div class="settings-line">
<span>
<span data-lgid="P_LAYOUT_XXX">Spacing:</span>
<select id="layout-spacing" class="select-layout">
<option value="0" data-lgid="P_XXX">Single Space</option>
<option value="1" data-lgid="P_XXX">Double Space</option>
</select>
<span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Pictures:</span>
<select id="layout-picturesdisplay" class="select-layout" style="width:140px;">
<option value="0" data-lgid="P_XXX">Displayed As Taken</option>
<option value="1" data-lgid="P_XXX">Displayed At Bottom</option>
</select>
<span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Caption Images:</span>
<input type="checkbox" id="layout-captionimages" />
<span data-lgid="P_LAYOUT_XXX" class="select-layout-name">Divider:</span>
<select id="layout-divider" class="select-layout" style="width:80px;">
<option value="0" data-lgid="P_XXX">None</option>
<option value="1" data-lgid="P_XXX">Line</option>
<option value="2" data-lgid="P_XXX">Grid</option>
</select>
<span data-lgid="P_LAYOUT_XXX" class="select-layout-name">VIP Questions/Section Highlight Color:</span>
<input id="layout-highlightcolor-input" style="width:60px;" maxlength="7" />
<input id="layout-highlightcolor-selector" />
</span>
</div>
<div class="page_title" data-lgid="P_IPT_FUELRPT_HEADER">Page Headers</div>

8
Site/Inspection/js/modules/sections/addquestion.js
View File

@ -83,7 +83,7 @@ define(['common'], function (Common) {
tb.append(tr);
tr.append('<td class="label">' + GetTextByKey("P_IPT_NAME_COLON", "Name:") + '<span class="redasterisk">*</span></td>');
namecontrol = $('<input type="text" maxlength="100"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(namecontrol, _this.question);
});
@ -93,7 +93,7 @@ define(['common'], function (Common) {
tb.append(tr);
tr.append('<td class="label">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span class="redasterisk">*</span></td>');
displaytextcontrol = $('<input type="text" maxlength="1000" />');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(displaytextcontrol, _this.question);
});
@ -141,7 +141,7 @@ define(['common'], function (Common) {
tr = $('<tr></tr>');
tb.append(tr);
tr.append('<td class="label">Notes:</td>');
notescontrol = $('<textarea id="dialog_notes" class="inputbox" maxlength="1000" style="width: 400px; margin-top: 6px;"></textarea>');
notescontrol = $('<textarea id="dialog_notes" maxlength="1000" style="width: 400px; margin-top: 6px;"></textarea>');
tr.append($('<td></td>').append(notescontrol));
return div_main;
@ -187,7 +187,7 @@ define(['common'], function (Common) {
tb.append(tr);
var optext = $('<input type="text" style="width:240px;margin-left:5px;"/>');
this.dialog_text = optext;
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(optext, _this.question);
});

4
Site/Inspection/js/modules/sections/addsection.js
View File

@ -82,7 +82,7 @@ define(['common'], function (Common) {
tb.append(tr);
tr.append('<td class="label" style="vertical-align:middle;">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span class="redasterisk">*</span></td>');
displaytextcontrol = $('<input type="text" maxlength="200" autocomplete="off"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(displaytextcontrol, _this.section);
});
@ -91,7 +91,7 @@ define(['common'], function (Common) {
tr = $('<tr></tr>');
tb.append(tr);
tr.append('<td class="label">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
notescontrol = $('<textarea id="dialog_notes" class="inputbox" maxlength="500" autocomplete="off" style="width: 400px; margin-top: 6px;"></textarea>');
notescontrol = $('<textarea id="dialog_notes" maxlength="500" autocomplete="off" style="width: 400px; margin-top: 6px;"></textarea>');
tr.append($('<td></td>').append(notescontrol));
return div_main;

2
Site/Inspection/js/modules/sections/option.js
View File

@ -48,7 +48,7 @@
tb.append(tr);
var optext = $('<input type="text" class="form-control" style="width:226px;margin-left:5px;"/>');
this.dialog_text = optext;
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(optext);
});

18
Site/Inspection/js/modules/sections/question.js
View File

@ -64,7 +64,7 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
if (this.index % 2 == 1)
qholder.addClass('holder-even');
var drag = $('<div class="question-icon" style="width:30px;"><em class="spanbtn iconmove rowdrag"></em></div>');
var drag = $('<div class="question-icon" style="width:30px;" title="' + GetTextByKey("P_IPT_XXX", "Move Question") + '"><em class="spanbtn iconmove rowdrag"></em></div>');
qholder.append(drag);
if (!_this.section.IsLink && sectiontype == 1) {
drag.attr('draggable', true);
@ -108,14 +108,14 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
qholder.append('<div class="question-icon" style="width:30px;"><em class="fa"></em></div>');
_this.txtName = $('<input type="text" class="question-input" maxlength="100" autocomplete="off" style="width:146px;" />');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.txtName, _this.question);
});
qholder.append($('<div class="question-cell question-name" style="width: 190px;padding-left:10px;"></div>').append(this.txtName).append(addiText));
_this.txtDisplayText = $('<input type="text" class="question-input" maxlength="200" autocomplete="off" style="width:236px;" />');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.txtDisplayText, _this.question);
});
@ -137,16 +137,16 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
qholder.append($('<div class="question-cell question-required" style="width: 80px; text-align: center"></div>').append(this.chkIsRequired));
_this.chkCanComment = $('<input type="checkbox" />');
qholder.append($('<div class="question-cell question-comment" style="width: 100px; text-align: center"></div>').append(this.chkCanComment));
qholder.append($('<div class="question-cell question-comment" style="width: 65px; text-align: center"></div>').append(this.chkCanComment));
_this.chkIsImportant = $('<input type="checkbox" />');
qholder.append($('<div class="question-cell question-important" style="width: 100px; text-align: center"></div>').append(this.chkIsImportant));
qholder.append($('<div class="question-cell question-important" style="width: 70px; text-align: center"></div>').append(this.chkIsImportant));
_this.chkCustomerVisible = $('<input type="checkbox" />');
qholder.append($('<div class="question-cell question-important" style="width: 140px; text-align: center"></div>').append(this.chkCustomerVisible));
qholder.append($('<div class="question-cell question-important" style="width: 70px; text-align: center"></div>').append(this.chkCustomerVisible));
_this.selSeverityLevel = createSeverityLevel().addClass('question-input').css('width', 130);
qholder.append($('<div class="question-cell question-security" style="width: 140px"></div>').append(this.selSeverityLevel));
_this.selSeverityLevel = createSeverityLevel().addClass('question-input').css('width', 70);
qholder.append($('<div class="question-cell question-security" style="width: 80px"></div>').append(this.selSeverityLevel));
_this.txtNotes = $('<textarea class="question-input" maxlength="500" autocomplete="off" style="width:95%;margin-top:5px;"></textarea>');
qholder.append($('<div class="question-cell question-notes" style="width: 160px;white-space:normal;"></div>').append(this.txtNotes));
@ -214,7 +214,7 @@ define(['modules/sections/addquestion', 'modules/sections/option', 'common', 'mo
td = $('<td></td>');
tr.append(td);
_this.btnoption = $('<span class="spanbtn iconangleleft" style="font-size:18px;"></span>');
_this.btnoption = $('<span class="spanbtn iconangleleft" style="font-size:18px;" title="' + GetTextByKey("P_IPT_XXX","Display Options") + '"></span>');
td.append(_this.btnoption);
_this.btnoption.click(function () {
var icon = $(this);

6
Site/Inspection/js/modules/sections/section.js
View File

@ -38,7 +38,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
}
if (sectiontype == 1) {
var drag = $('<div class="question-icon" style="width:30px;"><em class="spanbtn iconmove rowdrag"></em></div>');
var drag = $('<div class="question-icon" style="width:30px;" title="' + GetTextByKey("P_IPT_XXX","Move Section") + '"><em class="spanbtn iconmove rowdrag"></em></div>');
holder.append(drag);
if (sectiontype == 1) {
drag.attr('draggable', true);
@ -106,7 +106,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
this.txtName.change(function () {
_this.onsave();
});
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.txtName, _this.section);
});
@ -116,7 +116,7 @@ define(['modules/sections/question', 'modules/sections/addsection', 'modules/sec
this.txtDisplayText.change(function () {
_this.onsave();
});
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.txtDisplayText, _this.section);
});

4
Site/Inspection/js/modules/templates/addtemplate.js
View File

@ -174,7 +174,7 @@ define(['modules/templates/pages', 'modules/templates/filters', 'modules/templat
tr = $('<tr class="templatetr"></tr>');
tb.append(tr);
tr.append('<td class="label" style="width:160px;">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
notescontrol = $('<textarea id="dialog_notes" class="inputbox form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top: 6px;height:80px;"></textarea>');
notescontrol = $('<textarea id="dialog_notes" class="form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top: 6px;height:80px;"></textarea>');
tr.append($('<td></td>').append(notescontrol));
//Email
@ -240,7 +240,7 @@ define(['modules/templates/pages', 'modules/templates/filters', 'modules/templat
{ name: 'UserName', caption: GetTextByKey("P_IPT_CONTACTNAME", "Contact Name"), valueIndex: 'UserName', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'ContactType', caption: GetTextByKey("P_IPT_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactType', css: { 'width': 180, 'text-align': 'left' } },
//{ name: 'Text', caption: "Text", valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } }
{ name: 'Selected', caption: GetTextByKey("P_IPT_EMAIL", "Email"), valueIndex: 'Selected', type: 3, css: { 'width': 60, 'text-align': 'center' } }
];
var columns = [];
// head

2
Site/Inspection/js/modules/templates/linksection.js
View File

@ -28,7 +28,7 @@ define(['common'], function (Common) {
// checkbox
name: 'check',
key: 'Selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,

16
Site/Inspection/js/modules/templates/page.js
View File

@ -28,7 +28,7 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
tb.append(tr);
tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_NAME_COLON", "Name:") + '<span class="redasterisk">*</span></td>');
_this.namecontrol = $('<input type="text" class="form-control" maxlength="100" autocomplete="off"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
var addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.namecontrol);
});
@ -40,14 +40,14 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
tb.append(tr);
tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_NOTES_COLON", "Notes:") + '</td>');
_this.notescontrol = $('<textarea id="dialog_notes" class="inputbox form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top:6px;height:55px;"></textarea>');
_this.notescontrol = $('<textarea id="dialog_notes" class="form-control" maxlength="500" autocomplete="off" style="width: 540px; margin-top:6px;height:55px;"></textarea>');
tr.append($('<td rowspan="2"></td>').append(_this.notescontrol));
tr = $('<tr></tr>');
tb.append(tr);
tr.append('<td class="label" style="width:154px;">' + GetTextByKey("P_IPT_DISPLAYTEXT_COLON", "Display Text:") + '<span class="redasterisk">*</span></td>');
_this.displaytextcontrol = $('<input type="text" class="form-control" maxlength="200" autocomplete="off"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_ADDITIONALTEXTS", "Additional Texts") + '"/>');
addiText = $('<span class="spanbtn iconmultitext" style="font-size:14px;" title="' + GetTextByKey("P_IPT_XXX", "Language Selection") + '"/>');
addiText.click(function () {
Common.createMultiTextDialog(_this.displaytextcontrol);
});
@ -65,7 +65,7 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
var header = $('<div></div>');
//header.append($('<div class="page_title"></div>').text(gs.title));
var func = $('<div class="function_title"></div>');
var iconAdd = $('<span class="sbutton iconadd">' + GetTextByKey("P_IPT_ADD", "Add") + '</span>').click(function () {
var iconAdd = $('<span class="sbutton iconadd">' + GetTextByKey("P_IPT_ADDSECTION", "Add Section") + '</span>').click(function () {
//var s = new AddSection();
//s.onsave = function (section) {
// _this.page.Sections.push(section);
@ -95,10 +95,10 @@ define(['modules/sections/section', 'modules/sections/addsection', 'common', 'mo
dataheader.append('<div class="question-cell" style="width: 310px">' + GetTextByKey("P_IPT_DISPLAYTEXT", "Display Text") + '</div>');
dataheader.append('<div class="question-cell" style="width: 400px">' + GetTextByKey("P_IPT_TYPE", "Type") + '</div>');
dataheader.append('<div class="question-cell" style="width: 80px; text-align: center">' + GetTextByKey("P_IPT_REQUIRED", "Required") + '</div>');
dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_CANCOMMENT", "Can Comment") + '</div>');
dataheader.append('<div class="question-cell" style="width: 100px; text-align: center">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
dataheader.append('<div class="question-cell" style="width: 140px">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
dataheader.append('<div class="question-cell" style="width: 65px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_XXX", "Include Comment") + '</div>');
dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_ISIMPORTANT", "Is Important") + '</div>');
dataheader.append('<div class="question-cell" style="width: 70px; text-align: center;white-space:normal;line-height:20px;"">' + GetTextByKey("P_IPT_CUSTOMERVISIBLE", "Customer Visible") + '</div>');
dataheader.append('<div class="question-cell" style="width: 80px; text-align: center;white-space:normal;line-height:20px;">' + GetTextByKey("P_IPT_SEVERITYLEVEL", "Severity Level") + '</div>');
dataheader.append('<div style="flex-grow: 1" style="width: 160px">' + GetTextByKey("P_IPT_ST_NOTES", "Notes") + '</div>');
dataheader.append('<div class="question-cell" style="width: 90px;padding-right:20px;"></div>');
content.append(dataheader);

2
Site/Inspection/js/modules/templates/templatepicture.js
View File

@ -28,7 +28,7 @@ define(['common'], function (Common) {
// checkbox
name: 'check',
key: 'Selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,

572
Site/Inspection/js/report.js
View File

@ -1,6 +1,14 @@

var vm;
var reportdata;
var reportlayout;
var layoutStyle = 0;
var layoutDivider = 0;
var layoutSpacing = 0;
var layoutPicturesDisplay = 0;
var layoutCaptionImages = false;
var layoutHighlightColor = "";
var mediasdata = [];
$(function () {
$("#host_header").find(".button").remove();
$("#spanUserName").remove();
@ -62,11 +70,25 @@ function GetInspectionReport() {
}
else {
reportdata = data;
reportlayout = data.ReportLayout;
if (reportlayout) {
layoutStyle = parseInt(reportlayout.Style);
layoutDivider = parseInt(reportlayout.Divider);
layoutSpacing = parseInt(reportlayout.Spacing);
layoutPicturesDisplay = parseInt(reportlayout.PicturesDisplay);
layoutCaptionImages = reportlayout.CaptionImages;
layoutHighlightColor = reportlayout.HighlightColor;
if (layoutStyle == 2)
layoutPicturesDisplay = 1;
};
vm.reload(data);
showReportLayout(data.ReportLayout);
showIdentifiedQuestions(data.IdentifiedQuestions);
showPages(data);
showSignature(data);
if (layoutPicturesDisplay == 1 && mediasdata && mediasdata.length > 0) {
showMedias();
}
}
showmaskbg(false);
@ -77,6 +99,8 @@ function GetInspectionReport() {
function showReportLayout(layout) {
$('#reportlayoutlogo').hide();
$('#reportlayoutcenterlogo').hide();
$('#reportlayoutrightlogo').hide();
$('.td_pageheaderleft').html('');
$('.td_pageheadercenter').html('');
$('.td_pageheaderright').html('');
@ -92,13 +116,29 @@ function showReportLayout(layout) {
$('.td_pagefooterright').html(layout.PageFooterRight);
$('#reportlayoutlogo').show();
if (layout.IncludeLOGO && layout.LOGO && layout.LOGO.length > 0) {
$('#reportlayoutcenterlogo').show();
$('#reportlayoutrightlogo').show();
if (layout.LOGO && layout.LOGO.length > 0) {
var jpeg = layout.LOGO;
if (typeof (layout.LOGO) !== "string") {
jpeg = arrayBufferToBase64(layout.LOGO);
}
$('#reportlayoutlogo').attr('src', 'data:image/png;base64,' + jpeg);
}
if (layout.CenterLOGO && layout.CenterLOGO.length > 0) {
var jpeg = layout.CenterLOGO;
if (typeof (layout.CenterLOGO) !== "string") {
jpeg = arrayBufferToBase64(layout.CenterLOGO);
}
$('#reportlayoutcenterlogo').attr('src', 'data:image/png;base64,' + jpeg);
}
if (layout.RightLOGO && layout.RightLOGO.length > 0) {
var jpeg = layout.RightLOGO;
if (typeof (layout.RightLOGO) !== "string") {
jpeg = arrayBufferToBase64(layout.RightLOGO);
}
$('#reportlayoutrightlogo').attr('src', 'data:image/png;base64,' + jpeg);
}
}
}
@ -118,19 +158,7 @@ function showIdentifiedQuestions(questions) {
var content = $('<div></div>');
content.append($('<div class="catelog">IDENTIFIED ISSUES</div>'));
if (questions && questions.length > 0) {
for (var i = 0; i < questions.length; i++) {
var q = questions[i];
var div_question = $('<div class="question"></div>');
content.append(div_question);
div_question.append($('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText))
if (q.StaticPictures && q.StaticPictures.length > 0) {
var div_pic = $('<div style=""></div>');
div_pic = createPictures(q.StaticPictures, div_pic);
div_question.append(div_pic)
}
createAnswerContent(content, q);
}
createQuestionContent1(content, questions);
}
else
content.append($('<div class="question"></div>').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions')));
@ -138,7 +166,11 @@ function showIdentifiedQuestions(questions) {
$('#divquestions').append(content);
}
function showSeverityLevel(level) {
if (layoutStyle == 1 || layoutStyle == 2)
return "";
var levertext = GetTextByKey("P_IPT_SEVERITYLEVEL_COLON", "Severity Level: ");
if (level === 0)
levertext = "";
@ -166,32 +198,185 @@ function showPages(report) {
function showSignature(report) {
if (report && report.SignatureUrl && report.SignatureUrl != "") {
$('#divsign').append($('<div style="border-bottom:1px solid #dbdbdb;"></div>'));
$('#divsign').append($('<div class="catelog" style="margin-top:20px;">' + GetTextByKey("P_IPT_SIGNATURE", "Signature") + '</div>'));
var divsign = $('#divsign');
divsign.append($('<div class="catelog" style="margin-top:20px;">' + GetTextByKey("P_IPT_SIGNATURE", "Signature") + '</div>'));
var div_pic = $('<div></div>');
divsign.append(div_pic);
var pic = $('<img style="height:320px; margin-left:70px;margin-right:10px;margin-bottom:10px;"></img>').attr('src', report.SignatureUrl);
$('#divsign').append(pic);
div_pic.append(pic);
if (layoutDivider == 1)//Line
div_pic.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_pic.addClass('question_div_grid');
if (layoutSpacing == 1)//Double Space
div_pic.css('line-height', '30px');
}
}
function showMedias() {
var content = $('<div></div>');
content.append($('<div class="catelog">Required Images</div>'));
if (layoutStyle == 1) {//Compressed
var div_question = $('<table style="width:100%;" class="question_table"></table>');
content.append(div_question);
var tr_question = "";
for (var i = 0; i < mediasdata.length; i++) {
var m = mediasdata[i];
if (i % 3 == 0) {
tr_question = $('<tr style="width:100%;"></tr>');
div_question.append(tr_question);
}
var td_pic = $('<td style="width:33%;"></td>');
tr_question.append(td_pic);
var piccontent = createMedias(m);
td_pic.append(piccontent);
}
var m_count = mediasdata.length % 3;
if (m_count != 0) {
for (var i = 0; i < 3 - m_count; i++) {
tr_question.append($('<td style="width:33%;"></td>'));
}
}
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
}
else if (layoutStyle == 2) {//Split
var div_question = $('<table style="width:100%;" class="question_table"></table>');
content.append(div_question);
var tr_question = "";
for (var i = 0; i < mediasdata.length; i++) {
var m = mediasdata[i];
if (i % 4 == 0) {
tr_question = $('<tr style="width:100%;"></tr>');
div_question.append(tr_question);
}
var td_pic = $('<td style="width:25%;"></td>');
tr_question.append(td_pic);
var piccontent = createMedias(m);
td_pic.append(piccontent);
}
var m_count = mediasdata.length % 4;
if (m_count != 0) {
for (var i = 0; i < 4 - m_count; i++) {
tr_question.append($('<td style="width:25%;"></td>'));
}
}
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
}
else {
var div_question = $('<table style="width:100%;" class="question_table"></table>');
content.append(div_question);
for (var i = 0; i < mediasdata.length; i++) {
var m = mediasdata[i];
var tr_question = $('<tr style="width:100%;"></tr>');
div_question.append(tr_question);
var td_pic = $('<td style="width:100%;"></td>');
tr_question.append(td_pic);
var piccontent = createMedias(m);
td_pic.append(piccontent);
}
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
}
$('#divpages').append(content);
}
function createMedias(m) {
var piccontent = $('<div style="float:left;"></div>');
if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
var v = $('<div class="media"><span class="video"></span></div>');
v.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
piccontent.append(v);
if (layoutCaptionImages) {
var div_caption = $('<div class="mediacaption"></div>').attr('title', m.FileName);
piccontent.append(div_caption);
var span_caption = $('<span></span>').text(m.FileName);
div_caption.append(span_caption);
}
}
else {
var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
pic.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
piccontent.append(pic);
if (layoutCaptionImages) {
var div_caption = $('<div class="mediacaption"></div>').attr('title', m.FileName);;
piccontent.append(div_caption);
var span_caption = $('<span></span>').text(m.FileName);
div_caption.append(span_caption);
}
}
return piccontent;
}
function createPage(page) {
var content = $('<div style="padding:0px;"></div>');
var divpage = $('<div class="page"></div>');
content.append(divpage);
if (layoutStyle == 1 || layoutStyle == 2) {
var tabpage = $('<table class="question_table"style="width:100%;background-color:#a9a9a9" ></table>');
content.append(tabpage);
var trpage = $('<tr style="width:100%;text-align:center;" ></tr>');
tabpage.append(trpage);
var tdpage = $('<td style="width:100%;" ></td>');
trpage.append(tdpage);
tdpage.append($('<span></span>').text(page.DisplayText));
var btnpage = $('<em class="spanbtn iconangledown" style="font-size:22px;width:24px;"></em>');
btnpage.click(function () {
var icon = $(this);
if (icon.hasClass('iconangleright')) {
icon.removeClass('iconangleright').addClass('iconangledown');
icon.parent().next().show();
}
else {
icon.removeClass('iconangledown').addClass('iconangleright');
icon.parent().next().hide();
}
});
divpage.append(btnpage);
divpage.append($('<span></span>').text(page.DisplayText));
if (layoutDivider == 1)//Line
tabpage.addClass('question_line');
else if (layoutDivider == 2)//Grid
tabpage.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
tabpage.css('line-height', '30px');
}
else {
var divpage = $('<div class="page"></div>');
content.append(divpage);
var btnpage = $('<em class="spanbtn iconangledown" style="font-size:22px;width:24px;"></em>');
btnpage.click(function () {
var icon = $(this);
if (icon.hasClass('iconangleright')) {
icon.removeClass('iconangleright').addClass('iconangledown');
icon.parent().next().show();
}
else {
icon.removeClass('iconangledown').addClass('iconangleright');
icon.parent().next().hide();
}
});
divpage.append(btnpage);
divpage.append($('<span></span>').text(page.DisplayText));
}
var sectioncontent = createSectionContent(page);
content.append(sectioncontent);
@ -201,78 +386,225 @@ function createPage(page) {
function createSectionContent(page) {
var content = $('<div style="margin-bottom:30px;"></div>');
if (page.Sections && page.Sections.length > 0) {
for (var i = 0; i < page.Sections.length; i++) {
var s = page.Sections[i];
var divsection = $('<div class="section"></div>');
content.append(divsection);
if (layoutStyle == 1 || layoutStyle == 2) {
if (page.Sections && page.Sections.length > 0) {
for (var i = 0; i < page.Sections.length; i++) {
var s = page.Sections[i];
var btnsection = $('<em class="spanbtn iconangledown" style="font-size:18px;display:inline-block;"></em>');
btnsection.click(function () {
var icon = $(this);
if (icon.hasClass('iconangleright')) {
icon.removeClass('iconangleright').addClass('iconangledown');
icon.parent().next().show();
}
else {
icon.removeClass('iconangledown').addClass('iconangleright');
icon.parent().next().hide();
}
});
divsection.append(btnsection);
var ispic = false;
if (s.StaticPictures && s.StaticPictures.length > 0) {
ispic = true;
var div_pic = $('<span></span>');
createPictures(s.StaticPictures, div_pic);
divsection.append(div_pic);
divsection.append('<br/>');
var tabsection = $('<table class="question_table"style="width:100%;background-color:#cbcbcb;" ></table>');
content.append(tabsection);
var trsection = $('<tr style="width:100%;text-align:center;" ></tr>');
tabsection.append(trsection);
var tdsection = $('<td style="width:100%;" ></td>');
trsection.append(tdsection);
tdsection.append($('<span></span>').text(s.DisplayText));
if (layoutDivider == 1)//Line
tabsection.addClass('question_line');
else if (layoutDivider == 2)//Grid
tabsection.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
tabsection.css('line-height', '30px');
var qc = createQuestionContent(s);
content.append(qc);
}
var span_title = $('<span></span>').text(s.DisplayText);
if (ispic)
span_title.css('margin-left', 24);
divsection.append(span_title);
var qc = createQuestionContent(s, i);
content.append(qc);
}
}
else
content.append($('<div class="question"></div>').text('No Sections'));
else {
if (page.Sections && page.Sections.length > 0) {
for (var i = 0; i < page.Sections.length; i++) {
var s = page.Sections[i];
var divsection = $('<div class="section"></div>');
content.append(divsection);
var btnsection = $('<em class="spanbtn iconangledown" style="font-size:18px;display:inline-block;"></em>');
btnsection.click(function () {
var icon = $(this);
if (icon.hasClass('iconangleright')) {
icon.removeClass('iconangleright').addClass('iconangledown');
icon.parent().next().show();
}
else {
icon.removeClass('iconangledown').addClass('iconangleright');
icon.parent().next().hide();
}
});
divsection.append(btnsection);
var ispic = false;
if (s.StaticPictures && s.StaticPictures.length > 0) {
ispic = true;
var div_pic = $('<span></span>');
createPictures(s.StaticPictures, div_pic);
divsection.append(div_pic);
divsection.append('<br/>');
}
var span_title = $('<span></span>').text(s.DisplayText);
if (ispic)
span_title.css('margin-left', 24);
divsection.append(span_title);
var qc = createQuestionContent(s);
content.append(qc);
}
}
else
content.append($('<div class="question"></div>').text('No Sections'));
}
return content;
}
function createQuestionContent(section) {
var content = $('<div style="margin-bottom:30px;"></div>');
if (section.Questions && section.Questions.length > 0) {
for (var i = 0; i < section.Questions.length; i++) {
var q = section.Questions[i];
var div_question = $('<div class="question"></div>');
content.append(div_question);
var div_title = $('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText);
div_question.append(div_title);
if (q.StaticPictures && q.StaticPictures.length > 0) {
var div_pic = $('<div style=""></div>');
div_pic = createPictures(q.StaticPictures, div_pic);
div_question.append(div_pic)
}
createAnswerContent(content, q);
if (i != section.Questions.length - 1)
content.append($('<div style="border-bottom:1px solid #dbdbdb;"></div>'));
}
createQuestionContent1(content, section.Questions);
}
else
content.append($('<div class="question"></div>').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions')));
return content;
}
function createQuestionContent1(content, questions) {
if (questions && questions.length > 0) {
if (layoutStyle == 1) {//Compressed
var div_question = $('<table style="width:100%;" class="question_table"></table>');
content.append(div_question);
for (var i = 0; i < questions.length; i++) {
var q = questions[i];
var tr_question = $('<tr style="width:100%;"></tr>');
div_question.append(tr_question);
tr_question.append($('<td style="width:33%;"></td>').text(q.DisplayText));
var td_answer = $('<td style="width:33%;"></td>');
tr_question.append(td_answer);
createAnswerContent(td_answer, q);
var td_comment = $('<td style="width:33%;"></td>');
tr_question.append(td_comment);
var comment = td_answer.data('comment');
if (comment && comment != "") {
td_comment.append($('<div class="answer"></div>').html(replaceHtmlText(comment)));
}
if (q.IsImportant && layoutHighlightColor)
tr_question.css('background-color', layoutHighlightColor);
}
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
}
else if (layoutStyle == 2) {//Split
var div_question = $('<table style="width:100%;" class="question_table"></table>');
content.append(div_question);
var tr_question = "";
for (var i = 0; i < questions.length; i++) {
var q = questions[i];
if (i % 2 == 0) {
tr_question = $('<tr style="width:100%;"></tr>');
div_question.append(tr_question);
}
var td_question = $('<td style="width:25%;"></td>').text(q.DisplayText);
tr_question.append(td_question);
var td_answer = $('<td style="width:25%;"></td>');
tr_question.append(td_answer);
createAnswerContent(td_answer, q);
if (q.IsImportant && layoutHighlightColor) {
td_question.css('background-color', layoutHighlightColor);
td_answer.css('background-color', layoutHighlightColor);
}
}
if (questions.length % 2 != 0) {
tr_question.append($('<td style="width:25%;"></td><td style="width:25%;"></td>'));
}
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_table_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
}
else {
for (var i = 0; i < questions.length; i++) {
var q = questions[i];
var div_question = $('<div class="question"></div>');
content.append(div_question);
var div_title = $('<div style="width:320px;flex-grow:1;"></div>').text(q.DisplayText);
div_question.append(div_title);
if (q.StaticPictures && q.StaticPictures.length > 0) {
var div_pic = $('<div style=""></div>');
div_pic = createPictures(q.StaticPictures, div_pic);
div_question.append(div_pic)
}
createAnswerContent(content, q);
if (layoutDivider == 1)//Line
div_question.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_question.addClass('question_div_grid');
if (layoutSpacing == 1)//Double Space
div_question.css('line-height', '30px');
if (q.IsImportant && layoutHighlightColor)
div_question.css('background-color', layoutHighlightColor);
}
}
content.find('.answer').each(function () {
var div_answer = $(this);
if (layoutStyle == 1 || layoutStyle == 2) {
div_answer.addClass('table_content');
}
else {
var isimportant = div_answer.data('isimportant');
if (isimportant && layoutHighlightColor)
div_answer.css('background-color', layoutHighlightColor);
if (layoutDivider == 1)//Line
div_answer.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_answer.addClass('question_div_grid');
if (layoutSpacing == 1)//Double Space
div_answer.css('line-height', '30px');
}
});
content.find('.div_media').each(function () {
var div_media = $(this);
if (layoutStyle == 1 || layoutStyle == 2) {
div_media.css('padding-left', '3px');
}
else {
var isimportant = div_media.data('isimportant');
if (isimportant && layoutHighlightColor)
div_media.css('background-color', layoutHighlightColor);
if (layoutDivider == 1)//Line
div_media.addClass('question_line');
else if (layoutDivider == 2)//Grid
div_media.addClass('question_div_grid');
if (layoutSpacing == 1)//Double Space
div_media.css('line-height', '30px');
}
});
}
return content;
}
function createPictures(pictures, p) {
for (var i = 0; i < pictures.length; i++) {
var pic = pictures[i];
var img = $('<img style="width:40px;height:40px;margin-left:5px;"/>').attr('src', pic.Url).attr('title', pic.Name);
var img = $('<img style="height:30px;margin-left:5px;"/>').attr('src', pic.Url).attr('title', pic.Name);
img.click(pic.Url, function (e) {
window.open(e.data, "_blank")
});
@ -288,6 +620,7 @@ function createAnswerContent(p, q) {
for (var i = 0; i < reportdata.Answers.length; i++) {
var a = reportdata.Answers[i];
if (a.QuestionId.toLowerCase() == q.Id.toLowerCase()) {
p.data('comment', a.Comment);
if ([5, 8, 9, 10, 14, 15, 19].indexOf(q.QuestionType) < 0
|| (q.QuestionType == 15 && q.SubType != 15)) {//except YesOrNo/DropDown/MultipleChoice/Picture/FuelRecords
var result = a.Result;
@ -302,7 +635,7 @@ function createAnswerContent(p, q) {
|| (q.QuestionType == 15 && q.SubType == 10))//FuelRecords Quantity
result += " " + convertUnits(a.Units);
var div_answer = $('<div class="answer"></div>');
var div_answer = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
if (q.QuestionType == 1
|| (q.QuestionType == 15 && q.SubType == 14))
p.append(div_answer.html(replaceHtmlText(result))).append("<div style='clear:both;'></div>");
@ -318,7 +651,7 @@ function createAnswerContent(p, q) {
}
else if (q.QuestionType == 5) {//YesOrNo
if (a.SelectedItems && a.SelectedItems.length > 0) {
var item = $('<div class="answer" ></div>');
var item = $('<div class="answer" ></div>').data('isimportant', q.IsImportant);
var div_bg = $('<div class="circle"></div>');
var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
item.append(div_bg);
@ -338,7 +671,7 @@ function createAnswerContent(p, q) {
if (q.MultipleSelect) {
if (a.SelectedItems && a.SelectedItems.length > 0) {
for (var j = 0; j < a.SelectedItems.length; j++) {
var item = $('<div class="answer"></div>');
var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
var div_bg = $('<div class="circle"></div>');
var label = $('<label style="margin-left:5px;"></lable>').text("" + (j + 1) + ". " + a.SelectedItems[j].Text);
item.append(div_bg);
@ -355,7 +688,7 @@ function createAnswerContent(p, q) {
}
else {
if (a.SelectedItems && a.SelectedItems.length > 0) {
var item = $('<div class="answer" ></div>');
var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
var div_bg = $('<div class="circle"></div>');
var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
item.append(div_bg);
@ -373,7 +706,7 @@ function createAnswerContent(p, q) {
else if (q.QuestionType == 14) {//Email (Drop Down)
if (a.SelectedItems && a.SelectedItems.length > 0) {
for (var j = 0; j < a.SelectedItems.length; j++) {
var item = $('<div class="answer"></div>');
var item = $('<div class="answer"></div>').data('isimportant', q.IsImportant);
var label = $('<label style="margin-left:5px;"></lable>').text("" + (j + 1) + ". " + a.SelectedItems[j].Text + "<" + a.SelectedItems[j].Value + ">");
item.append(label);
item.append(label_level);
@ -383,33 +716,27 @@ function createAnswerContent(p, q) {
}
else if (q.QuestionType == 10
|| (q.QuestionType == 15 && q.SubType == 15)) {//Picture
var pics = $('<div style="min-height:80px;overflow:auto;padding-left:90px;"></div>');
p.append(pics);
if (layoutPicturesDisplay != 1) {//Displayed At Bottom
var pics = $('<div class="div_media" style="min-height:80px;overflow:auto;padding-left:90px;"></div>').data('isimportant', q.IsImportant);
p.append(pics);
}
//pics.append(label_level);
if (reportdata.Medias && reportdata.Medias.length > 0) {
for (var j = 0; j < reportdata.Medias.length; j++) {
var m = reportdata.Medias[j];
if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) {
if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
var v = $('<div class="media"><span class="video"></span></div>');
v.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
pics.append(v);
}
else {
var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
pic.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
pics.append(pic);
if (layoutPicturesDisplay == 1)//Displayed At Bottom
mediasdata.push(m);
else {//Displayed As Taken
var media = createMedias(m);
pics.append(media);
}
}
}
}
}
else if (q.QuestionType == 19) {//Asset Status
var divanswer = $('<div class="answer" ></div>');
var divanswer = $('<div class="answer" ></div>').data('isimportant', q.IsImportant);
if (a.SelectedItems && a.SelectedItems.length > 0) {
var div_bg = $('<div class="circle"></div>');
var label = $('<label style="margin-left:5px;"></lable>').text(a.SelectedItems[0].Text);
@ -422,36 +749,29 @@ function createAnswerContent(p, q) {
}
divanswer.append(label_level);
var pics = $('<div style="min-height:80px;overflow:auto;padding-left:90px;"></div>');
p.append(pics);
if (layoutPicturesDisplay != 1) {//Displayed At Bottom
var pics = $('<div class="div_media" style="min-height:80px;overflow:auto;padding-left:90px;"></div>').data('isimportant', q.IsImportant);
p.append(pics);
}
if (reportdata.Medias && reportdata.Medias.length > 0) {
for (var j = 0; j < reportdata.Medias.length; j++) {
var m = reportdata.Medias[j];
if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) {
if (['.mp4', '.mov'].indexOf(m.FileType.toLowerCase()) >= 0) {
var v = $('<div class="media"><span class="video"></span></div>');
v.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
pics.append(v);
}
else {
var pic = $('<img class="media"></img>').attr('src', m.ThumbnailUrl);
pic.click(m.Url, function (e) {
window.open(e.data, "_blank")
});
pics.append(pic);
if (layoutPicturesDisplay == 1)//Displayed At Bottom
mediasdata.push(m);
else {//Displayed As Taken
var media = createMedias(m);
pics.append(media);
}
}
}
}
if (a.Result && a.Result != "") {
p.append($('<div class="answer" style="color:#808080"></div>').html(replaceHtmlText(a.Result)));
p.append($('<div class="answer" style="color:#808080"></div>').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Result)));
}
}
if (a.Comment && a.Comment != "") {
p.append($('<div class="answer" style="color:#808080"></div>').html(replaceHtmlText(a.Comment)));
if (layoutStyle != 1 && layoutStyle != 2 && a.Comment && a.Comment != "") {
p.append($('<div class="answer" style="color:#808080"></div>').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Comment)));
}
return;
}

4
Site/IronIntelMasterPage.master
View File

@ -570,7 +570,7 @@
$('#mask_bg').hide();
});
$('#dialog_dashboards').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#dialog_chartnotes').dialog(function () {
$('#mask_bgcn').hide();
@ -1160,7 +1160,7 @@
</div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_MV_CANCEL" class="dialog-close" tabindex="12" />
<input type="button" value="Cancel" data-lgid="P_MV_CANCEL" class="dialog-close" tabindex="12" style="height:unset;" />
<input type="button" value="OK" data-lgid="P_CP_OK" onclick="openDashboard();" tabindex="11" />
<div class="clear"></div>
</div>

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);

14
Site/JobSite/AddRequirements.aspx
View File

@ -327,24 +327,24 @@
};
function showRequirementConfirm(msg, title, fprint, femai, fsave, fclose) {
$("#mask_bg").show();
showmaskbg(true);
_dialog.showRequirementConfirm(msg, title, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fprint === 'function') {
fprint(e);
}
}, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof femai === 'function') {
femai(e);
}
}, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fsave === 'function') {
fsave(e);
}
}, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fclose === 'function') {
fclose(e);
}
@ -686,12 +686,12 @@
})
$('#dialog_sendmail').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
OnExit();
});
$('#dialog_assignment').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#sendmail_othertextaddress').focus(function (e) {

12
Site/JobSite/AddScheduler.aspx
View File

@ -249,7 +249,7 @@
var alljobsites;
var addrequirement = true;
var _sendType = 0;
var currentdate = "<%=CurrentDate %>";
var currentdate = "<%=CurrentDate %>";
jobsitequery = function (method, param, callback, error, nolog) {
@ -269,19 +269,19 @@
};
function showAssetConfirm(msg, title, fcancel, fedit, fclose) {
$("#mask_bg").show();
showmaskbg(true);
_dialog.showAssetConfirm(msg, title, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fedit === 'function') {
fedit(e);
}
}, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fcancel === 'function') {
fcancel(e);
}
}, function (e) {
$("#mask_bg").hide();
showmaskbg(false);
if (typeof fclose === 'function') {
fclose(e);
}
@ -568,7 +568,7 @@
</td>
</tr>
<tr>
<td class="label" data-lgid="P_JS_POINTOFCONTACT">Point Of Contact</td>
<td class="label" data-lgid="P_JS_POINTOFCONTACT_COLON">Point Of Contact</td>
<td>
<input type="text" id="dialog_pointofcontact" maxlength="100" tabindex="1" autocomplete="off" />
</td>

4
Site/JobSite/DispatchRequests.aspx
View File

@ -272,7 +272,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
//{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
//{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'BeginDate', caption: GetTextByKey("P_JS_MOVEDATE", "Move Date"), valueIndex: 'BeginDate', css: { 'width': 100, 'text-align': 'left' } },
//{ name: 'BeginDate', caption: GetTextByKey("P_JS_BEGINDATE", "Begin Date"), valueIndex: 'BeginDate', css: { 'width': 100, 'text-align': 'left' } },
//{ name: 'EndDate', caption: GetTextByKey("P_JS_ENDDATE", "End Date"), valueIndex: 'EndDate', css: { 'width': 100, 'text-align': 'left' } },
@ -294,7 +294,7 @@
// checkbox
name: 'check',
key: 'Selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,

5
Site/JobSite/JobSiteManage.aspx
View File

@ -453,6 +453,7 @@
var dialogAssets = new $assetselector('dialog_machines');
dialogAssets.jobsiteId = jobsiteid;
dialogAssets.allowotherfilter = false;
dialogAssets.onDialogClosed = function () {
$("#dialogmask").hide();
$('#dialog_machines').remove();
@ -531,7 +532,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);

1
Site/JobSite/JobSiteMasterPage.master
View File

@ -86,7 +86,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 () {

12
Site/JobSite/JobsiteAutoCreateConfig.aspx
View File

@ -86,7 +86,7 @@
}
grid_dtassets.setData(grid_dtassets.innerSource.concat(items));
doSave(0, itemids);
$('#mask_bg').hide();
showmaskbg(false);
};
$('#dialog_assettype').prop('iframe', true).dialog(function () {
@ -148,7 +148,7 @@
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -225,7 +225,6 @@
return s.Values.AssetId;
});
dialogAUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnMachineDelete() {
@ -270,7 +269,7 @@
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -322,7 +321,7 @@
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -420,7 +419,7 @@
function OnAssetTypeAdd() {
$('#txt_assettype_key').val('');
$('#dialog_assettype .dialog-title span.title').text(GetTextByKey("P_JS_SELECTASSETTYPES", 'Select Asset Types'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_assettype')
.attr('act', 'edit')
.css({
@ -446,7 +445,6 @@
doSave(1, itemids);
$('#dialog_assettype').hideDialog();
//$('#mask_bg').hide();
}
function OnAssetTypeDelete() {

26
Site/JobSite/JobsiteLimitManagement.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;
}
@ -244,7 +232,7 @@
}
function ShowDialog(type) {
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_jobsitelimit')
.attr('act', type)
.showDialogRight1(450);
@ -488,7 +476,7 @@
});
$('#dialog_subscribecontacts').dialog(function () {
$('#mask_bg').hide();
showmaskbg(false);
});
$('#btnsubscribefilter').click(getMatchAvailableContacts);
$('#chk_showallassignedcontacts').click(getMatchSelectedContacts);
@ -523,12 +511,12 @@
var title = GetTextByKey("P_M3_SUBSCRIBECONTACTS", "Subscribe Contacts");
$('#dialog_subscribecontacts .dialog-title span.title').html(title);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_subscribecontacts')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_subscribecontacts').height()) / 5,
'left': (document.documentElement.clientWidth - $('#dialog_subscribecontacts').width()) / 2
}).showDialog();
}).showDialogfixed();
GetSelectedContacts();
}
@ -841,9 +829,6 @@
</div>
<div class="dialog" id="dialog_subscribecontacts" style="display: none;">
<div id="subscribedialogmask" 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_M3_SUBSCRIBECONTACTS">Subscribe Contacts</span><em class="dialog-close"></em></div>
<div class="machine_filter">
@ -886,6 +871,9 @@
<input type="button" onclick="OnSaveSubscribeContacts();" value="OK" data-lgid="P_M3_OK" tabindex="46" />
<div class="clear"></div>
</div>
<div id="subscribedialogmask" class="maskbg" style="display: none; ">
<div class="loading_icon icon c-spin"></div>
</div>
</div>
</div>
</asp:Content>

1
Site/JobSite/js/dispatchassign.js
View File

@ -41,7 +41,6 @@ function openAssignDispatch(seltype,) {
editableSelectAssignAsset.val('');
showmaskbg(true);
$('#dialog_assignment .dialog-title span.title').text(GetTextByKey('P_JS_DISPATCHASSIGNMENT', 'Dispatch Assignment'));
//$('#mask_bg').show();
$('#dialog_assignment')
.attr('act', 'edit')
.css({

8
Site/JobSite/js/email.js
View File

@ -34,7 +34,7 @@ function InitEmailGridData() {
{ name: 'DisplayName', caption: GetTextByKey("P_MV_CONTACTNAME", "Contact Name"), valueIndex: 'DisplayName', css: { 'width': 148, 'text-align': 'left' } },
{ name: 'ContactTypeName', caption: GetTextByKey("P_MV_CONTACTTYPE", "Contact Type"), valueIndex: 'ContactTypeName', css: { 'width': 148, 'text-align': 'left' } },
//{ name: 'Text', caption: GetTextByKey("P_MV_TEXT", "Text"), valueIndex: 'Text', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'Email', caption: GetTextByKey("P_MV_EMAIL", "Email"), valueIndex: 'Email', type: 3, css: { 'width': 45, 'text-align': 'center' } }
{ name: 'Email', caption: GetTextByKey("P_MV_EMAIL", "Email"), valueIndex: 'Email', type: 3, css: { 'width': 60, 'text-align': 'center' } }
];
var columns = [];
// head
@ -189,7 +189,7 @@ function onSendEmails() {
if (emailaddress.length == 0 && textaddress.length == 0) {
$('#dialog_sendmail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
return;
}
var item = {
@ -204,7 +204,7 @@ function onSendEmails() {
jobsitequery('SendEmails', htmlencode(JSON.stringify(item)), function (data) {
if (_sendType == 0) {
$('#dialog_sendmail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
OnExit(data);
}
else {
@ -214,7 +214,7 @@ function onSendEmails() {
showAlert(GetTextByKey("P_WO_MESSAGESENT", 'Message sent'), alerttitle);
$('#dialog_sendmail').hideDialog();
$('#mask_bg').hide();
showmaskbg(false);
}
if (aftersend)

6
Site/JobSite/js/jobsiterequirement.js
View File

@ -416,7 +416,7 @@ function InitAssetGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, allcheck: true, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, allcheck: true, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'MakeName', caption: GetTextByKey("P_PM_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 100, 'text-align': 'left' } },
{ name: 'ModelName', caption: GetTextByKey("P_PM_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 100, 'text-align': 'left' } },
{ name: 'AssetName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'AssetName', css: { 'width': 150, 'text-align': 'left' } },
@ -598,7 +598,7 @@ function InitAllAssetGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'MakeName', caption: GetTextByKey("P_PM_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 100, 'text-align': 'left' } },
{ name: 'ModelName', caption: GetTextByKey("P_PM_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 100, 'text-align': 'left' } },
{ name: 'AssetName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'AssetName', css: { 'width': 150, 'text-align': 'left' } },
@ -874,7 +874,7 @@ function OnSetMachine() {
currentRequirement.Assets = assets;
currentRequirement.ScheduledQuantity = assets.length;
$('#dialog_managemahchine').hide();
$("#mask_bg").hide();
showmaskbg(false);
}
function checkQuantity() {

2
Site/JobSite/js/scheduler.js
View File

@ -490,7 +490,7 @@ function checkSchedulerItems(alerttitle) {
function onUpdateScheduler() {
if (jobsiteschedulerCtrl.vue.source.length == 0) {
$('#dialog_managescheduler').hide();
$('#mask_bg').hide();
showmaskbg(false);
OnRefresh();
return;
}

75
Site/Languages/en-au/textres.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root lgid="en-us" ver="2021-03-18 11:06">
<root lgid="en-us" ver="2023-05-19 09:13">
<CLEAR_LOCAL_STORAGE>Clear Local Storage</CLEAR_LOCAL_STORAGE>
<CONFIRM_LOCAL_STORAGE>Are you sure to clear the local storage?</CONFIRM_LOCAL_STORAGE>
<ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Please check whether the user ID already exists in another FI product.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@ -455,6 +455,8 @@
<FI_FRS_BCL097>YTD Static</FI_FRS_BCL097>
<FI_FRS_BCL098>R12 Static</FI_FRS_BCL098>
<FI_FRS_BCL099>Set Value</FI_FRS_BCL099>
<FI_FRS_BCL100>Set Department And Location Region Percentages </FI_FRS_BCL100>
<FI_FRS_BCL101>The department/region allocation percentage is not set.</FI_FRS_BCL101>
<FI_FRS_BGT001>The Budget Name or Ledger ID already exists.</FI_FRS_BGT001>
<FI_FRS_BGT002>This Budget Version already exists.</FI_FRS_BGT002>
<FI_FRS_BGT003>This data source is in use and cannot be deleted.</FI_FRS_BGT003>
@ -674,6 +676,8 @@
<FI_FRS_C0054>Connector Settings</FI_FRS_C0054>
<FI_FRS_C0055>Connection</FI_FRS_C0055>
<FI_FRS_C0056>Use Excel Connector</FI_FRS_C0056>
<FI_FRS_C0057>Export Budget Package</FI_FRS_C0057>
<FI_FRS_C0058>Import Budget Package</FI_FRS_C0058>
<FI_FRS_CC001>Manage Constants</FI_FRS_CC001>
<FI_FRS_CC002>Name</FI_FRS_CC002>
<FI_FRS_CC003>Description</FI_FRS_CC003>
@ -803,6 +807,10 @@
<FI_FRS_IMPKG024>Lock password:</FI_FRS_IMPKG024>
<FI_FRS_IMPKG025>Confirm lock password:</FI_FRS_IMPKG025>
<FI_FRS_IMPKG026>Passwords do not match.</FI_FRS_IMPKG026>
<FI_FRS_IMPKG027>Available Budgets</FI_FRS_IMPKG027>
<FI_FRS_IMPKG028>Please select budgets to export.</FI_FRS_IMPKG028>
<FI_FRS_IMPKG029>Replace the budget.</FI_FRS_IMPKG029>
<FI_FRS_IMPKG030>Options for locking budgets</FI_FRS_IMPKG030>
<FI_FRS_LD001>Default Row Level Definitions</FI_FRS_LD001>
<FI_FRS_LD002>Level Description</FI_FRS_LD002>
<FI_FRS_LD003>Level</FI_FRS_LD003>
@ -918,6 +926,7 @@
<FI_FRS_MPG035>New Budget</FI_FRS_MPG035>
<FI_FRS_MPG036>Dashboard</FI_FRS_MPG036>
<FI_FRS_MPG037>FI Common</FI_FRS_MPG037>
<FI_FRS_MPG038>Enter Region Data</FI_FRS_MPG038>
<FI_FRS_PG0001>Login failed. Please retry.</FI_FRS_PG0001>
<FI_FRS_PG0002>Please Login</FI_FRS_PG0002>
<FI_FRS_PG0003>User ID:</FI_FRS_PG0003>
@ -1300,6 +1309,7 @@
<FI_HOST_EXT_A011>Import Application File</FI_HOST_EXT_A011>
<FI_HOST_MANAGEMENT_USER_A002>Save Permissions</FI_HOST_MANAGEMENT_USER_A002>
<FI_HOST_MANAGEMENT_USER_A005>Define Style</FI_HOST_MANAGEMENT_USER_A005>
<FI_HOST_MANAGEMENT_USER_A006>Email Verification</FI_HOST_MANAGEMENT_USER_A006>
<FI_HOST_MANAGEMENT_USER_A008>Saved permissions successfully.</FI_HOST_MANAGEMENT_USER_A008>
<FI_HOST_MANAGEMENT_USER_A009>Failed to save the user operation.</FI_HOST_MANAGEMENT_USER_A009>
<FI_HOST_MANAGEMENT_USER_A043>User Management</FI_HOST_MANAGEMENT_USER_A043>
@ -1312,6 +1322,7 @@
<FI_HOST_MANAGEMENT_USER_A113>One or more user(s) will be deleted from FRS, Do you want to continue?</FI_HOST_MANAGEMENT_USER_A113>
<FI_HOST_MANAGEMENT_USER_A114>Maintenance of Application Plug In</FI_HOST_MANAGEMENT_USER_A114>
<FI_HOST_MANAGEMENT_USER_A115>Use of Application Plug In</FI_HOST_MANAGEMENT_USER_A115>
<FI_HOST_MANAGEMENT_USER_A116>Copy User</FI_HOST_MANAGEMENT_USER_A116>
<FICTIP>Foresight Intelligence Center: Full Version</FICTIP>
<FULL_SCREEN>Full Screen</FULL_SCREEN>
<G5_FORGOTPWD>Forgot your password? Click &lt;a href="{0}"&gt;here&lt;/a&gt; to send a reminder email.</G5_FORGOTPWD>
@ -1543,7 +1554,7 @@
<LHBIS_EXCEPTION_E0X6502701B>An error occurred while searching for users in the system.</LHBIS_EXCEPTION_E0X6502701B>
<LHBIS_EXCEPTION_E0X6502701C>Failed to get the authenticated user list.</LHBIS_EXCEPTION_E0X6502701C>
<LHBIS_EXCEPTION_E0X6502701D>Failed to get the users list.</LHBIS_EXCEPTION_E0X6502701D>
<LHBIS_EXCEPTION_E0X6502701E>The user ID has been used by another user.</LHBIS_EXCEPTION_E0X6502701E>
<LHBIS_EXCEPTION_E0X6502701E>The user ID or email address has been used by another user.</LHBIS_EXCEPTION_E0X6502701E>
<LHBIS_EXCEPTION_E0X6502701F>Failed to add the user.</LHBIS_EXCEPTION_E0X6502701F>
<LHBIS_EXCEPTION_E0X65027020>Failed to save the user.</LHBIS_EXCEPTION_E0X65027020>
<LHBIS_EXCEPTION_E0X65027021>Failed to delete the user.</LHBIS_EXCEPTION_E0X65027021>
@ -2077,6 +2088,8 @@
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A012>The Refresh Time(s)'s value must be between 30 and 100,000 seconds.</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A012>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A013>Display Create Time</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A013>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A001>Chart Notes:</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A001>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A002>Internal Chart Notes:</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A002>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A003>Internal Chart Notes</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTNOTECTRL_A003>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A001>Type</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A001>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A002>Group</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A002>
<LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A003>Level</LHBIS_FIC_CLIENT_FICCONTROLS_CHARTSELECTCTRL_A003>
@ -2457,6 +2470,10 @@
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A118>My Database Detail</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A118>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A119>Tables</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A119>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A120>Views</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A120>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A121>Data Table Cache</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A121>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A122>Data replication</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A122>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123>SQL Queries</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123>
<LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A124>Schedules</LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A124>
<LHBIS_FIC_CLIENT_MODULES_A001>User Management</LHBIS_FIC_CLIENT_MODULES_A001>
<LHBIS_FIC_CLIENT_MODULES_A002>Add User</LHBIS_FIC_CLIENT_MODULES_A002>
<LHBIS_FIC_CLIENT_MODULES_A003>Import User</LHBIS_FIC_CLIENT_MODULES_A003>
@ -3012,6 +3029,17 @@
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A140>Please input the excel file name.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A140>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A141>Execution Timeout Expired. Would you like to retry it?</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A141>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A142>File extension required.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A142>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A143>Please enter a Cache Data Table Name.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A143>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A144>Index Name</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A144>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A145>Fields</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A145>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A146>Use Local Cache:</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A146>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A147>Cache Data Table Name:</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A147>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A148>Indexes</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A148>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A149>Index names cannot be duplicate.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A149>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A150>Data Table Cache</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A150>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A151>The Cache Data Table name {0} already exists.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A151>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A152>Cache Name</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A152>
<LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A153>Please name the filter.</LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A153>
<LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A001>Add</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A001>
<LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A002>Delete</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A002>
<LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A003>Refresh</LHBIS_FIC_CLIENT_MODULES_DRILLDOWNURLPROVIDER_A003>
@ -3253,6 +3281,8 @@
<LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A016>Saturday</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A016>
<LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A017>Sunday</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A017>
<LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A018>End of Month</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A018>
<LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A019>Annually</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A019>
<LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A020>Month</LHBIS_FIC_CLIENT_MODULES_JOBDETAIL_FREQUENCY_A020>
<LHBIS_FIC_CLIENT_MODULES_JOBDETAILMODULE_A001>Job Detail</LHBIS_FIC_CLIENT_MODULES_JOBDETAILMODULE_A001>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A001>Job List</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A001>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A002>Add</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A002>
@ -3266,6 +3296,9 @@
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A010>Execute failed.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A010>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A011>Save</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A011>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A012>Jobs executed successfully.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A012>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A013>Execute</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A013>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A014>Are you sure want to execute the sql queries?</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A014>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A015>Sql Query executed successfully.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_A015>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A001>An error occurred while getting the Job Schedule list.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A001>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A002>An error occurred while getting the Job Schedule information.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A002>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A003>An error occurred while modifying the Job Schedule information.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_EXCEPTION_A003>
@ -3282,6 +3315,24 @@
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A007>The daily frequency's "ending time" value is invalid. This can be left empty.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A007>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A008>The Job Name cannot be empty.</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A008>
<LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A009>Monthly Everyday Count is out of range. (1-31)</LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_NOTICE_A009>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A001>&lt;!DOCTYPE html&gt;&lt;html&gt;&lt;head&gt;&lt;meta content=""text/html; charset=UTF-8"" http-equiv=""content-type""&gt;
&lt;style type=""text/css""&gt;p{{font-family:Calibri,Tahoma,Verdana;color:black;}}&lt;/style&gt;&lt;/head&gt;
&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;p&gt;An account has been established for you by {0}. Your password is &lt;b&gt;{1}&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;This password is a temporary password, please log on &lt;a href='{2}'&gt;Here&lt;/a&gt;&amp;nbsp;to change your password. If you have any questions, please contact us.&lt;/p&gt;
&lt;p&gt;Regards,&lt;br /&gt;
{0}&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A001>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A002>&lt;!DOCTYPE html&gt;&lt;html&gt;&lt;head&gt;&lt;meta content=""text/html; charset=UTF-8"" http-equiv=""content-type""&gt;
&lt;style type=""text/css""&gt;p{{font-family:Calibri,Tahoma,Verdana;color:black;}}&lt;/style&gt;&lt;/head&gt;
&lt;body&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;p&gt;An account has been established for you by {0}. Your ID is &lt;b&gt;{1}&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;Another email with your temporary password will be sent under separate email. If you have any questions, please contact us.&lt;/p&gt;
&lt;p&gt;Regards,&lt;br /&gt;
{0}&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A002>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A003>New Alert:</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A003>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A004>Alert Name: </LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A004>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A005>Create Time: </LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A005>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A006>Alert Content:</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A006>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A007>{0} User ID</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A007>
<LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A008>{0} Password</LHBIS_FIC_CLIENT_MODULES_MAILLANGUAGE_A008>
<LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A001>Navigation Definitions</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A001>
<LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A002>Navigation Name</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A002>
<LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A003>Single window mode</LHBIS_FIC_CLIENT_MODULES_NAVIGATION_A003>
@ -3345,6 +3396,9 @@
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A016>Schedule</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A016>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Note: Labels of values where the percentage is less than 1 may not be shown.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Attachments</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Resend</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>The execute starting time must be early than the ending time.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Resend Email Subscription</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Group:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Level:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A003>Email:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A003>
@ -3367,6 +3421,8 @@
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A020>The text message address is invalid.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A020>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A021>Do you still want to save?</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A021>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A022>The email is blank.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A022>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A023>This user does not have Data Table Access Rights to view this chart. Would you like to continue?</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A023>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A024>Only send if Chart has data</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A024>
<LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A001>Workspace Name</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A001>
<LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A002>Description</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A002>
<LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A003>Group Name</LHBIS_FIC_CLIENT_MODULES_RWORKSPACEEDITDIALOG_A003>
@ -3663,6 +3719,7 @@
<LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A073>Tonne</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A073>
<LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A074>Pound</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A074>
<LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A075>Ton (U.S.)</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A075>
<LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A076>Always prompt</LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A076>
<LHBIS_FIC_CLIENT_MODULES_TASKLOG_A001>Task schedule logs</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A001>
<LHBIS_FIC_CLIENT_MODULES_TASKLOG_A002>Delete</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A002>
<LHBIS_FIC_CLIENT_MODULES_TASKLOG_A003>Delete All</LHBIS_FIC_CLIENT_MODULES_TASKLOG_A003>
@ -3816,6 +3873,9 @@
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A072>Linked To Azure</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A072>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A073>Are you sure you want to Clear this?</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A073>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A074>Link To Local User</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A074>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A075>Language</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A075>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A076>Email Verification</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A076>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A077>Azure user</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A077>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B007>User ID</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B007>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B008>User Name</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B008>
<LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B009>User Level</LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_B009>
@ -4097,6 +4157,7 @@
<LHBIS_FIC_CLIENT_PACKAGE_CREATE_A094>Overwrite Top Records</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A094>
<LHBIS_FIC_CLIENT_PACKAGE_CREATE_A095>Chart Color Scheme Name</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A095>
<LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096>Chart Color Scheme</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096>
<LHBIS_FIC_CLIENT_PACKAGE_CREATE_A097>SQL Query</LHBIS_FIC_CLIENT_PACKAGE_CREATE_A097>
<LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A001>Please enter the Publisher.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A001>
<LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A002>Please enter the Name.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A002>
<LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A003>Please enter the Password.</LHBIS_FIC_CLIENT_PACKAGE_EXPORTDATACONNECTIONS_A003>
@ -4673,6 +4734,9 @@
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A410>Pound</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A410>
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A411>Ton (U.S.)</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A411>
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A412>Pivot Enabled</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A412>
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A413>Count Distinct</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A413>
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A414>Chart Title:</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A414>
<LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A415>Filter And DataSources</LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A415>
<LHBIS_FIC_CLIENT_WSP_A001>Each of the parameters, @cy and @cm, can only be used once in a chart.</LHBIS_FIC_CLIENT_WSP_A001>
<LHBIS_FIC_DATAMODEL_COMMON_A001>Language resource 1</LHBIS_FIC_DATAMODEL_COMMON_A001>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A001>Please install Silverlight 5.0</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A001>
@ -4737,6 +4801,12 @@
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A16>The SilverLight Isolated Storage space is not large enough.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A16>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A17>You are currently logged in on another computer. If you log in here, the other session will be disconnected. Would you like to proceed?</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A17>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A18>Forgot Password</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A18>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A19>Two-Factor Authentication:</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A19>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A20>An Email with a verification code has been sent to: {0}. Please enter the code to continue.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A20>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A22>An incorrect verification code has been entered. Please try again.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A22>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A23>Below is the one-time code for logging into your account.</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A23>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A24>Your one-time code: {0}</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A24>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A25>Valid for : 10 min</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A25>
<LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_B001>Language:</LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_B001>
<LHBIS_FIC_SILVERLIGHT_WSP_ERROR_A001>Get the list of data table errors.</LHBIS_FIC_SILVERLIGHT_WSP_ERROR_A001>
<LHBIS_FIC_SILVERLIGHT_WSP_INOTIFYCHANGED_A001>At least one chart has been changed in the current board.</LHBIS_FIC_SILVERLIGHT_WSP_INOTIFYCHANGED_A001>
@ -4774,6 +4844,7 @@
<LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A027>Language</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A027>
<LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A028>Copy Cell</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A028>
<LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A029>Copy Row</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A029>
<LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A030>Refresh Board Cached Data</LHBIS_FIC_SILVERLIGHT_WSP_RMENUCTRL_A030>
<LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A001>Logout</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A001>
<LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A002>Add Board</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A002>
<LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A003>Board</LHBIS_FIC_SILVERLIGHT_WSP_WORKSPACEPAGE_A003>

3
Site/Languages/en-us/textres.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root lgid="en-us" ver="2022-10-21 09:56">
<root lgid="en-us" ver="2023-05-19 09:13">
<CLEAR_LOCAL_STORAGE>Clear Local Storage</CLEAR_LOCAL_STORAGE>
<CONFIRM_LOCAL_STORAGE>Are you sure to clear the local storage?</CONFIRM_LOCAL_STORAGE>
<ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Please check whether the user ID already exists in another FI product.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@ -3397,6 +3397,7 @@
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Note: Labels of values where the percentage is less than 1 may not be shown.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Attachments</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Resend</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>The execute starting time must be early than the ending time.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Resend Email Subscription</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Group:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Level:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

1
Site/Languages/es.json Normal file
View File

File diff suppressed because one or more lines are too long

3
Site/Languages/fr-fr/textres.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root lgid="fr-fr" ver="2022-10-21 09:56">
<root lgid="fr-fr" ver="2023-05-19 09:13">
<CLEAR_LOCAL_STORAGE>Effacer le stockage local</CLEAR_LOCAL_STORAGE>
<CONFIRM_LOCAL_STORAGE>Etes-vous sûr d'effacer le stockage local?</CONFIRM_LOCAL_STORAGE>
<ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>Veuillez s'il vous plaît vérifier si l'identifiant d'utilisateur existe déjà dans un autre produit FI.</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@ -3397,6 +3397,7 @@
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>Remarque: Les étiquettes de valeurs où le pourcentage est inférieur à 1 peuvent ne pas être affichées.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>Pièces jointes</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>Rediffusion</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>L’heure de début d’exécution doit être antérieure à l’heure de fin.</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>Revendre les abonnements par courriel</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>Groupe:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>Niveau:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

3
Site/Languages/zh-chs/textres.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root lgid="zh-chs" ver="2022-10-21 09:56">
<root lgid="zh-chs" ver="2023-05-19 09:13">
<CLEAR_LOCAL_STORAGE>清除本地存储</CLEAR_LOCAL_STORAGE>
<CONFIRM_LOCAL_STORAGE>您确定要清除本地存储吗？</CONFIRM_LOCAL_STORAGE>
<ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>请检查该用户是否已经存在于FI其它系统中。</ERROR_LHBIS_AUTHORIZATION_AUTHORAGENT_A0002>
@ -3398,6 +3398,7 @@
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>注意：百分比小于1的值的标签将不会显示。</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A017>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>附件</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A018>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>重发</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A019>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>执行开始时间必须早于结束时间。</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_A020>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>重发邮件订阅</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBE_BBBB>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>分类:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A001>
<LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>级别:</LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A002>

25
Site/MachineDeviceManagement/AddDevice.aspx
View File

@ -302,7 +302,6 @@
function devicerequest(method, param, callback, error) {
_network.request("MachineDeviceManagement/ManageMachines.aspx", -1, method, param, callback, error || function (e) {
console.log(e);
showmaskbg(false, true);
showAlert('An unknown error occurred. Please refresh page.', 'Query');
});
}
@ -622,9 +621,9 @@
function getDeviceComments() {
var cid = $('#sel_contractor').val();
$('#mask_bg').show();
showloading(true);
devicerequest("GetDeviceComments", JSON.stringify([cid, deviceid]), function (data) {
$('#mask_bg').hide();
showloading(false);
if (typeof (data) === "string") {
return;
}
@ -637,7 +636,7 @@
}
}
}, function (err) {
$('#mask_bg').hide();
showloading(false);
});
}
@ -663,9 +662,9 @@
var cid = $('#sel_contractor').val();
var param = JSON.stringify([cid, deviceid, comment]);
param = htmlencode(param);
$('#mask_bg').show();
showloading(true);
devicerequest("AddDeviceComment", param, function (data) {
$('#mask_bg').hide();
showloading(false);
if (data !== "") {
showAlert(data, GetTextByKey("P_MD_ERROR", 'Error'));
return;
@ -673,7 +672,7 @@
$('#dialog_comments').val("");
getDeviceComments();
}, function (err) {
$('#mask_bg').hide();
showloading(false);
});
}
@ -683,9 +682,9 @@
function getDeviceInstallationNotes() {
var cid = $('#sel_contractor').val();
$('#mask_bg').show();
showloading(true);
devicerequest("GetDeviceInstallationNotes", JSON.stringify([cid, deviceid]), function (data) {
$('#mask_bg').hide();
showloading(false);
if (typeof (data) === "string") {
return;
}
@ -698,7 +697,7 @@
}
}
}, function (err) {
$('#mask_bg').hide();
showloading(false);
});
}
@ -739,7 +738,7 @@
var cid = $('#sel_contractor').val();
var param = JSON.stringify([cid, deviceid, inotes]);
$('#mask_bg').show();
showloading(true);
var formData = new FormData();
if (inImages && inImages.length > 0) {
@ -762,14 +761,14 @@
showAlert(data, alerttitle);
return;
}
$('#mask_bg').hide();
showloading(false);
$('#dialog_installationnotes').val("");
inImages = [];
$("#divINImages").empty();
getDeviceInstallationNotes();
},
error: function (err) {
$('#mask_bg').hide();
showloading(false);
}
});
}

78
Site/MachineDeviceManagement/AddMachine.aspx
View File

@ -444,6 +444,17 @@
var rentalChanged = false;//编辑机器时是否有修改，只用于Attributes和Rental
var jobsiteinputChanged = false;//编辑机器时是否有修改，只用于JobSite
function showConfirm1(msg, title, fok, fcancel) {
_dialog.showConfirm(msg, title, function (e) {
if (typeof fok === 'function') {
fok(e);
}
}, function () {
if (fcancel)
fcancel();
});
}
function devicerequest(method, param, callback, error) {
_network.request("MachineDeviceManagement/ManageMachines.aspx", -1, method, param, callback, error || function (e) {
showmaskbg(false, true);
@ -1554,7 +1565,7 @@
if (!IsSupperAdmin) {
$('#dialog_preloaded').hide();
$('#dialog_preloaded_text').hide();
}
window.onresize = resizeContent;
@ -1615,6 +1626,34 @@
$("#dialogmask").hide();
}
function showsubloading(id, flag, noanimation) {
var mask = $("#" + id);
mask.children().show();
if (noanimation) {
mask.css('display', flag ? '' : 'none');
} else {
if (flag) {
mask.fadeIn(100);
} else {
mask.fadeOut(100);
}
}
}
function showsubmask(id, flag, noanimation) {
var mask = $("#" + id);
mask.children().hide();
if (noanimation) {
mask.css('display', flag ? '' : 'none');
} else {
if (flag) {
mask.fadeIn(100);
} else {
mask.fadeOut(100);
}
}
}
function OnNext() {
OnSave(0, 0, gotoNext);
}
@ -1642,9 +1681,6 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="div_content" style="min-width: 1024px;">
<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,0);" data-lgid="P_MA_SAVE">Save</span>
<span class="sbutton iconsave" onclick="OnSave(1,0);" data-lgid="P_MA_SAVE1">Save and Exit</span>
@ -1723,7 +1759,7 @@
<tr>
<td class="label" data-lgid="P_MA_DESCRIPTION_COLON">Description:</td>
<td>
<textarea id="dialog_description" class="inputbox" style="height: 60px;" maxlength="1000" tabindex="15"></textarea>
<textarea id="dialog_description" style="height: 60px;" maxlength="1000" tabindex="15"></textarea>
</td>
</tr>
<tr>
@ -1983,7 +2019,7 @@
<tr>
<td class="label" data-lgid="P_MA_COMMENTS_COLON">Comments:</td>
<td colspan="3">
<textarea id="dialog_comments" class="inputbox" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea>
<textarea id="dialog_comments" maxlength="1000" tabindex="68" style="width: 454px; margin-top: 2px;"></textarea>
</td>
</tr>
<tr>
@ -2158,13 +2194,16 @@
</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>
</div>
<div class="dialog" id="dialog_adjustodometer" style="display: none; width: 960px;">
<div id="adjustodomask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTODOMETER">Adjust Odometer</span><em class="dialog-close"></em></div>
<div class="dialog-content adjust-content">
<table style="line-height: 25px; width: 100%;">
@ -2210,7 +2249,7 @@
</tr>
<tr>
<td class="label" colspan="2">
<div id="odometermostrecent" style="height: 90px; width:920px;"></div>
<div id="odometermostrecent" style="height: 90px; width: 920px;"></div>
</td>
</tr>
<tr>
@ -2218,7 +2257,7 @@
</tr>
<tr>
<td class="label" colspan="2">
<div id="odometerhislist" style="height: 300px; width:920px;"></div>
<div id="odometerhislist" style="height: 300px; width: 920px;"></div>
</td>
</tr>
</table>
@ -2229,10 +2268,10 @@
<input type="button" onclick="OnPreviewOdometer();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="108" />
<div class="clear"></div>
</div>
<div id="adjustodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_adjustenginehours" style="display: none; width: 940px;">
<div id="adjustenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADJUSTENGINEHOURS">Adjust EngineHours</span><em class="dialog-close"></em></div>
<div class="dialog-content adjust-content">
<table style="line-height: 25px; width: 100%;">
@ -2270,7 +2309,7 @@
</tr>
<tr>
<td class="label" colspan="2">
<div id="enginehoursmostrecent" style="height: 90px;width:920px;"></div>
<div id="enginehoursmostrecent" style="height: 90px; width: 920px;"></div>
</td>
</tr>
<tr>
@ -2278,7 +2317,7 @@
</tr>
<tr>
<td class="label" colspan="2">
<div id="enginehourshislist" style="height: 300px;width:920px;"></div>
<div id="enginehourshislist" style="height: 300px; width: 920px;"></div>
</td>
</tr>
</table>
@ -2289,6 +2328,7 @@
<input type="button" onclick="OnPreviewEngineHours();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="127" />
<div class="clear"></div>
</div>
<div id="adjustenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
@ -2312,7 +2352,6 @@
<div class="dialog" id="dialog_addodometer" style="display: none; width: 600px;">
<div id="addodomask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADDODOMETER">Add Odometer</span><em class="dialog-close"></em></div>
<div class="dialog-content adjust-content">
<table style="line-height: 25px; width: 100%;">
@ -2360,11 +2399,11 @@
<input type="button" onclick="OnAddOdometer();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="158" />
<div class="clear"></div>
</div>
<div id="addodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_addenginehours" style="display: none; width: 600px;">
<div id="addenginehoursmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADDOENGINEHOURS">Add Engine Hours</span><em class="dialog-close"></em></div>
<div class="dialog-content adjust-content">
<table style="line-height: 28px; width: 100%;">
@ -2404,6 +2443,7 @@
<input type="button" onclick="OnAddEngineHours();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="177" />
<div class="clear"></div>
</div>
<div id="addenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
@ -2419,7 +2459,6 @@
</div>
<div class="dialog" id="dialog_addmake" style="display: none; width: 360px;">
<div id="addmakemask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMAKE">Add Make</span><em class="dialog-close"></em></div>
<div class="dialog-content assetcontent">
<table>
@ -2435,10 +2474,10 @@
<input type="button" onclick="OnSaveMake();" value="OK" data-lgid="P_MA_OK" tabindex="301" />
<div class="clear"></div>
</div>
<div id="addmakemask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_addmodel" style="display: none; width: 360px;">
<div id="addmodelmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADDMODEL">Add Model</span><em class="dialog-close"></em></div>
<div class="dialog-content assetcontent">
<table>
@ -2467,10 +2506,10 @@
<input type="button" onclick="OnSaveModel();" value="OK" data-lgid="P_MA_OK" tabindex="404" />
<div class="clear"></div>
</div>
<div id="addmodelmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_assetduplicates" style="display: none; min-width: 540px;">
<div id="assetdupmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title">
<span class="title" style="float: left;" data-lgid="P_MA_POSSIBLEDUPLICATES_COLON">Possible Duplicates:&nbsp;<span id="spnumberinfo"></span></span>
<div class="function_title" id="divDupFun" style="float: left; margin-left: 230px; display: none; line-height: 28px;">
@ -2658,10 +2697,10 @@
<input type="button" value="Ignore and Create Asset" data-lgid="P_MA_IGNOREANDCREATEASSET" onclick="OnIgnoreDuplicate();" style="width: 150px;" tabindex="500" />
<div class="clear"></div>
</div>
<div id="assetdupmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_mergeasset" style="display: none; min-width: 540px;">
<div id="mergeassetmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title">
<span class="title" style="float: left;" data-lgid="P_MA_XXX">Merge Asset</span>
<em class="dialog-close"></em>
@ -2857,11 +2896,11 @@
<input type="button" value="Cancel" data-lgid="P_MA_CANCEL" class="dialog-close" tabindex="501" />
<div class="clear"></div>
</div>
<div id="mergeassetmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_adddocument" style="display: none; width: 500px;">
<div id="adddocumentmask" class="maskbg" style="display: none; z-index: 1;"></div>
<div class="dialog-title"><span class="title" data-lgid="P_MA_ADDITIONALDOCUMENTATION">Additional Documentation</span><em class="dialog-close"></em></div>
<div class="dialog-content adjust-content">
<table style="line-height: 30px; width: 100%;">
@ -2923,5 +2962,6 @@
<input type="button" onclick="OnSaveDocument();" value="Save" data-lgid="P_MA_SAVE" tabindex="400" />
<div class="clear"></div>
</div>
<div id="adddocumentmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
</asp:Content>

12
Site/MachineDeviceManagement/AddMachineGroup.aspx
View File

@ -493,7 +493,6 @@
return s.Values.ID;
});
dialogAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
var grid_dtsm;
@ -514,7 +513,7 @@
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -619,9 +618,6 @@
<div class="loading c-spin"></div>
</div>
<div id="div_content">
<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_AG_SAVE">Save</span>
<span class="sbutton iconsave" onclick="OnSave(1);" data-lgid="P_AG_SAVE1">Save and Exit</span>
@ -635,19 +631,19 @@
<tr>
<td class="label" data-lgid="P_AG_GROUPNAME_COLON">Group Name:</td>
<td>
<input type="text" id="dialog_groupname" class="inputbox" maxlength="200" tabindex="1" style="width: 300px;" />
<input type="text" id="dialog_groupname" maxlength="200" tabindex="1" style="width: 300px;" />
</td>
</tr>
<tr>
<td class="label" style="width: 50px; text-align: right;" data-lgid="P_AG_CODE_COLON">Code:</td>
<td>
<input type="text" id="dialog_groupcode" class="inputbox" maxlength="50" tabindex="1" style="width: 300px;" />
<input type="text" id="dialog_groupcode" maxlength="50" tabindex="1" style="width: 300px;" />
</td>
</tr>
<tr>
<td class="label" data-lgid="P_AG_DESCRIPTION_COLON">Description:</td>
<td>
<textarea id="dialog_description" class="inputbox" maxlength="1000" tabindex="2" style="width: 300px"></textarea></td>
<textarea id="dialog_description" maxlength="1000" tabindex="2" style="width: 300px"></textarea></td>
</tr>
</table>
<div class="dialog-subheader">

2
Site/MachineDeviceManagement/AddRental.aspx
View File

@ -538,7 +538,7 @@
<tr>
<td class="label" data-lgid="P_MR_COMMENTS_COLON">Comments:</td>
<td>
<textarea id="dialog_comments" class="inputbox" maxlength="1000" tabindex="14" style="width: 540px; height: 120px;"></textarea>
<textarea id="dialog_comments" maxlength="1000" tabindex="14" style="width: 540px; height: 120px;"></textarea>
<span id="span_a" style="margin-left: 50px;"><a href="#" onclick="OnViewChangeHistory();" data-lgid="P_MR_VIEWCHANGEHIS">View Change History</a></span>
</td>
</tr>

2
Site/MachineDeviceManagement/DeviceManagementBase.master
View File

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

11
Site/MachineDeviceManagement/MachineGroups.aspx
View File

@ -32,11 +32,6 @@
left: 150px;
}
.inputbox {
width: 564px;
padding: 1px;
}
#dialog_description {
padding: 2px;
height: 60px;
@ -345,17 +340,17 @@
<tr>
<td class="label">Group Name:</td>
<td>
<input type="text" id="dialog_groupname" class="inputbox" maxlength="200" tabindex="1" style="width: 300px;" />
<input type="text" id="dialog_groupname" maxlength="200" tabindex="1" style="width: 300px;" />
</td>
<td class="label" style="width: 50px; text-align: right;">Code:</td>
<td>
<input type="text" id="dialog_groupcode" class="inputbox" maxlength="50" tabindex="1" style="width: 200px;" />
<input type="text" id="dialog_groupcode" maxlength="50" tabindex="1" style="width: 200px;" />
</td>
</tr>
<tr>
<td class="label">Description:</td>
<td colspan="3">
<textarea id="dialog_description" class="inputbox" maxlength="1000" tabindex="2"></textarea></td>
<textarea id="dialog_description" maxlength="1000" tabindex="2"></textarea></td>
</tr>
</table>
<div class="dialog-subheader">Group Assets</div>

6
Site/MachineDeviceManagement/ManageGPSDevices.aspx
View File

@ -178,11 +178,11 @@
if (j === "Status")
r[j] = { DisplayValue: r["Status"] === 1 ? "Active" : "Inactive", Value: r[j] };
else if (j === "AddDate")
r[j] = { DisplayValue: r["AddDateStr"], Value: r["AddDateStr1"] };
r[j] = { DisplayValue: r["AddDateStr"], Value: r[j] };
else if (j === "InvoiceDate")
r[j] = { DisplayValue: r["InvoiceDateStr"], Value: r[j] };
else if (j === "ServiceStartDate")
r[j] = { DisplayValue: r["ServiceStartDateStr"], Value: r["ServiceStartDateStr1"] };
r[j] = { DisplayValue: r["ServiceStartDateStr"], Value: r[j] };
else if (j === "EngineHoursDate")
r[j] = { DisplayValue: r["EngineHoursDateStr"], Value: r[j] };
else if (j === "EngineHours")
@ -548,7 +548,7 @@
type: 3,
key: 'checked',
allcheck: true,
width: 30,
width: 45,
align: 'center'
});
}

4
Site/MachineDeviceManagement/ManageMachines.aspx
View File

@ -487,7 +487,7 @@
//grid_dt.lang.ok = "Apply";
//grid_dt.lang.reset;
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 40, 'text-align': 'center' }, type: 3 },
{ name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 45, 'text-align': 'center' }, type: 3 },
{ name: 'VIN', caption: GetTextByKey("P_MA_VINSN", "SN/VIN"), valueIndex: 'VIN', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'Name', caption: GetTextByKey("P_MA_ASSETNAME", "Asset Name"), valueIndex: 'Name', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'Name2', caption: GetTextByKey("P_MA_ASSETNAME2", "Asset Name(Custom)"), valueIndex: 'Name2', css: { 'width': 180, 'text-align': 'left' } },
@ -897,7 +897,7 @@
type: 3,
key: 'checked',
allcheck: true,
width: 30,
width: 45,
align: 'center'
});
}

70
Site/MachineDeviceManagement/ManageRentals.aspx
View File

@ -62,7 +62,6 @@
<link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
<script src="<%=GetFileUrlWithVersion("../Maintenance/js/inputdatactr.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
<script src="<%=GetFileUrlWithVersion("../js/editableselect.js")%>"></script>
<script type="text/javascript">
var IsDealer = <%=IsDealer ?"true":"false"%>;
var IsAdmin =<%=IsAdmin ?"true":"false"%>;
@ -70,10 +69,6 @@
var MachineID = "<%=MachineID %>";
var machines;
var editableSelectMachine;
var listeditableSelectMachine;
function devicerequest(method, param, callback, error) {
_network.request("MachineDeviceManagement/ManageRentals.aspx", -1, method, param, callback, error || function (e) {
@ -106,8 +101,7 @@
else
$("#btnAdd").hide();
GetMachines();
OnRefresh();
});
}
@ -133,7 +127,7 @@
}
else
$("#btnAdd").hide();
GetMachines();
OnRefresh();
});
}
@ -207,29 +201,6 @@
});
}
function GetMachines() {
contractorid = htmlencode($.trim($('#sel_contractor').val()));
devicerequest("GetSelectMachinesByCompany", contractorid, function (data) {
if (data && data.length > 0) {
machines = data;
editableSelectMachine.datasource = machines;
editableSelectMachine.valuepath = "MachineID"
editableSelectMachine.displaypath = "DisplayName";
listeditableSelectMachine.datasource = machines;
listeditableSelectMachine.valuepath = "MachineID"
listeditableSelectMachine.displaypath = "DisplayName";
//if (MachineID !== "")//暂时不过滤机器
// listeditableSelectMachine.val(MachineID);
}
OnRefresh();
}, function (err) {
});
}
function OnRefresh() {
showloading(true);
@ -239,10 +210,6 @@
var startdate = htmlencode($('#startdatetxt').val());
var enddate = htmlencode($('#enddatetxt').val());
var machine = listeditableSelectMachine.selecteditem();
if (machine != null)
MachineID = machine.MachineID;
devicerequest("SearchRentals", contractorid + String.fromCharCode(170) + searchtxt
+ String.fromCharCode(170) + startdate + String.fromCharCode(170) + enddate
+ String.fromCharCode(170) + "", function (data) {
@ -411,8 +378,7 @@
var from = htmlencode($('#startdatetxt').val());
var to = htmlencode($('#enddatetxt').val());
mid = listeditableSelectMachine.val();
if (mid === undefined) mid = "";
var mid = "";
var sortPath = $("#tbRentals").data("sortPath");
if (sortPath === undefined) sortPath = "";
@ -429,8 +395,7 @@
var from = htmlencode($('#startdatetxt').val());
var to = htmlencode($('#enddatetxt').val());
mid = listeditableSelectMachine.val();
if (mid === undefined) mid = "";
var mid = "";
var sortPath = $("#tbRentals").data("sortPath");
if (sortPath === undefined) sortPath = "";
@ -444,10 +409,6 @@
setPageTitle(GetTextByKey("P_MANAGERENTALS", "Manage Rentals"), true);
InitGridData();
editableSelectMachine = new $editableselect($("#dialog_machine"));
editableSelectMachine.tabIndex(1);
listeditableSelectMachine = new $editableselect($("#sel_machine"));
if (IsDealer == true) {
$('#span_contractor').css('display', '');
$('#span_contractor').parent().css('display', '');
@ -458,13 +419,12 @@
}
}
else
GetMachines();
OnRefresh();
$("#sel_contractor").change(function () {
GetMachines();
OnRefresh();
});
$('#searchinputtxt').keydown(searchEnter);
$('#startdatetxt').datetimepicker({
@ -531,18 +491,6 @@
}
}
function OnViewHistory() {
var cid = "";
cid = htmlencode($.trim($('#sel_contractor').val()));
var machineID = "";
var machine = listeditableSelectMachine.selecteditem();
if (machine != null)
machineID = machine.MachineID;
else
machineID = "";
window.open("RentalChangeHistory.aspx?cid=" + cid + "&mid=" + machineID + "");
}
function OnViewChangeHistory(rental) {
if (!rental) {
return;
@ -550,11 +498,6 @@
var cid = "";
cid = htmlencode($.trim($('#sel_contractor').val()));
var machineID = "";
var machine = listeditableSelectMachine.selecteditem();
if (machine != null)
machineID = machine.MachineID;
else
machineID = "";
window.open("RentalChangeHistory.aspx?cid=" + cid + "&mid=" + machineID + "&rid=" + rental.RentalID + "");
}
@ -597,7 +540,6 @@
<span class="sbutton iconrefresh" onclick="OnRefresh();" data-lgid="P_MR_REFRESH">Refresh</span>
<span class="sbutton iconprint" onclick="OnPrint();" style="display: none;" data-lgid="P_MR_PRINT">Print</span>
<span id="spExport" class="sbutton iconexport" onclick="OnExport();" data-lgid="P_MR_EXPORTTOEXCEL">Export to Excel</span>
<%--<input id="btnhistory" type="button" onclick="OnViewHistory();" value="View Change History" style="width: 150px;" />--%>
</div>
</td>
</tr>

106
Site/MachineDeviceManagement/RentalChangeHistory.aspx
View File

@ -80,90 +80,14 @@
});
}
//admin用户 获取所有contractor
function getContractors() {
devicerequest('GetContractors', '', function (data) {
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MR_ERROR", 'Error'));
return;
}
if (data && data.length > 0) {
var sel_search = $('#sel_contractor').empty();
for (var i = 0; i < data.length; i++) {
var kv = data[i];
var op_search = $('<option></option>').val(kv.Key).text(kv.Value);
if (kv.Key == contractorid)
op_search.prop('selected', true);
sel_search.append(op_search);
}
if (contractorid !== "")
sel_search.val(contractorid);
}
GetMachines();
});
}
//普通用户 获取可操作的contractor
function GetContractorsByUser() {
devicerequest('GetContractorsByUser', '', function (data) {
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MR_ERROR", 'Error'));
return;
}
if (data && data.length > 0) {
var sel_search = $('#sel_contractor').empty();
for (var i = 0; i < data.length; i++) {
var kv = data[i];
var op_search = $('<option></option>').val(kv.Key).text(kv.Value);
sel_search.append(op_search);
}
if (contractorid !== "")
sel_search.val(contractorid);
}
GetMachines();
});
}
function GetMachines() {
contractorid = htmlencode($.trim($('#sel_contractor').val()));
devicerequest("GetSelectMachinesByCompany", contractorid, function (data) {
if (data && data.length > 0) {
machines = data;
listeditableSelectMachine.datasource = machines;
listeditableSelectMachine.valuepath = "MachineID"
listeditableSelectMachine.displaypath = "DisplayName";
//if (MachineID !== "")//暂时不过滤机器
//listeditableSelectMachine.val(MachineID);
}
OnRefresh();
}, function (err) {
});
}
function OnRefresh() {
showloading(true);
var cid = htmlencode($.trim($('#sel_contractor').val()));
if (cid && cid != '')
contractorid = cid;
var searchtxt = "";
searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
var startdate = htmlencode($('#startdatetxt').val());
var enddate = htmlencode($('#enddatetxt').val());
var machine = listeditableSelectMachine.selecteditem();
if (machine != null)
MachineID = machine.MachineID;
else
MachineID = "";
devicerequest("SearchRentalChangeHistory", contractorid + String.fromCharCode(170) + searchtxt
+ String.fromCharCode(170) + startdate + String.fromCharCode(170) + enddate
+ String.fromCharCode(170) + MachineID + String.fromCharCode(170) + RentalID, function (data) {
@ -181,16 +105,11 @@
}
function OnExport() {
var cid = htmlencode($.trim($('#sel_contractor').val()));
if (cid && cid != '')
contractorid = cid;
var searchtxt = "";
searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
var from = htmlencode($('#startdatetxt').val());
var to = htmlencode($('#enddatetxt').val());
mid = listeditableSelectMachine.val();
if (mid === undefined) mid = "";
var mid = "";
var sortPath = grid_dt.sortKey;
if (sortPath === undefined) sortPath = "";
@ -200,16 +119,11 @@
}
function OnPrint() {
var cid = htmlencode($.trim($('#sel_contractor').val()));
if (cid && cid != '')
contractorid = cid;
var searchtxt = "";
searchtxt = htmlencode($.trim($('#searchinputtxt').val()));
var from = htmlencode($('#startdatetxt').val());
var to = htmlencode($('#enddatetxt').val());
mid = listeditableSelectMachine.val();
if (mid === undefined) mid = "";
var mid = "";
var sortPath = grid_dt.sortKey;
if (sortPath === undefined) sortPath = "";
@ -298,22 +212,6 @@
$('#tr_search').css('display', 'none');
}
//if (IsDealer == true) {
// $('#span_contractor').css('display', '');
// $('#span_contractor').parent().css('display', '');
// if (IsAdmin)
// getContractors();
// else {
// GetContractorsByUser();
// }
//}
//else
// GetMachines();
//$("#sel_contractor").change(function () {
// GetMachines();
//});
OnRefresh();
$('#searchinputtxt').keydown(searchEnter);

8
Site/MachineDeviceManagement/ShareMachines.aspx
View File

@ -371,7 +371,7 @@
//grid_dt.lang.ok = "Apply";
//grid_dt.lang.reset;
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 30, 'text-align': 'center' }, type: 3 },
{ name: 'Selected', caption: "", valueIndex: 'Selected', alwaysshow: true, css: { 'width': 45, 'text-align': 'center' }, type: 3 },
{ name: 'VIN', caption: GetTextByKey("P_MA_VINSN", "SN/VIN"), valueIndex: 'VIN', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'Name', caption: GetTextByKey("P_MA_ASSETNAME", "Asset Name"), valueIndex: 'AssetName', css: { 'width': 180, 'text-align': 'left' } },
{ name: 'Name2', caption: GetTextByKey("P_MA_ASSETNAME2", "Asset Name(Custom)"), valueIndex: 'AssetCustomerName', css: { 'width': 180, 'text-align': 'left' } },
@ -659,7 +659,7 @@
{
key: 'Selected',
type: 3,
width: 30,
width: 45,
align: 'center',
allcheck: true,
enabled: '__selectable'
@ -799,7 +799,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Sharable', caption: "", valueIndex: 'Sharable', css: { 'width': 30, 'text-align': 'center' }, type: 3 },
{ name: 'Sharable', caption: "", valueIndex: 'Sharable', css: { 'width': 45, 'text-align': 'center' }, type: 3 },
{ name: 'CustomerId', caption: GetTextByKey("P_XXXXXX", "ID"), valueIndex: 'CustomerId', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'CustomerName', caption: GetTextByKey("P_XXXXXX", "Name"), valueIndex: 'CustomerName', css: { 'width': 200, 'text-align': 'left' } },
];
@ -1123,7 +1123,7 @@
<div id="customerlist" style="height: 400px; width: 400px; 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="saveShareWithCustomers();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div style="clear: both;"></div>
</div>

77
Site/MachineDeviceManagement/js/adj_enginehours.js
View File

@ -229,18 +229,18 @@ function InitEnginehoursHisGridData() {
}
function getEnineHours() {
showLoading();
showsubloading("adjustenginehoursmask", true);
grid_enginehoursdt.setData([]);
devicerequest("GetAssetCurrentEngineHours", contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowEngineHours(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -248,7 +248,7 @@ function getEnineHours() {
function getEngineHoursHis() {
grid_enginehoursmostrecentdt.setData([]);
grid_enginehourshisdt.setData([]);
showLoading();
showsubloading("adjustenginehoursmask", true);
var methodname = "GetCalampEngineHoursHistory";
if (isPedigreeEH)
methodname = "GetPedigreeEngineHoursHistory";
@ -256,7 +256,7 @@ function getEngineHoursHis() {
methodname = "GetOEMDD2EngineHoursHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -264,7 +264,7 @@ function getEngineHoursHis() {
//ShowEngineHoursHis(data);
ShowMostRecentEngineHours(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -282,27 +282,23 @@ function getEngineHoursHisPreview() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
@ -319,7 +315,7 @@ function getEngineHoursHisPreview() {
function GetCalampEngineHoursHistoryPreview(item) {
grid_enginehourshisdt.setData([]);
showLoading();
showsubloading("adjustenginehoursmask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
@ -329,7 +325,7 @@ function GetCalampEngineHoursHistoryPreview(item) {
if (isOEMDD2EH)
methodname = "GetOEMDD2EngineHoursHistoryPreview";
devicerequest(methodname, param, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -337,7 +333,7 @@ function GetCalampEngineHoursHistoryPreview(item) {
ShowEngineHoursHis(data);
ShowMostRecentEngineHoursPreview(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -461,11 +457,11 @@ function openAdjustEngineHours() {
function OnAdjustEngineHours() {
$('#adjustenginehoursmask').show();
showsubmask("adjustenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours');
var enginehourstxt = GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours");
showConfirm('Do you want to adjust the engine hours?', alerttitle, function () {
$('#adjustodomask').hide();
showConfirm1('Do you want to adjust the engine hours?', alerttitle, function () {
showsubmask("adjustenginehoursmask", false);
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -478,26 +474,26 @@ function OnAdjustEngineHours() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
@ -510,7 +506,7 @@ function OnAdjustEngineHours() {
CheckEngineHourMinimumTime(item, "submit");
}, function () {
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
});
}
@ -518,12 +514,13 @@ function CheckEngineHourMinimumTime(item, type) {
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("CheckEngineHourMinimumTime", param, function (data) {
showsubmask("adjustenginehoursmask", false);
if (data > 0) {
if (data == 1)
showAlert(GetTextByKey("P_MA_CHECKENGINEHOURSMINNIMUMTIME", "The adjustment cannot be completed as provided. The engine hours reading date provided cannot be prior to initial telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
else
showAlert(GetTextByKey("P_MA_CHECKENGINEHOURSMINNIMUMTIME1", "The adjustment cannot be completed as provided. The engine hours reading date provided must be prior to or equal to the latest telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
$('#adjustenginehoursmask').hide();
return;
} else {
if (type === "submit")
@ -532,18 +529,20 @@ function CheckEngineHourMinimumTime(item, type) {
GetCalampEngineHoursHistoryPreview(item);
}
}, function (err) {
showsubmask("adjustenginehoursmask", false);
});
}
function SaveAdjustEngineHours(item) {
showloading(true);
showsubloading("adjustenginehoursmask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("adjustenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTENGINEHOURS", GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
devicerequest("SaveAdjustEngineHours", param, function (data) {
showloading(false);
showsubloading("adjustenginehoursmask", false);
if (data !== 'OK') {
showAlert(data, alerttitle);
} else {
@ -553,12 +552,11 @@ function SaveAdjustEngineHours(item) {
}
$('#dialog_adjustenginehours').hideDialog();
$('#adjustenginehoursmask').hide();
showmaskbg(false);
}, function (err) {
console.log(err);
showloading(false);
showAlert(GetTextByKey("P_MA_FAILEDTO", "Failed to {0}.").replace('{0}', alerttitle), alerttitle);
$('#adjustenginehoursmask').hide();
showsubloading("adjustenginehoursmask", false);
});
}
@ -598,11 +596,10 @@ function openAddEnginHours() {
function OnAddEngineHours() {
$('#addenginehoursmask').show();
showsubmask("addenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADDENGINEHOURS", 'Add Engine Hours');
var enginehourstxt = GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours");
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADDTHEENGINEHOURS", 'Do you want to add the engine hours?'), alerttitle, function () {
$('#adjustodomask').hide();
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADDTHEENGINEHOURS", 'Do you want to add the engine hours?'), alerttitle, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -614,26 +611,26 @@ function OnAddEngineHours() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
var offset = $('#dialogadd_enginehourstimezone').find("option:selected").attr("offset");
@ -644,12 +641,12 @@ function OnAddEngineHours() {
item.EngineHoursDate = item.EngineHoursDate.replace("-", "/") + " " + hour + ":" + minute + ":" + "00";
showloading(true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("addenginehoursmask", true);
devicerequest("AddManuallyInputEngineHours", param, function (data) {
showloading(false);
showsubloading("addenginehoursmask", false);
if (data !== 'OK') {
if (data === "Failed")
data = GetTextByKey("P_MA_FAILED", "Failed");
@ -661,16 +658,16 @@ function OnAddEngineHours() {
}
$('#dialog_addenginehours').hideDialog();
$('#addenginehoursmask').hide();
showmaskbg(false);
}, function (err) {
console.log(err);
showloading(false);
showsubloading("addenginehoursmask", false);
showAlert(GetTextByKey("P_MA_FAILEDTO", "Failed to {0}.").replace('{0}', GetTextByKey("P_MA_ADDENGINEHOURS", "Add Engine Hours")), alerttitle);
$('#addenginehoursmask').hide();
});
}, function () {
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
});
}

76
Site/MachineDeviceManagement/js/adj_odometer.js
View File

@ -219,23 +219,23 @@ function InitOdometerHisGridData() {
function getOdometers() {
grid_odometerdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
devicerequest("GetAssetCurrentOdometer", contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowOdometers(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
function getOdometerHis() {
grid_odometermostrecentdt.setData([]);
grid_odometerhisdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
var methodname = "";
if (isCalampOdo)
@ -246,7 +246,7 @@ function getOdometerHis() {
methodname = "GetSmartWitnessOdometerHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -254,7 +254,7 @@ function getOdometerHis() {
//ShowOdometerHis(data);
ShowMostRecentOdometer(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
@ -271,27 +271,23 @@ function getOdometerHisPreview() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttitle);
$('#adjustodomask').hide();
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttitle);
$('#adjustodomask').hide();
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttitle);
$('#adjustodomask').hide();
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttitle);
$('#adjustodomask').hide();
hideLoading();
return;
}
@ -309,7 +305,7 @@ function getOdometerHisPreview() {
function GetOdometerHistoryPreview(item) {
grid_odometerhisdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
if (isCalampOdo)
@ -320,7 +316,7 @@ function GetOdometerHistoryPreview(item) {
methodname = "GetSmartWitnessOdometerHistoryPreview";
devicerequest(methodname, param, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -328,7 +324,7 @@ function GetOdometerHistoryPreview(item) {
ShowOdometerHis(data);
ShowMostRecentOdometerPreview(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
@ -446,9 +442,9 @@ function openAdjustOdometer() {
}
function OnAdjustOdometer() {
$('#adjustodomask').show();
showsubmask("adjustodomask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer");
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADJUSTTHEODOMETER", 'Do you want to adjust the odometer?'), alerttitle, function () {
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADJUSTTHEODOMETER", 'Do you want to adjust the odometer?'), alerttitle, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -462,26 +458,26 @@ function OnAdjustOdometer() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
var offset = $('#dialogadjust_odometertimezone').find("option:selected").attr("offset");
@ -495,9 +491,8 @@ function OnAdjustOdometer() {
CheckOdometerMinnimumTime(item, "submit");
}, function () {
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
});
}
@ -505,12 +500,13 @@ function CheckOdometerMinnimumTime(item, type) {
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("CheckOdometerMinnimumTime", param, function (data) {
showsubmask("adjustodomask", false);
if (data > 0) {
if (data == 1)
showAlert(GetTextByKey("P_MA_CHECKODOMETERMINNIMUMTIME1", "The adjustment cannot be completed as provided. The odometer reading date provided cannot be prior to initial telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
else
showAlert(GetTextByKey("P_MA_CHECKODOMETERMINNIMUMTIME", "The adjustment cannot be completed as provided. The odometer reading date provided must be prior to or equal to the latest telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
$('#adjustodomask').hide();
return;
} else {
if (type === "submit")
@ -519,16 +515,17 @@ function CheckOdometerMinnimumTime(item, type) {
GetOdometerHistoryPreview(item);
}
}, function (err) {
showsubmask("adjustodomask", false);
});
}
function SaveAdjustOdometer(item) {
showloading(true);
showsubloading("adjustodomask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("SaveAdjustOdometer", param, function (data) {
showloading(false);
showsubloading("adjustodomask", false);
if (data !== 'OK') {
showAlert(data, GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
} else {
@ -538,11 +535,10 @@ function SaveAdjustOdometer(item) {
}
$('#dialog_adjustodometer').hideDialog();
$('#adjustodomask').hide();
showmaskbg(false);
}, function (err) {
showloading(false);
showAlert(GetTextByKey("P_MA_FAILEDTOADJUSTDOMETER", 'Failed to adjust Odometer.'), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
$('#adjustodomask').hide();
showsubloading("adjustodomask", false);
});
}
@ -571,7 +567,6 @@ function openAddOdometer() {
$('#dialog_addodometer .dialog-title span.title').text(GetTextByKey("P_MA_ADDODOMETER", 'Add Odometer'));
showmaskbg(true);
$('#dialog_addodometer')
.attr('act', 'add')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_addodometer').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_addodometer').width()) / 2
@ -581,9 +576,9 @@ function openAddOdometer() {
}
function OnAddOdometer() {
$('#addodomask').show();
showsubmask("addodomask", true);
var alerttile = GetTextByKey("P_MA_ADDODOMETER", 'Add Odometer');
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADDTHEODOMETER", 'Do you want to add the odometer?'), alerttile, function () {
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADDTHEODOMETER", 'Do you want to add the odometer?'), alerttile, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -596,26 +591,26 @@ function OnAddOdometer() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
var offset = $('#dialogadd_odometertimezone').find("option:selected").attr("offset");
@ -625,11 +620,12 @@ function OnAddOdometer() {
var minute = $('#dialogadd_timeminute').val();
item.OdometerDate = item.OdometerDate.replace("-", "/") + " " + hour + ":" + minute + ":" + "00";
showloading(true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("addodomask", true);
devicerequest("AddManuallyInputOdometer", param, function (data) {
showloading(false);
showsubloading("addodomask", false);
if (data !== 'OK') {
showAlert(data, alerttile);
} else {
@ -639,15 +635,13 @@ function OnAddOdometer() {
}
$('#dialog_addodometer').hideDialog();
$('#addodomask').hide();
showmaskbg(false);
}, function (err) {
showloading(false);
showAlert('Failed to add Odometer.', alerttile);
$('#addodomask').hide();
showsubloading("addodomask", false);
});
}, function () {
$('#addodomask').hide();
showsubloading("addodomask", false);
});
}

5
Site/MachineDeviceManagement/js/assetother.js
View File

@ -167,7 +167,8 @@ function InitJobSiteGridData() {
col.events = {
onchange: function () {
inputChanged = true;
jobsiteinputChanged = true;
if (this.OnSite)
jobsiteinputChanged = true;
}
};
col.tooltip = GetTextByKey("P_MA_ONSITETITLE", "The On Site box should only be checked if the asset has a permanent assignment not based on location. Geofence and Jobsite Add/Remove will not be triggered if checked.");
@ -265,7 +266,7 @@ function InitAssetGroupGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'GroupName', caption: GetTextByKey("P_MA_GROUPNAME", "Group Name"), valueIndex: 'GroupName', css: { 'width': 300, 'text-align': 'left' } }
];
var columns = [];

4
Site/MachineDeviceManagement/js/assetpm.js
View File

@ -36,7 +36,7 @@ function InitPMGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'PmScheduleName', caption: GetTextByKey("P_MA_SCHEDULENAME", "Schedule Name"), valueIndex: 'PmScheduleName', css: { 'width': 200, 'text-align': 'left' } },
{ name: 'StartValue', caption: GetTextByKey("P_MA_INITIALSERVICEVALUE", "Initial Service Value"), valueIndex: 'StartValue', css: { 'width': 120, 'text-align': 'right' } },
{ name: 'LastAlertTimeString', caption: GetTextByKey("P_MA_LASTSERVICEDATE", "Last Service Date"), valueIndex: 'LastAlertTimeString', css: { 'width': 120, 'text-align': 'left' } },
@ -429,7 +429,7 @@ function createTBMContent(contentctrl, pmschedule) {
item.PmScheduleID = pmschedule.PmScheduleID;
//item.PMType = pmschedule.PmScheduleType;
if (radio1.prop("checked")) {
item.StartDate = nowdate;
item.StartDate = currentdate;
}
else {
item.StartDate = txtLastServiceDate.val();

1
Site/MachineDeviceManagement/js/mergeasset.js
View File

@ -223,7 +223,6 @@ function OnMergeAsset() {
dialogSelectMergeAssets.exceptShareAsset = true;
dialogSelectMergeAssets.exceptSource = [machineid];
dialogSelectMergeAssets.showSelector(3, true);//与attachmentInfo中的showSelector冲突,需设置force
$('#mask_bg').css('height', '100%');
}
var mergeassetid;

21
Site/Maintenance/AddCustomerRecord.aspx
View File

@ -478,7 +478,7 @@
$('#dialog_canopenwo').prop('checked', false);
$('#dialog_contact .dialog-title span.title').text(alerttitle);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_contact')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_contact').height()) / 3,
@ -504,7 +504,7 @@
$('#dialog_canopenwo').prop('checked', contact.CanOpenWO);
$('#dialog_contact .dialog-title span.title').text(GetTextByKey("P_CR_EDITCONTACT", 'Edit Contact'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_contact')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_contact').height()) / 3,
@ -803,7 +803,7 @@
searchFollower(true);
$('#addfollowerpopupdialog .dialog-title span.title').text(alerttitle);
$('#mask_bg').show();
showmaskbg(true);
$('#addfollowerpopupdialog')
.css({
'top': (document.documentElement.clientHeight - $('#addfollowerpopupdialog').height()) / 3,
@ -901,11 +901,7 @@
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="mask_bg" style="display: none; z-index: 500"><div class="loading c-spin"></div></div>
<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">
<%if (!CRReadOnly)
{%>
@ -1048,8 +1044,13 @@
</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></div>
<div class="dialog" id="dialog_contact" style="display: none;">
<div class="dialog-title"><span class="title" data-lgid="P_CR_ADDCONTACT">Add Contact</span><em class="dialog-close"></em></div>
<div class="dialog-content">
@ -1114,7 +1115,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="onSaveContact();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div style="clear: both;"></div>
</div>
@ -1132,7 +1133,7 @@
<div id="salespersonlist" style="width: 650px; height: 400px; 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="onSetSalesperson();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div style="clear: both;"></div>
</div>

46
Site/Maintenance/AddFuelRecord.aspx
View File

@ -86,26 +86,6 @@
color: gray;
}
#mask_over_bg {
top: 32px;
left: 0;
right: 0;
bottom: 0;
position: fixed;
background: #000;
opacity: 0.2;
}
#att_mask_bg {
top: 0;
left: 0;
right: 0;
bottom: 0;
position: fixed;
background: #000;
opacity: 0.2;
}
#divcontent {
margin: 8px;
}
@ -293,7 +273,7 @@
getAttachments();
$('.function_title>.sbutton-ui').removeClass('disabled');
$('#mask_over_bg').hide();
showloading(false);
}
var IsInteger = /^[0-9]+$/;
@ -504,7 +484,7 @@
fuelid = fl.FuelID;
fuel = fl;
setEnable(fl.IsComesFromAPI);
$('#mask_over_bg').show();
showloading(true);
GetMachines(OnEdit);
}
else {
@ -585,9 +565,9 @@
//*************************Start Notes********************************//
function getFuelRecordComments() {
$('#mask_over_bg').show();
showloading(true);
fuelrequest("GetFuelRecordComments", fuelid, function (data) {
$('#mask_over_bg').hide();
showloading(false);
if (typeof (data) === "string") {
return;
}
@ -601,7 +581,7 @@
}
$("#divcomments")[0].scrollTop = $("#divcomments")[0].scrollHeight;
}, function (err) {
$('#mask_over_bg').hide();
showloading(false);
});
}
@ -626,9 +606,9 @@
var param = JSON.stringify([fuelid, comment]);
param = htmlencode(param);
$('#mask_over_bg').show();
showloading(true);
fuelrequest("AddFuelRecordComment", param, function (data) {
$('#mask_over_bg').hide();
showloading(false);
if (data !== "") {
showAlert(data, GetTextByKey("P_FR_ERROR", 'Error'));
return;
@ -636,7 +616,7 @@
$('#dialog_comments').val("");
getFuelRecordComments();
}, function (err) {
$('#mask_over_bg').hide();
showloading(false);
});
}
@ -755,10 +735,6 @@
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="mask_bg" style="display: none;">
<%--<div class="loading c-spin"></div>
--%>
</div>
<div>
<div class="function_title">
<span class="sbutton iconsave sbutton-ui" onclick="OnSave(0,this);" data-lgid="P_FR_SAVE">Save</span>
@ -1000,13 +976,9 @@
</div>
</div>
</div>
<%--<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>--%>
</div>
</div>
<div id="mask_over_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div id="att_mask_bg" style="display: none;">
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
</asp:Content>

19
Site/Maintenance/AddSurveyTemplate.aspx
View File

@ -129,11 +129,11 @@
}
function getSurveyTemplateInfo(copy) {
showLoading();
showloading(true);
$('#questionlist').empty();
wosurveyCtrl = undefined;
worequest("GetSurveyTemplateInfo", surveyid, function (data) {
hideLoading();
showloading(false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_WOS_ERROR", 'Error'));
return;
@ -157,7 +157,7 @@
}
}, function (err) {
hideLoading();
showloading(false);
});
}
@ -255,14 +255,6 @@
}
}
function showLoading() {
$("#dialogmask").show();
}
function hideLoading() {
$("#dialogmask").hide();
}
$(function () {
init();
@ -277,11 +269,7 @@
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="mask_bg" style="display: none; z-index: 500"><div class="loading c-spin"></div></div>
<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>
@ -326,4 +314,5 @@
</div>
</div>
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
</asp:Content>

2026
Site/Maintenance/AddWorkOrder.aspx
View File

File diff suppressed because it is too large Load Diff

8
Site/Maintenance/AlertAutomationManagement.aspx
View File

@ -164,7 +164,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'Value', caption: GetTextByKey("P_AM_ALERTTYPE", "Alert Type"), valueIndex: 'Value', css: { 'width': 300, 'text-align': 'left' } }
];
var columns = [];
@ -470,7 +470,7 @@
$('#dialog_desc').val("");
$('#dialog_wogenerator .dialog-title span.title').text(alerttitle);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_wogenerator')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_wogenerator').height()) / 3,
@ -505,7 +505,7 @@
}
$('#dialog_wogenerator .dialog-title span.title').text(GetTextByKey("P_AM_EDITWORKORDERGENERATOR", 'Edit Work Order Generator'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_wogenerator')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_wogenerator').height()) / 3,
@ -776,7 +776,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="onSaveWorkOrderGenerator();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div style="clear: both;"></div>
</div>

16
Site/Maintenance/AlertsManagement.aspx
View File

@ -123,6 +123,11 @@
content: '\f56e';
}
.exit:before {
font-family: CalciteWebCoreIcons, FontAwesome;
content: '\f08b';
}
#div_autoacknowledgelist input[type="checkbox"] {
width: unset;
}
@ -829,7 +834,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'WorkOrderID', caption: GetTextByKey("P_AM_WORKORDERID", "Work Order ID"), valueIndex: 'WorkOrderID', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'WorkOrderStatus', caption: GetTextByKey("P_AM_WORKORDERSTATUS", "Work Order Status"), valueIndex: 'WorkOrderStatus', allowFilter: true, css: { 'width': 140, 'text-align': 'left' } },
{ name: 'MachineName', caption: GetTextByKey("P_AM_ASSETNAME", "Asset Name"), valueIndex: 'MachineName', css: { 'width': 180, 'text-align': 'left' } },
@ -1225,7 +1230,11 @@
<div id="recordcontent" style="padding: 0px; margin: 0px;">
<div class="page_title">
<span data-lgid="P_ALERTSMANAGEMENT">Alerts Management</span>
<span id="spExport" class="export" style="float: right; font-size: 14px; margin-right: 10px; cursor: pointer;" onclick="OnExport();">
<span class="exit" onclick="OnExit();" style="<%=InDialog?"": "display:none;"%>;float: right; font-size: 14px; margin-right: 10px; cursor: pointer;">
<label data-lgid="P_WO_EXIT" style="padding-left: 2px;">Exit</label>
</span>
<span id="spExport" class="export" style="float: right; font-size: 14px;margin-right: 10px; cursor: pointer;" onclick="OnExport();">
<label data-lgid="P_AM_EXPORT" style="padding-left: 2px;">Export</label>
</span>
<span class="autoacknowledge" style="<%=InDialog?"display:none;": ""%>; float: right; font-size: 14px; margin-right: 15px; cursor: pointer;" onclick="openOpenAutoAcknowled();">
@ -1278,7 +1287,6 @@
<span class="sbutton iconadd" id="btnassignworkorder" onclick="AssignedWorkOrder();" data-lgid="P_AM_CREATEWORKORDER">Create Work Order</span>
<span class="sbutton iconrefresh" onclick="GetAlerts();" data-lgid="P_AM_REFRESH">Refresh</span>
<span class="sbutton iconexpand" id="btnExpandAll" onclick="ExpandAll(this);" data-lgid="P_AM_EXPANDALL">Expand All</span>
<span class="sbutton iconexit" onclick="OnExit();" style="<%=InDialog?"": "display:none;"%>" data-lgid="P_WO_EXIT">Exit</span>
</div>
<div class="clear"></div>
<div id="alertviewlist" style="min-width: 1280px;"></div>
@ -1328,7 +1336,7 @@
<tr>
<td class="label" data-lgid="P_AM_COMMENT_COLON">Comment:</td>
<td>
<textarea id="dialog_acknowledgmentcomment" class="inputbox" maxlength="1000" tabindex="1" style="width: 400px; height: 120px;"></textarea>
<textarea id="dialog_acknowledgmentcomment" maxlength="1000" tabindex="1" style="width: 400px; height: 120px;"></textarea>
</td>
</tr>
</table>

5
Site/Maintenance/AutoAcknowledChangeHistory.aspx
View File

@ -144,6 +144,9 @@
}
$(function () {
if (!canExport) {
$('#spExport').hide();
}
InitGridData();
OnRefresh();
@ -162,7 +165,7 @@
</div>
<div class="function_title">
<span class="sbutton iconrefresh" onclick="OnRefresh();" data-lgid="P_AM_REFRESH">Refresh</span>
<span class="sbutton iconexport" onclick="OnExport();" data-lgid="P_AM_EXPORT">Export to Excel</span>
<span id="spExport" class="sbutton iconexport" onclick="OnExport();" data-lgid="P_AM_EXPORT">Export to Excel</span>
</div>
<div class="clear"></div>
<div id="autoacknowledgelist"></div>

12
Site/Maintenance/CustomerRecordManagement.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;
}

15
Site/Maintenance/FuelRecordManagement.aspx
View File

@ -47,6 +47,11 @@
text-decoration: none;
color: #2140fb;
}
.exit:before {
font-family: CalciteWebCoreIcons, FontAwesome;
content: '\f08b';
}
</style>
<script src="../js/jquery.datetimepicker.full.js"></script>
<script src="<%=GetFileUrlWithVersion("js/inputdatactr.js")%>" type="text/javascript"></script>
@ -67,7 +72,7 @@
showmaskbg(false, true);
showAlert(GetTextByKey('P_FR_PAGEERROR', 'An unknown error occurred. Please refresh page.'), GetTextByKey('P_FR_QUERY', 'Query'));
});
}
}
function enterKeydown(e) {
if (e.keyCode == 13) {
@ -359,7 +364,12 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="recordcontent" style="padding: 0px; margin: 0px;">
<div class="page_title" data-lgid="P_FUELRECORDS">Fuel Records</div>
<div class="page_title">
<span data-lgid="P_FUELRECORDS">Fuel Records</span>
<span class="exit" onclick="OnExit();" style="<%=InDialog?"": "display:none;"%>; float: right; font-size: 14px; margin-right: 10px; cursor: pointer;">
<label data-lgid="P_WO_EXIT" style="padding-left: 2px;">Exit</label>
</span>
</div>
<div class="search_bar">
<input type="password" autocomplete="new-password" style="display: none" />
<span data-lgid="P_FR_BEGINDATE_COLON">Begin Date:&nbsp;</span>
@ -377,7 +387,6 @@
<span class="sbutton iconedit" onclick="OnEdit();" style="<%=InDialog?"display:none;": ""%>;" data-lgid="P_FR_EDIT">Edit</span>
<span class="sbutton iconrefresh" onclick="OnRefresh();" data-lgid="P_FR_REFRESH">Refresh</span>
<span id="spExport" class="sbutton iconexport" onclick="OnExport();" data-lgid="P_MR_EXPORTTOEXCEL">Export to Excel</span>
<span class="sbutton iconexit" onclick="OnExit();" style="<%=InDialog?"": "display:none;"%>;" data-lgid="P_WO_EXIT">Exit</span>
</div>
<div class="clear"></div>
<div id="recordlist"></div>

1
Site/Maintenance/MachineMaintenanceInfo.aspx
View File

@ -435,7 +435,6 @@
GetRecordesbymachineID();
}
}
$('#mask_bg').css('height', $(document).height())
},
error: function (msg) {
showAlert(msg.statusText, GetTextByKey("P_MRM_ERROR", 'Error'));

2
Site/Maintenance/MaintenanceBase.master
View File

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

12
Site/Maintenance/MaintenanceSchedulesManagement.aspx
View File

@ -355,24 +355,24 @@
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_interval" style="display: none; z-index: 500;">
<div class="dialog" id="dialog_interval" style="display: none; ">
<div class="dialog-title"><span class="title" data-lgid="P_PM_ADDABSOLUTEHOURSINTERVAL">Add Absolute Hours Interval</span><em class="dialog-close"></em></div>
<div class="dialog-content">
<table class="dialog_table">
<tr>
<td class="label" data-lgid="P_PM_SERVICENAME_COLON">Service Name:</td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_name" tabindex="1" maxlength="50" /></td>
<input type="text" class="intervalinput" id="dig_name" tabindex="1" maxlength="50" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_INTERVAL_COLON">Interval:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_interval" tabindex="2" maxlength="10" /></td>
<input type="text" class="intervalinput" id="dig_interval" tabindex="2" maxlength="10" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_NOTIFICATIONPERIOD_COLON">Notification Period:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_period" tabindex="3" maxlength="10" /></td>
<input type="text" class="intervalinput" id="dig_period" tabindex="3" maxlength="10" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_RECURRING_COLON">Recurring:</td>
@ -387,12 +387,12 @@
<tr>
<td class="label" data-lgid="P_PM_EXPECTEDCOST_COLON">Expected Cost:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput inp_expectedcost" id="dig_expectedcost" tabindex="5" maxlength="12" /></td>
<input type="text" class="intervalinput inp_expectedcost" id="dig_expectedcost" tabindex="5" maxlength="12" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_PRIORITY_COLON">Priority:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput inp_priority" id="dig_priority" tabindex="6" maxlength="5" /></td>
<input type="text" class="intervalinput inp_priority" id="dig_priority" tabindex="6" maxlength="5" /></td>
</tr>
</table>
</div>

12
Site/Maintenance/ScheduleDetail.aspx
View File

@ -407,24 +407,24 @@
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
</div>
<div class="dialog" id="dialog_interval" style="display: none; z-index: 500;">
<div class="dialog" id="dialog_interval" style="display: none;">
<div class="dialog-title"><span class="title" data-lgid="P_PM_ADDINTERVAL">Add Interval</span><em class="dialog-close"></em></div>
<div class="dialog-content">
<table class="dialog_table">
<tr>
<td class="label" data-lgid="P_PM_SERVICENAME_COLON">Service Name:</td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_name" tabindex="1" maxlength="50" autocomplete="off" /></td>
<input type="text" class="intervalinput" id="dig_name" tabindex="1" maxlength="50" autocomplete="off" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_INTERVAL_COLON">Interval:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_interval" tabindex="2" maxlength="10" autocomplete="off" /></td>
<input type="text" class="intervalinput" id="dig_interval" tabindex="2" maxlength="10" autocomplete="off" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_NOTIFICATIONPERIOD_COLON">Notification Period:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput" id="dig_period" tabindex="3" maxlength="10" autocomplete="off" /></td>
<input type="text" class="intervalinput" id="dig_period" tabindex="3" maxlength="10" autocomplete="off" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_RECURRING_COLON">Recurring:</td>
@ -439,12 +439,12 @@
<tr>
<td class="label" data-lgid="P_PM_EXPECTEDCOST_COLON">Expected Cost:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput inp_expectedcost" id="dig_expectedcost" tabindex="5" maxlength="12" autocomplete="off" /></td>
<input type="text" class="intervalinput inp_expectedcost" id="dig_expectedcost" tabindex="5" maxlength="12" autocomplete="off" /></td>
</tr>
<tr>
<td class="label" data-lgid="P_PM_PRIORITY_COLON">Priority:<b class="red">*</b></td>
<td>
<input type="text" class="inputbox intervalinput inp_priority" id="dig_priority" tabindex="7" maxlength="5" autocomplete="off" /></td>
<input type="text" class="intervalinput inp_priority" id="dig_priority" tabindex="7" maxlength="5" autocomplete="off" /></td>
</tr>
</table>
</div>

2
Site/Maintenance/SurveyAutomationManagement.aspx
View File

@ -496,7 +496,7 @@
</div>
</div>
<div id="mask_bg" style="display: none; z-index: 500">
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
</asp:Content>

13
Site/Maintenance/SurveyDetail.aspx
View File

@ -186,14 +186,6 @@
GetWorkOrderSurveyResult();
}
function showLoading() {
$("#dialogmask").show();
}
function hideLoading() {
$("#dialogmask").hide();
}
$(function () {
vm = new Vue({
el: '#divresult',
@ -224,11 +216,7 @@
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="mask_bg" style="display: none; z-index: 500"><div class="loading c-spin"></div></div>
<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 icondelete" onclick="OnExit(0);" style="margin-left: 756px; font-size: 16px;"></span>
</div>
@ -256,4 +244,5 @@
</div>
</div>
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
</asp:Content>

14
Site/Maintenance/SurveyManagement.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;
}
@ -250,7 +238,7 @@
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'WorkOrderNumber', caption: GetTextByKey("P_WO_WORKORDERNUMBER", "Work Order Number"), valueIndex: 'WorkOrderNumber', allowFilter: true, css: { 'width': 150, 'text-align': 'left' } },
{ name: 'SurveyName', caption: GetTextByKey("P_WOS_SURVEYNAME", "Survey Name"), valueIndex: 'SurveyName', css: { 'width': 150, 'text-align': 'left' } },
{ name: 'Status', caption: GetTextByKey("P_WO_STATUS", "Status"), valueIndex: 'Status', allowFilter: true, css: { 'width': 160, 'text-align': 'left' } },

12
Site/Maintenance/SurveyTemplateManagement.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;
}

12
Site/Maintenance/SurveyTemplatePrint.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;
}

15
Site/Maintenance/SurveyTemplateReport.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;
}
@ -725,7 +713,7 @@
}
$(document.body).css('overflow', 'hidden');
getContacts();
showmaskbg(true);
$('#sendemailpopupmask').css('height', $('#dialog_workorder').height());
$('#sendemailpopupmask').css('min-width', $('#divcontent').width());
$('#sendemailpopupmask').show();
@ -737,6 +725,7 @@
}
function hideSendEmailPopup() {
showmaskbg(false);
$('#sendemailpopupmask').hide();
$('#sendemailpopupdialog').hide();
$(document.body).css('overflow', '');

12
Site/Maintenance/WorkOrderHistory.aspx
View File

@ -72,18 +72,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;
}

232
Site/Maintenance/WorkOrderMaintenance.aspx
View File

@ -1,6 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Maintenance/MaintenanceBase.master" AutoEventWireup="true" CodeFile="WorkOrderMaintenance.aspx.cs" Inherits="Maintenance_WorkOrderMaintenance" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
<link href="<%=GetFileUrlWithVersion("css/maintenance.css")%>" rel="stylesheet" />
<style type="text/css">
::-ms-clear, ::-ms-reveal {
display: none;
@ -31,31 +32,6 @@
height: 60px;
}
.dialog-content table td.label {
width: unset;
text-align: right;
padding-right: 10px;
line-height: 24px;
height: 24px;
vertical-align: middle;
}
.dialog-content table td input,
.dialog-content table td textarea {
width: 300px;
border: 1px solid #a9a9a9;
height: 18px;
padding: 1px;
}
.dialog-content table td select {
width: 403px;
}
.dialog-content table td input[type="checkbox"] {
border: none;
}
#dialogdatatb td {
padding-top: 30px;
}
@ -130,6 +106,66 @@
overflow: unset;
text-overflow: unset;
}
.ui-popup-mask .ui-popup-container .ui-popup-body .class-content {
overflow: auto;
height: 100%;
}
.ui-popup-mask .ui-popup-container .ui-popup-body .class-content > .comm {
border: none;
height: 100%;
margin-left: 0;
width: initial;
}
.ui-popup-mask .ui-popup-container .ui-popup-body .class-content > .comm .title-bar {
display: none;
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label {
flex: 0 0 auto;
margin: 0 4px;
box-sizing: border-box;
cursor: pointer;
width: 30px;
height: 30px;
background-color: #fff;
border-radius: 15px;
display: flex;
align-items: center;
justify-content: center;
transition: background-color .2s
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label > svg {
fill: #333;
width: 14px;
height: 14px;
transition: opacity .2s
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label:hover {
background-color: rgba(255, 255, 255, .6)
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label:hover > svg {
opacity: .6
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label.disabled {
cursor: default;
opacity: .6
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label.disabled:hover {
background-color: #fff
}
.ui-popup-mask .ui-popup-container .ui-popup-header > label.disabled:hover > svg {
opacity: 1;
opacity: initial
}
</style>
<link href="<%=GetFileUrlWithVersion("../css/panel.css")%>" rel="stylesheet" />
@ -146,6 +182,9 @@
<script src="<%=GetFileUrlWithVersion("../js/editableselect.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("../js/gridlayout.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("js/manageworkorder.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("js/workordersendemail.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("js/workordertabitems.js")%>" type="text/javascript"></script>
<script src="<%=GetFileUrlWithVersion("js/workorderwidgets.js")%>" type="text/javascript"></script>
<script type="text/javascript">
var workOrders = [];
var workOrderStatus = [];
@ -157,17 +196,42 @@
var assetid = "<%=AssetID %>";
var gridLayoutID = "WorkOrder";
var IsCustomerRecordAllow = <%=IsCustomerRecordAllow ?"true":"false"%>;
var HasCustomerRecord = <%=HasCustomerRecord ?"true":"false"%>;
var IsAdmin =<%=IsAdmin ?"true":"false"%>;
var IsAdvisor =<%=IsAdvisor ?"true":"false"%>;
var AllowReopenWorkorders = <%=AllowReopenWorkorders ?"true":"false"%>;
var AllowWorkOrderSurveys = <%=AllowWorkOrderSurveys ?"true":"false"%>;
var AllowCommunicate =<%=AllowCommunicate ?"true":"false"%>;
var AllowInspection =<%=AllowInspection ?"true":"false"%>;
var AllowCustomer =<%=AllowCustomer ?"true":"false"%>;
var WOReadOnly = <%=WOReadOnly ?"true":"false"%>;
var CRReadOnly =<%=CRReadOnly ?"true":"false"%>;
var COMMReadOnly = <%=COMMReadOnly ?"true":"false"%>;
var AllowReassignWorkorders = <%=AllowReassignWorkorders ?"true":"false"%>;
var AllowDeleteAtta = <%=AllowDeleteAtta ?"true":"false"%>;
var WorkorderParams = {};
var wowidgetobj = null;
var widgetdata = [];
if (AllowCommunicate) {
widgetdata.push({ Values: { Category: 'WorkOrder', WidgetId: 'CustomerCommunication', WidgetName: GetTextByKey('P_WO_CUSTOMERCOMMUNICATION', 'Customer Communication'), Visible: false } });
}
widgetdata.push({ Values: { Category: 'WorkOrder', WidgetId: 'InternalComments', WidgetName: GetTextByKey('P_WO_INTERNALCOMMENTS', 'Internal Comments'), Visible: false } },
{ Values: { Category: 'WorkOrder', WidgetId: 'Alerts', WidgetName: GetTextByKey('P_WO_ALERTS', 'Alerts'), Visible: false } },
{ Values: { Category: 'WorkOrder', WidgetId: 'Segments', WidgetName: GetTextByKey('P_WO_SEGMENTS', 'Segments'), Visible: false } },
{ Values: { Category: 'WorkOrder', WidgetId: 'Attachments', WidgetName: GetTextByKey('P_WO_ATTACHMENTS', 'Attachments'), Visible: false } });
if (AllowInspection) {
widgetdata.push({ Values: { Category: 'WorkOrder', WidgetId: 'Inspections', WidgetName: GetTextByKey('P_WO_INSPECTIONS', 'Inspections'), Visible: false } });
}
if (AllowCustomer) {
widgetdata.push(
{ Values: { Category: 'WorkOrder', WidgetId: 'Estimates', WidgetName: GetTextByKey('P_WO_ESTIMATES', 'Estimates'), Visible: false } },
{ Values: { Category: 'WorkOrder', WidgetId: 'Invoices', WidgetName: GetTextByKey('P_WO_INVOICES', 'Invoices'), Visible: false } });
}
var MSGWebSocketURL = "<%=MSGWebSocketURL%>";
var nowDate = new DateFormatter().formatDate(new Date("<%=NowDate %>"), 'm/d/Y');
var currentdate = "<%=NowDate %>";
const ui = window['lib-ui'];
function worequest(method, param, callback, error) {
_network.request("Maintenance/WorkOrderMaintenance.aspx", -1, method, param, callback, error || function (e) {
@ -176,6 +240,13 @@
});
}
function crrequest(method, param, callback, error) {
_network.request("Maintenance/AddCustomerRecord.aspx", -1, method, param, callback, error || function (e) {
showmaskbg(false, true);
showAlert(GetTextByKey('P_UM_PAGEERROR', 'An unknown error occurred. Please refresh page.'), GetTextByKey('P_UM_QUERY', 'Query'));
});
}
function alertrequest(method, param, callback, error) {
_network.request("Maintenance/AlertsManagement.aspx", -1, method, param, callback, error || function (e) {
showmaskbg(false, true);
@ -195,6 +266,17 @@
});
}
function getWorkorderParams() {
worequest("GetWorkorderParams", null, function (data) {
if (!data || typeof (data) === "string") {
return;
}
WorkorderParams = data;
}, function (err) {
});
}
function OnDelete() {
var index = grid_dt.selectedIndex;
if (index < 0) {
@ -893,12 +975,14 @@
var filters = JSON.stringify(p);
filters = htmlencode(filters);
setCookie("WorkOrderFilters_" + CID, filters);
setCookie("WorkOrderFilters_" + CID, "1");//filters太长在cookie中会丢失，此处只存标识,filters存在localStorage中
window.localStorage["WorkOrderFilters_" + CID] = filters;
}
function getTempFilters() {
var p = getCookie("WorkOrderFilters_" + CID);
if (!p) return false;
p = window.localStorage["WorkOrderFilters_" + CID];
try {
var data = JSON.parse(htmldecode(decodeURIComponent(p)));
@ -925,12 +1009,15 @@
//*********************************End Detault**************************************************//
var dialogWidgets;
$(function () {
setPageTitle(GetTextByKey("P_WORKORDER", "Work Order"), true);
$('.iconlayout').on('click', function (ev) {
CreateLayoutMenus(ev.target, gridLayoutID, grid_dt);
return false;
});
//manageWorkorderCtrl = new $manageWorkorderCtrl();
//manageWorkorderCtrl.Init($("#workorderlist"));
InitGridData();
@ -938,8 +1025,21 @@
InitGridAvailableMachines();
InitGridSelectedMachines();
dialogWidgets = new $wowidgetselector('dialog_widgets');
dialogWidgets.onDialogClosed = function () {
showmaskbg(false);
};
dialogWidgets.onOK = function (source) {
wowidgetobj && wowidgetobj.reloadWidgets();
};
$("#spWdigets").click(function () {
showmaskbg(true);
dialogWidgets.showSelector();
});
showmaskbg(true);
getWorkorderParams();
//GetContacts();
//GetStatus();
//GetAssetGroups();
@ -1241,6 +1341,25 @@
}
}
var loadingCount = 0;
function showLoading() {
loadingCount++;
if (window.parent && typeof window.parent.onmaskbg == 'function') {
window.parent.onmaskbg(true, true);
}
$("#dialogattmask").show();
}
function hideLoading() {
loadingCount--;
if (loadingCount === 0) {
$("#dialogattmask").hide();
if (window.parent && typeof window.parent.onmaskbg == 'function') {
window.parent.onmaskbg(false, true);
}
}
}
var _websocket;
function openmsgwebsocket() {
_websocket = new $websocket(MSGWebSocketURL);
@ -1255,6 +1374,8 @@
else if (data.Code == "502")//delete
removeWorkOrderItem(data.Message);
wowidgetobj?.onmsgreceived(data);
if ($("#dialog_workorder").is(":visible")) {
var fn = document.getElementById("iframeworkorder").contentWindow["onmsgreceived"];
if (fn)
@ -1266,12 +1387,15 @@
</script>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="recordcontent" style="padding: 0px; margin: 0px; min-width: 1600px;">
<div id="recordcontent" style="padding: 0px; margin: 0px; min-width: 1650px;">
<div class="page_title">
<span data-lgid="P_WORKORDER">Work Order</span>
<span class="sbutton iconexit" style="<%=InDialog?"": "display:none;"%>; float: right; font-size: 14px; margin-right: 15px; cursor: pointer;" onclick="OnExit();">
<label data-lgid="P_WO_EXIT">Exit</label>
</span>
<%if (AllowWorkOrderConfiguration)
{%>
<span class="sbutton iconcog" style="float: right; font-size: 14px; margin-right: 15px; cursor: pointer;" onclick="openWOStatus();">
<span class="sbutton iconcog" style="float: right; font-size: 14px; cursor: pointer;" onclick="openWOStatus();">
<label data-lgid="P_WO_WORKORDERCONFIGURATION">Work Order Configuration</label></span> <%}%>
<div style="clear: both;"></div>
</div>
@ -1300,20 +1424,24 @@
<option value="1" data-lgid="P_WO_XXXXXX">Completed Work Orders Only</option>
<option value="-1" data-lgid="P_WO_XXXXXX">Active & Completed Work Orders</option>
</select>
<span class="sbutton iconsave" onclick="onSaveDefault();" style="margin-left: 8px; padding-right: 0;" data-title-lgid="P_WO_SAVELOCATIONANDDEPARTMENTSEARCH" title="Save Location, Department, Advisor and Order type Search"></span>
</div>
<div class="function_title">
<span class="sbutton iconadd" onclick="OnAdd();" data-lgid="P_WO_ADD">Add</span>
<span class="sbutton iconedit" onclick="OnEdit();" data-lgid="P_WO_EDIT">Edit</span>
<span class="sbutton iconrefresh" onclick="OnRefresh();" data-lgid="P_WO_REFRESH">Refresh</span>
<span id="spExport" class="sbutton iconexport" onclick="OnExport();" data-lgid="P_UTILITY_EXPORTTOEXCEL">Export to Excel</span>
<span class="sbutton iconexit" onclick="OnExit();" style="<%=InDialog?"": "display:none;"%>" data-lgid="P_WO_EXIT">Exit</span>
<span class="sbutton iconlayout iconmenu" data-lgid="P_MR_LAYOUT">Layout</span>
<span class="sbutton iconfilter" onclick="OnResetPivots();" data-lgid="P_JS_XXX">Reset Pivots</span>
<span id="spWdigets" class="sbutton iconwidget" data-lgid="P_JS_XXX">Widgets</span>
</div>
<div class="clear"></div>
<div id="workorderlist"></div>
<div id="workorderdetail"></div>
</div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div id="mask_bg" style="display: none;"><div class="loading c-spin"></div></div>
<div class="dialog" id="dialog_alerts" style="display: none;">
<div class="dialog-title"><span class="title" data-lgid="P_WO_MANAGEALERTS">Manage Alerts</span><em class="dialog-close"></em></div>
@ -1488,6 +1616,43 @@
</div>
</div>
<div class="dialog" id="sendicemailpopupdialog" style="display: none; width: 485px;">
<div class="dialog-title"><span class="title" data-lgid="P_WO_SENDINTERNALCOMMENTS">Send Internal Comments</span><em class="dialog-close"></em></div>
<div class="dialog-content">
<table style="line-height: 25px;">
<tr>
<td data-lgid="P_WO_SENDTHISTO">Who do you want to send this to? Select from existing relationships or manual entry.</td>
</tr>
<tr>
<td colspan="2">
<input type="text" id="sendinternalcomments_search" style="width: 445px; margin-left: 10px;" placeholder="Search" /></td>
</tr>
<tr>
<td>
<div id="iccontactlist" style="height: 240px; width: 440px; margin-left: 10px; margin-right: 10px;"></div>
</td>
</tr>
<tr>
<td data-lgid="P_WO_EMAILADDRESSESTIPS">Separate multiple manually entered email addresses with a semi-colon (;).</td>
</tr>
<tr>
<td><span data-lgid="P_WO_OTHEREMAILADDRESS">Other Email Address</span>
<input type="text" id="sendic_otheremailaddress" style="width: 332px;" autocomplete="off" /></td>
</tr>
<tr>
<td><span data-lgid="P_WO_PHONENUMBER">Phone Number</span>
<input type="text" id="sendic_phonenumber" style="width: 353px; margin-left: 7px;" autocomplete="off" />
</td>
</tr>
</table>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_WO_CANCEL" class="dialog-close" tabindex="153" />
<input type="button" onclick="onSendInternalComments();" value="OK" data-lgid="P_WO_OK" tabindex="152" />
<div class="clear"></div>
</div>
</div>
<div class="dialog" id="dialog_workorder" style="display: none; height: 100%; border-bottom: 0; border-top: 0;">
<%--<div class="dialog-title"><span class="title">Add Work Order</span></div>--%>
<iframe id="iframeworkorder" style="width: 100%; height: 100%; display: block; border: none;"></iframe>
@ -1505,5 +1670,10 @@
<div class="maskbg" style="display: none;"></div>
</div>
<div id="dialogattmask" class="maskbg" style="display: none;">
<%-- 放到最后 Widget中上传WorkOrder附件是使用--%>
<div class="loading c-spin"></div>
<lable class="lable_attuploadname"></lable>
</div>
</asp:Content>

14
Site/Maintenance/WorkOrderMaintenance.aspx.cs
View File

@ -14,14 +14,18 @@ public partial class Maintenance_WorkOrderMaintenance : WorkOrderBasePage
public bool InDialog = false;
public bool AllowWorkOrderConfiguration = false;
public bool IsCustomerRecordAllow = false;
public bool HasCustomerRecord = false;
public bool AllowCustomer = false;
public bool AllowReopenWorkorders = false;
public bool AllowWorkOrderSurveys = false;
protected string MSGWebSocketURL = "";
public string NowDate = "";
public bool WOReadOnly = false;
public bool CRReadOnly = false;
public bool COMMReadOnly = false;
public bool AllowCommunicate = false;
public bool AllowInspection = false;
public bool AllowReassignWorkorders = false;
public bool AllowDeleteAtta = false;
protected string CID = "";
protected void Page_Load(object sender, EventArgs e)
{
@ -50,13 +54,19 @@ public partial class Maintenance_WorkOrderMaintenance : WorkOrderBasePage
IsCustomerRecordAllow = SystemParams.HasLicense("CustomerRecord");
bool crpermission = CheckRight(SystemParams.CompanyID, Feature.CUSTOMER_RECORD);
HasCustomerRecord = IsCustomerRecordAllow && crpermission;
AllowCustomer = IsCustomerRecordAllow && crpermission;
AllowReopenWorkorders = !WOReadOnly && CheckRight(SystemParams.CompanyID, Feature.REOPENWORKORDERS);
AllowWorkOrderSurveys = !WOReadOnly && CheckRight(SystemParams.CompanyID, Feature.WORKORDERSURVEYS);
CRReadOnly = WOReadOnly || CheckReadonly(SystemParams.CompanyID, Feature.CUSTOMER_RECORD);
COMMReadOnly = WOReadOnly || CheckReadonly(SystemParams.CompanyID, Feature.COMMUNICATEWITHCUSTOMER);
AllowCommunicate = CheckRight(SystemParams.CompanyID, Feature.COMMUNICATEWITHCUSTOMER);
license = SystemParams.HasLicense("Inspection");
AllowInspection = license && CheckRight(SystemParams.CompanyID, Feature.INSPECTION_REPORTS);
AllowReassignWorkorders = !WOReadOnly && CheckRight(SystemParams.CompanyID, Feature.REASSIGN_WORKORDERS);
AllowDeleteAtta = !WOReadOnly && CheckRight(SystemParams.CompanyID, Feature.WORKORDERDELETEATTACHMENT);
AllowCommunicate = IsCustomerRecordAllow && AllowCommunicate;
AssetID = Request.Params["mid"] ?? "";

12
Site/Maintenance/WorkOrderStatusManagement.aspx
View File

@ -386,7 +386,7 @@
$('#dialog_fuvariables').val('');
$('#dialog_status .dialog-title span.title').text(alerttitle);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_status')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_status').height()) / 3,
@ -426,7 +426,7 @@
$('#dialog_fuvariables').val('');
$('#dialog_status .dialog-title span.title').text(GetTextByKey("P_WO_EDITSTATUS", 'Edit Status'));
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_status')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_status').height()) / 3,
@ -893,9 +893,6 @@
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="mask_bg" style="display: none; z-index: 500">
<div class="loading c-spin"></div>
</div>
<div id="div_container">
<ul id="ul_container" class="tab_header">
<li data-href="tab_statussetting" onclick="reshowgrid();" class="selected" data-lgid="P_WO_STATUSSETTING">Status Setting</li>
@ -1086,6 +1083,9 @@
</div>
</div>
</div>
<div id="mask_bg" style="display: none;">
<div class="loading c-spin"></div>
</div>
<div class="dialog" id="dialog_status" style="display: none;">
<div class="dialog-title"><span class="title" data-lgid="P_WO_ADDSTATUS">Add Status</span><em class="dialog-close"></em></div>
@ -1191,7 +1191,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="onSaveStatus();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div style="clear: both;"></div>
</div>

660
Site/Maintenance/css/maintenance.css
View File

@ -2,71 +2,92 @@
cursor: default !important;
color: #ccc;
}
a.disabled:hover {
text-decoration: none;
}
a.disabled:hover {
text-decoration: none;
}
.table_intervals {
width: 100%;
color: #666;
border-collapse: collapse;
table-layout:fixed;
}
.table_intervals thead tr {
background: #f9f9f9;
/*font-weight: bold;*/
}
.table_intervals thead tr:hover { background: #f9f9f9; }
.table_intervals td input {
width: 60px;
border: 1px solid #fff;
}
.table_intervals td input.focused,
.table_intervals td input:hover {
border-color: #666;
}
.table_intervals td input:disabled,
.table_intervals td input:disabled:hover,
.table_intervals tr:hover td input:disabled {
background: #ddd;
color: #ddd;
border-color: #ddd;
}
.table_intervals .editing { display: none; }
.table_intervals .editing input {
width: auto;
cursor: pointer;
background: rgb(249, 189, 117);
margin-left: 6px;
border: none;
padding: 5px 14px;
}
.table_intervals .editing input:hover { background: #d7690E; }
.table_intervals td textarea {
border: 1px solid #fff;
table-layout: fixed;
}
.table_intervals td textarea.focused,
.table_intervals td textarea:hover {
border-color: #666;
}
.table_intervals td textarea:disabled,
.table_intervals td textarea:disabled:hover,
.table_intervals tr:textarea td input:disabled {
background: #ddd;
color: #ddd;
border-color: #ddd;
}
.table_intervals .editing textarea {
width: auto;
cursor: pointer;
background: rgb(249, 189, 117);
margin-left: 6px;
border: none;
padding: 5px 14px;
}
.table_intervals .editing textarea:hover { background: #d7690E; }
.table_intervals thead tr {
background: #f9f9f9;
/*font-weight: bold;*/
}
.table_intervals thead tr:hover {
background: #f9f9f9;
}
.table_intervals td input {
width: 60px;
border: 1px solid #fff;
}
.table_intervals td input.focused,
.table_intervals td input:hover {
border-color: #666;
}
.table_intervals td input:disabled,
.table_intervals td input:disabled:hover,
.table_intervals tr:hover td input:disabled {
background: #ddd;
color: #ddd;
border-color: #ddd;
}
.table_intervals .editing {
display: none;
}
.table_intervals .editing input {
width: auto;
cursor: pointer;
background: rgb(249, 189, 117);
margin-left: 6px;
border: none;
padding: 5px 14px;
}
.table_intervals .editing input:hover {
background: #d7690E;
}
.table_intervals td textarea {
border: 1px solid #fff;
}
.table_intervals td textarea.focused,
.table_intervals td textarea:hover {
border-color: #666;
}
.table_intervals td textarea:disabled,
.table_intervals td textarea:disabled:hover,
.table_intervals tr:textarea td input:disabled {
background: #ddd;
color: #ddd;
border-color: #ddd;
}
.table_intervals .editing textarea {
width: auto;
cursor: pointer;
background: rgb(249, 189, 117);
margin-left: 6px;
border: none;
padding: 5px 14px;
}
.table_intervals .editing textarea:hover {
background: #d7690E;
}
@ -75,39 +96,526 @@ a.disabled:hover {
padding: 0;
font-weight: normal;
}
.maintenance .td_funcs:last-child {
padding-right: 8px;
}
.maintenance .td_funcs a {
white-space: nowrap;
float: left;
cursor: pointer;
margin-left: 20px;
}
.maintenance .td_funcs a:first-child {
margin-left: 2px;
}
.maintenance .td_funcs:last-child {
padding-right: 8px;
}
.maintenance .td_funcs a {
white-space: nowrap;
float: left;
cursor: pointer;
margin-left: 20px;
}
.maintenance .td_funcs a:first-child {
margin-left: 2px;
}
.maintenance .item_name {
margin-left: 24px;
width: 340px;
}
.maintenance .item_type {
width: 100px;
}
.maintenance .item_desc {
max-width: 320px;
}
.maintenance .item_desc,
.maintenance .item_type,
.maintenance .item_name {
overflow: hidden;
text-overflow: ellipsis;
}
.servicedescription {
height:120px;
width:250px;
}
.intervalinput {
width:250px;
height: 120px;
width: 250px;
}
.intervalinput {
width: 250px;
}
.edit-content table {
border-collapse: collapse;
width: 100%;
}
.edit-content table td.label {
width: 200px;
text-align: right;
padding-right: 10px;
line-height: 24px;
height: 24px;
vertical-align: middle;
}
.edit-content table td.cont {
width: 250px;
}
.edit-content table td input[type="text"], .edit-content table td textarea {
border: 1px solid #a9a9a9;
width: 240px;
height: 28px;
text-indent: 3px;
box-sizing: border-box;
border-radius: 2px;
}
.edit-content table td input[type="checkbox"] {
border: none;
}
.edit-content table td textarea {
height: 100px;
resize: none;
/*max-width: 200px;*/
}
.tab_estimates table td.label,
.tab_invoices table td.label {
width: 167px;
text-align: right;
padding-right: 10px;
line-height: 24px;
height: 24px;
vertical-align: middle;
}
.tab_estimates table td input[type="text"], .tab_estimates table td textarea,
.tab_invoices table td input[type="text"], .tab_invoices table td textarea {
border: 1px solid #a9a9a9;
width: 150px;
height: 28px;
text-indent: 3px;
box-sizing: border-box;
border-radius: 2px;
}
.estimates_div,
.estimates_table {
min-width: 1300px;
}
.subtitle {
margin: 20px 40px 5px 0px;
font-size: 16px;
color: gray;
}
.subtitle span {
margin-left: 10px;
}
.subtitle hr {
background-color: #d8d8d8;
border: none;
height: 1px;
}
#host_main {
overflow: hidden;
}
.tab_segments {
position: relative;
}
.tab_segments table td.label {
width: 130px;
vertical-align: top;
text-align: right;
}
.tab_segments table td input,
.tab_segments table td textarea {
border: 1px solid #a9a9a9;
width: 320px;
height: 28px;
text-indent: 3px;
box-sizing: border-box;
border-radius: 2px;
}
.tab_segments table td select {
width: 324px;
}
.tab_segments table td input[type="checkbox"] {
border: none;
width: unset;
height: unset;
}
.tab_segments table td textarea {
height: 100px;
resize: none;
/*max-width: 200px;*/
}
.segments_table {
margin-top: 10px;
line-height: 25px;
min-width: 1050px;
}
.workorder_table {
table-layout: fixed;
line-height: 30px;
}
.dialog-content table td.label {
width: 120px;
vertical-align: middle;
}
.dialog-content table td input[type="text"], .dialog-content table td textarea {
width: 320px;
height: 24px;
box-sizing: border-box;
border-radius: 2px;
}
.dialog-content table {
border-collapse: collapse;
width: 100%;
}
.dialog-content table td.label {
width: 170px;
text-align: right;
padding-right: 10px;
line-height: 28px;
height: 24px;
vertical-align: top;
}
.divattp {
width: 300px;
margin-right: 10px;
float: left;
position: relative;
}
.divatt {
width: 300px;
height: 300px;
margin-top: 5px;
margin-bottom: 5px;
margin-right: 10px;
cursor: pointer;
border: 1px solid #b0b0b0;
border-radius: 2px;
box-shadow: rgba(0, 0, 0, 0.4);
text-align: center;
float: left;
position: relative;
}
.picture {
max-height: 100%;
max-width: 100%;
margin: auto;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
.download {
line-height: 300px;
font-size: 200px;
margin: 0 auto;
font-family: 'Fontawesome';
color: silver;
}
.download::before {
content: '\f15c';
}
.wolist_download {
font-size: 60px;
margin: 0 auto;
font-family: 'Fontawesome';
color: silver;
}
.wolist_download::before {
content: '\f15c';
}
.file-word::before {
content: '\f1c2';
}
.file-excel::before {
content: '\f1c3';
}
.file-ppt::before {
content: '\f1c4';
}
.file-pdf::before {
content: '\f1c1';
}
.file-video::before {
content: '\f1c8';
}
.file-zip::before {
content: '\f1c6';
}
.file-msg::before {
content: '\f0e0';
}
.delete {
position: absolute;
vertical-align: top;
font-size: 20px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
right: 8px;
}
.delete::before {
content: '\f00d';
}
.attadownload {
position: absolute;
vertical-align: top;
font-size: 16px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
right: 5px;
bottom: 5px;
}
.attadownload::before {
content: '\f019';
}
.attaprint {
position: absolute;
vertical-align: top;
font-size: 16px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
right: 30px;
bottom: 5px;
}
.attaprint::before {
content: '\f02f';
}
.attaedit {
font-size: 14px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
padding: 3px;
}
.attaedit::before {
content: '\f044';
}
.attasave {
font-size: 18px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
margin-left: 3px;
}
.attasave::before {
content: '\f00c';
}
.dialog .dialog-func input {
width: unset;
}
.noinspection {
color: #444;
height: 30px;
line-height: 30px;
margin-top: 8px;
padding-left: 10px;
padding-right: 10px;
font-size: 20px;
font-style: italic;
}
.dropdown {
width: 240px;
}
.dropdown .dropdown-wrapper {
border-color: #a9a9a9;
}
.dropdown .dropdown-wrapper > .dropdown-header {
min-height: 26px;
}
.dropdown .dropdown-wrapper > .dropdown-header > .dropdown-text {
line-height: 26px;
}
.subtitle .dropdown .dropdown-wrapper > .dropdown-header {
min-height: 24px;
}
.subtitle .dropdown .dropdown-wrapper > .dropdown-header > .dropdown-text {
line-height: 22px;
height: 22px;
min-height: 22px;
}
.maintenance {
table-layout: fixed;
border-bottom: none;
width: auto;
min-width: 100%;
}
.maintenance tr {
border-bottom: 1px solid #e6e6e6;
}
.main_table .td_intervals {
padding: 0 0 0 60px;
}
.main_table .tr_intervals {
border-bottom: none;
}
.main_table .tr_intervals:hover {
background: none;
}
.icon {
float: left;
font-style: normal;
width: 20px;
font-size: 11px;
height: 16px;
line-height: 16px;
}
.expand:before {
content: '\e608';
}
.collapse:before {
content: '\e607';
}
.dialog_table {
width: 100%;
}
.dialog_table tr {
height: 40px;
}
.item_name {
width: unset;
font-size: 16px;
}
.wolist_picture {
width: 60px;
height: 60px;
margin: 0 auto;
}
.wolist_icon {
font-size: 14px;
font-family: 'Fontawesome';
color: rgb(123,28,33);
margin-left: 20px;
cursor: pointer;
}
.wolist_delete::before {
content: '\f00d';
}
.wolist_attadownload::before {
content: '\f019';
}
.wolist_attaprint::before {
content: '\f02f';
}
.divattp input {
width: 60px;
border: 1px solid #fff;
}
.divattp input.focused,
.divattp input:hover {
border-color: #666;
}
.divattp input:disabled,
.divattp input:disabled:hover,
.divattp td input:disabled {
background: #ddd;
color: #ddd;
border-color: #ddd;
}
.inp_name {
height: 24px;
}
.loading_icon {
font-family: CalciteWebCoreIcons;
cursor: default;
left: 50%;
top: 48%;
}
.lable_attuploadname {
color: white;
max-height: 800px;
text-align: center;
line-height: 40px;
font-size: 16px;
position: absolute;
left: 50%;
top: 50%;
margin: -50px 0 0 -35px;
}
/*override*/
.ui-tooltip-content {
white-space: nowrap !important;
/*min-width: 160px;*/
}
#mask_bg, #dialogattmask, .dialog {
z-index: 1000;
}

7
Site/Maintenance/js/addcustomerrecord.js
View File

@ -28,7 +28,7 @@ $(function () {
grid_dtassets.setData(grid_dtassets.innerSource.concat(items));
if (ids.length > 0)
assignAssets(ids);
$('#mask_bg').hide();
showmaskbg(false);
};
});
@ -63,7 +63,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -152,7 +152,6 @@ function OnAssetAdd() {
return s.Values.ID;
});
dialogAUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnMachineDelete() {
@ -264,7 +263,7 @@ function onOpenSalesperson() {
$('#sp_searchinputtxt').val('');
GetSalespersons();
$('#dialog_salesperson .dialog-title span.title').text(alerttitle);
$('#mask_bg').show();
showmaskbg(true);
$('#dialog_salesperson')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_salesperson').height()) / 3,

3317
Site/Maintenance/js/addworkorder.js
View File

File diff suppressed because it is too large Load Diff

3
Site/Maintenance/js/customerrecord.js
View File

@ -51,7 +51,6 @@ function OnMachineAdd() {
return s.Values.ID;
});
dialogAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
var _selectedMachines = [];
@ -196,7 +195,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,

8
Site/Maintenance/js/fuelrecordattachments.js
View File

@ -16,20 +16,20 @@ function onSaveAttachment(files) {
fileupload_errors = "";
if (!fuelid) {
OnSave(0, this, function () {
$('#att_mask_bg').show();
showloading(true);
if (filesinuploading.length > 0) {
for (var i = 0; i < files.length; i++)
filesinuploading.push(fuelid, files[i]);
}
else {
filesinuploading = files;
filesinuploading = files;
DoUploadAttachments(fuelid);
}
});
return;
}
else {
$('#att_mask_bg').show();
showloading(true);
if (filesinuploading.length > 0) {
for (var i = 0; i < files.length; i++)
filesinuploading.push(files[i]);
@ -55,7 +55,7 @@ function DoUploadAttachments(fid) {
getAttachments();
if (fileupload_errors !== "")
showAlert(fileupload_errors, GetTextByKey("P_WO_XXXXX", 'Upload failed'));
$('#att_mask_bg').hide();
showloading(false);
return;
}
var file = filesinuploading[uploadingindex];

98
Site/Maintenance/js/manageworkorder.js
View File

@ -193,7 +193,7 @@ function InitGridData() {
|| item.TextMessageStatus == 412)//Landline
return '#FFC107';
if (!item.CommunicationAcknowledged)
return '#1E88E5';
return '#79B6FF';
if (!item.EstimateAcknowledged) {
if (item.ApprovedEstimates > 0)
return '#07FF93';
@ -202,13 +202,28 @@ function InitGridData() {
}
}
};
var styleFilter = function (item) {
if (item.Id.Value > 0 && IsAdvisor) {
if (item.TextMessageStatus == 0//Undelivered
|| item.TextMessageStatus == 9//Failed
|| item.TextMessageStatus == 10//Opt-Out
|| item.TextMessageStatus == 412//Landline
|| !item.CommunicationAcknowledged
|| (!item.EstimateAcknowledged && (item.ApprovedEstimates > 0 || item.RejectedEstimates > 0))
)
return { "font-weight": "bold" };
}
return {};
}
if (col.name !== 'Edit' && col.name !== "Print" && col.name !== "Delete" && col.name !== "AssetAlert")
col.styleFilter = styleFilter;
if (!IsCustomerRecordAllow && (col.name === "Customer")) {
continue;
}
if (!AllowWorkOrderSurveys && (col.name === "Surveys")) {
continue;
}
if (!HasCustomerRecord && (col.name === "Advisor" || col.name === "CustomerCode" || col.name === "Contacts"
if (!AllowCustomer && (col.name === "Advisor" || col.name === "CustomerCode" || col.name === "Contacts"
|| col.name === "LastCommunication" || col.name === "LastCommunicationDate" || col.name === "LastCommunicationBy"
|| col.name === "AlternateStatus" || col.name === "EstimateStatus" || col.name === "Surveys"
|| col.name === "PublishedEstimates" || col.name === "ApprovedEstimates" || col.name === "RejectedEstimates" || col.name === "PendingEstimates"
@ -292,8 +307,8 @@ function InitGridData() {
return selector;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "WorkOrderType") {
@ -333,8 +348,8 @@ function InitGridData() {
updateWorkOrder(item);
});
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "Advisor") {
@ -376,8 +391,8 @@ function InitGridData() {
}
});
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "AssignedToName") {
@ -463,8 +478,8 @@ function InitGridData() {
});
return selector;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "DueDate") {
@ -502,8 +517,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "CompleteDate") {
@ -537,8 +552,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "NextFollowUpDate") {
@ -552,7 +567,7 @@ function InitGridData() {
var color = !item.Completed && item.NextFollowUpDate.Value && new Date(item.NextFollowUpDate.Value) < new Date(currentdate) ? 'red' : null;
return $('<span class="margin-input-span status-cell"></span>').css({
'background-color': color,
'color': 'white'
//'color': 'white'
}).text(item.NextFollowUpDateStr);
};
col.editFilter = function (item) {
@ -560,7 +575,7 @@ function InitGridData() {
var color = !item.Completed && item.NextFollowUpDate.Value && new Date(item.NextFollowUpDate.Value) < new Date(currentdate) ? 'red' : null;
return $('<span class="margin-input-span status-cell"></span>').css({
'background-color': color,
'color': 'white'
//'color': 'white'
}).text(item.NextFollowUpDateStr);
}
@ -596,8 +611,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "Description") {
@ -647,9 +662,9 @@ function InitGridData() {
}
}
else if (col.name === 'AssetName') {
col.styleFilter = function () {
return { 'white-space': 'pre-line', 'line-height': '20px' };
};
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { 'white-space': 'pre-line', 'line-height': '20px' });
}
}
else if (col.name === 'InspectionCount') {
col.styleFilter = function (item) {
@ -826,12 +841,12 @@ function InitGridData() {
return tb;
}
};
col.styleFilter = function () {
return {
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), {
'margin-top': '3px',
'margin-bottom': '0px',
};
}
});
};
}
else if (col.name === "PartsExpectedDate") {
col.allowHtml = true;
@ -868,8 +883,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "LastLaborDate") {
@ -907,8 +922,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "InspectionRequired") {
@ -933,8 +948,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%" };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%" });
}
}
else if (col.name === "AutoText") {
@ -959,8 +974,8 @@ function InitGridData() {
}
return ipt;
}
col.styleFilter = function () {
return { "width": "100%" };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%" });
}
}
else if (col.name === "Department") {
@ -1049,8 +1064,8 @@ function InitGridData() {
});
return selector;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "Location") {
@ -1139,8 +1154,8 @@ function InitGridData() {
});
return selector;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "SalespersonName") {
@ -1210,8 +1225,8 @@ function InitGridData() {
});
return selector;
}
col.styleFilter = function () {
return { "width": "100%", 'padding': 0 };
col.styleFilter = function (item) {
return Object.assign({}, styleFilter(item), { "width": "100%", 'padding': 0 });
}
}
else if (col.name === "LastCommunication") {
@ -1276,7 +1291,10 @@ function InitGridData() {
grid_dt.selectedrowchanged = function (rowindex) {
var rowdata = grid_dt.source[rowindex];
if (rowdata) {
if (rowdata && rowdata.Values.Id.Value > 0) {
if (!wowidgetobj)
wowidgetobj = new WorkOrderWidget();
wowidgetobj.changeWorkOrder(rowdata.Values);
}
}

195
Site/Maintenance/js/wocommunication.js
View File

@ -77,7 +77,6 @@ function resetComments() {
internal.text = '';
internal.load();
}
}
@ -119,168 +118,6 @@ function getCommunications(reset) {
});
}
function showCommunication(txt, isfirst) {
var commoentctrl = $("#divcommunications");
var div = $("<div class='txtdiv'></div>").appendTo(commoentctrl);
if (isfirst)
div.css("margin-top", 0);
var name = "";
if (txt.IsReply) {
for (var i = 0; i < customercontacts.length; i++) {
var contact = customercontacts[i];
if (isEmail(txt.Sender)) {
if (contact.Email === txt.Sender) {
name = contact.Name;
break;
}
}
else {
if (contact.MobilePhone === txt.Sender) {
name = contact.Name;
break;
}
}
}
}
if (name !== "") {
$("<div style='font-weight:bold;'></div>").text(name).appendTo(div);
}
var sendto = "";
if (!txt.IsReply && txt.OriPhoneNumbers && txt.OriPhoneNumbers.length > 0) {
for (var i = 0; i < txt.OriPhoneNumbers.length; i++) {
var oriph = txt.OriPhoneNumbers[i];
if (customercontacts && customercontacts.length > 0) {
var cname = "";
for (var j = 0; j < customercontacts.length; j++) {
var contact = customercontacts[j];
if (isEmail(oriph)) {
if (contact.Email === oriph) {
cname = contact.Email + " - " + contact.Name + "\r\n";
break;
}
}
else {
if (contact.MobilePhone === oriph) {
cname = contact.MobilePhone + " - " + contact.Name + "\r\n";
break;
}
}
}
if (cname === "") {
for (var j = 0; j < followers.length; j++) {
var follower = followers[j];
if (isEmail(oriph)) {
if (follower.Email === oriph) {
cname = follower.Email + " - " + follower.Name + "\r\n";
break;
}
}
else {
if (follower.MobilePhone === oriph) {
cname = follower.MobilePhone + " - " + follower.Name + "\r\n";
break;
}
}
}
}
if (cname === "")
sendto += oriph + "\r\n";
else
sendto += cname;
}
else {
sendto += oriph + "\r\n";
}
}
}
if (sendto !== "")
sendto = GetTextByKey("P_WO_SENTTO_COLON", "Send To :") + "\r\n" + sendto;
$("<div class='txttime'></div>").text(((txt.IsReply && $.trim(txt.FormatSender) !== "") ? txt.FormatSender : txt.Sender) + " - " + txt.TimeStr).attr('title', txt.IsReply ? "" : sendto).appendTo(div);
var contentctrl = $("<div></div>").appendTo(div);
if (txt.Message.toLowerCase().indexOf("http://") >= 0 || txt.Message.toLowerCase().indexOf("https://") >= 0) {
contentctrl.html(formatUrl(txt.Message));
}
else {
contentctrl.text(txt.Message);
}
if (txt.IsReply)
contentctrl.addClass("txtother");
else {
contentctrl.addClass("txtself");
var status = getMsgStatus(txt);
if (status.Status != -100) {
var statustext = "";
if (status.Status == 0) {
statustext = GetTextByKey("P_WO_XXXXXX", "Pending");
contentctrl.css("background-color", "#FFC107");
}
else if (status.Status == 1) {
statustext = GetTextByKey("P_WO_XXXXXX", "Sent");
}
else if (status.Status == 9) {
statustext = GetTextByKey("P_WO_XXXXXX", "Failed");
contentctrl.css("background-color", "#FFC107");
}
else if (status.Status == 10) {
statustext = GetTextByKey("P_WO_XXXXXX", "Opt-Out");
contentctrl.css("background-color", "#FFC107");
}
else if (status.Status == 412) {
statustext = GetTextByKey("P_WO_XXXXXX", "Landline");
contentctrl.css("background-color", "#FFC107");
}
else {
statustext = GetTextByKey("P_WO_XXXXXX", "Undelivered");
contentctrl.css("background-color", "#FFC107");
}
var divstatus = $("<div style='text-align:right;margin-top:3px;font-weight:bold;margin-right:-12px;font-size:10px;'>Failed</div>").text(statustext);
if (status.Status == -10)
divstatus.attr('title', status.StatusMsg)
}
contentctrl.append(divstatus);
div.css("text-align", "right");
}
}
function getMsgStatus(txt) {
var status = -100;//没有状态，页面上不显示
var ls = [];
var statusmsg = "";
if (!txt.StatusIncorrect && txt.Participator != null && txt.Participator.length > 0) {
for (var i = 0; i < txt.Participator.length; i++) {
var p = txt.Participator[i];
if (!isEmail(p.CustomerNumber)) {
if (ls.indexOf(p.Status) < 0)
ls.push(p.Status);
if (statusmsg == "")
statusmsg = p.CustomerNumber + ": ";
else
statusmsg += "\r\n" + p.CustomerNumber + ": ";
if (p.Status == 0) {
statusmsg += GetTextByKey("P_WO_XXXXXX", "Undelivered");
}
else if (p.Status == 1) {
statusmsg += GetTextByKey("P_WO_XXXXXX", "Sent");
}
else if (p.Status == 9) {
statusmsg += GetTextByKey("P_WO_XXXXXX", "Failed");
}
}
}
}
if (ls.length == 1)
status = ls[0];
else if (ls.length > 1)
status = -10;//多种状态
return { Status: status, StatusMsg: statusmsg };
}
function addWorkOrderCommunication() {
var pmemails = customer?.contacts;
if (pmemails == null || pmemails.length === 0) {
@ -324,36 +161,4 @@ function resetCommunications() {
customer.text = '';
customer.load();
}
}
function setPhoneNumber() {
if (customercontacts) {
var names = "";
for (var i = 0; i < customercontacts.length; i++) {
var c = customercontacts[i];
if (c.OptOut || c.OptOut_BC) continue;
var mp = $.trim(c.MobilePhone);
var email = $.trim(c.Email);
if ((c.ContactPreference == "0" && (checkPhoneNumber(mp))
|| (c.ContactPreference == "1" && isEmail(email)))) {
if (names == "")
names = c.Name;
else
names += ";" + c.Name;
}
}
if (typeof customer !== 'undefined') {
customer.contacts = customercontacts;
}
$('#dialog_est_phonenum').val(names);
$('#dialog_invoice_phonenum').val(names);
}
else {
if (typeof customer !== 'undefined') {
customer.contacts = null;
}
$('#dialog_est_phonenum').val("");
$('#dialog_invoice_phonenum').val('');
}
}

Some files were not shown because too many files have changed in this diff Show More