This commit is contained in:
2024-03-26 15:56:31 +08:00
parent 634e8b71ab
commit 0855ae42cd
547 changed files with 94818 additions and 60463 deletions

File diff suppressed because one or more lines are too long

View File

@ -27,11 +27,12 @@ function ShowEngineHours(data) {
r[j] = r[j] === true ? "Yes" : "";
else if (j === "UOM")
r[j] = "Hour";
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
r.Hours = r.Hours.toFixed(2);
r.Corrected = r.Corrected.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Hours = { DisplayValue: r.Hours.toFixed(2), Value: r.Hours };
r.Corrected = { DisplayValue: r.Corrected.toFixed(2), Value: r.Corrected };
rows.push(r);
if (r.DataSource.toLowerCase() == "calamp" && r.IsPrimary.toLowerCase() == "yes")
isCalampEH = true;
@ -75,20 +76,15 @@ function ShowEngineHours(data) {
}
function InitEnginehoursGridData() {
grid_enginehoursdt = new GridView('#enginehourslist');
grid_enginehoursdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_enginehoursdt = createGridView('#enginehourslist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Hours', caption: GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours"), valueIndex: 'Hours', css: { 'width': 90, 'text-align': 'left' } },
{ name: 'Corrected', caption: GetTextByKey("P_MA_ADJUSTED", "Adjusted"), valueIndex: 'Corrected', css: { 'width': 75, 'text-align': 'left' } },
{ name: 'UOM', caption: GetTextByKey("P_MA_UNITS", "Units"), valueIndex: 'UOM', css: { 'width': 60, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -97,7 +93,7 @@ function InitEnginehoursGridData() {
col.name = list_columns[hd].name;
col.caption = list_columns[hd].caption;
col.visible = true;
col.sortable = false;
col.sortable = true;
col.width = list_columns[hd].css.width;
col.align = list_columns[hd].css["text-align"]
col.key = list_columns[hd].valueIndex;
@ -105,8 +101,10 @@ function InitEnginehoursGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key";//GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(1, this);
@ -121,29 +119,17 @@ function InitEnginehoursGridData() {
};
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.resizable = false;
}
columns.push(col);
}
grid_enginehoursdt.canMultiSelect = false;
grid_enginehoursdt.multiSelect = false;
grid_enginehoursdt.columns = columns;
grid_enginehoursdt.init();
grid_enginehoursdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_enginehoursdt.source[rowindex];
if (rowdata) {
}
}
}
function InitMostRecentEnginehoursGridData() {
grid_enginehoursmostrecentdt = new GridView('#enginehoursmostrecent');
grid_enginehoursmostrecentdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_enginehoursmostrecentdt = createGridView('#enginehoursmostrecent');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'DeviceSN', caption: GetTextByKey("P_MA_DEVICESN", "Device SN"), valueIndex: 'DeviceSN', css: { 'width': 140, 'text-align': 'left' } },
@ -174,19 +160,14 @@ function InitMostRecentEnginehoursGridData() {
}
columns.push(col);
}
grid_enginehoursmostrecentdt.canMultiSelect = false;
grid_enginehoursmostrecentdt.multiSelect = false;
grid_enginehoursmostrecentdt.columns = columns;
grid_enginehoursmostrecentdt.init();
}
function InitEnginehoursHisGridData() {
grid_enginehourshisdt = new GridView('#enginehourshislist');
grid_enginehourshisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_enginehourshisdt = createGridView('#enginehourshislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'DeviceSN', caption: GetTextByKey("P_MA_DEVICESN", "Device SN"), valueIndex: 'DeviceSN', css: { 'width': 140, 'text-align': 'left' } },
@ -217,15 +198,9 @@ function InitEnginehoursHisGridData() {
}
columns.push(col);
}
grid_enginehourshisdt.canMultiSelect = false;
grid_enginehourshisdt.multiSelect = false;
grid_enginehourshisdt.columns = columns;
grid_enginehourshisdt.init();
grid_enginehourshisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_enginehourshisdt.source[rowindex];
if (rowdata) {
}
}
}
function getEnineHours() {
@ -255,7 +230,8 @@ function getEngineHoursHis() {
if (isOEMDD2EH)
methodname = "GetOEMDD2EngineHoursHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
var timezone = $('#dialogadjust_enginehourstimezone').find("option:selected").val();
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid + String.fromCharCode(170) + htmlencode(timezone), function (data) {
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
@ -303,6 +279,7 @@ function getEngineHoursHisPreview() {
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadjust_enginehourstimezone').find("option:selected").val();
var hour = $('#dialogenginehours_timehour').val();
var minute = $('#dialogenginehours_timeminute').val();
@ -330,8 +307,8 @@ function GetCalampEngineHoursHistoryPreview(item) {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowEngineHoursHis(data);
ShowMostRecentEngineHoursPreview(data);
ShowEngineHoursHis(data);
}, function (err) {
showsubloading("adjustenginehoursmask", false);
});
@ -342,8 +319,7 @@ function ShowMostRecentEngineHours(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
mostrecentrecord = data[i];
var fr = { Values: mostrecentrecord };
rows.push(fr);
rows.push(mostrecentrecord);
break;// Display the most recent reading
}
grid_enginehoursmostrecentdt.sortIndex = -1;
@ -365,12 +341,17 @@ function ShowMostRecentEngineHoursPreview(data) {
var rows = [];
var r = $.extend(true, {}, mostrecentrecord);
if (data.length > 0) {
r.AsofTime = data[0].AsofTime;
r.AsofTimeLocal = data[0].AsofTimeLocal;
r.EventTimeLocalText = data[0].EventTimeLocalText;
r.EventTimeText = data[0].EventTimeText;
}
r.VBUS_Calc = r.VBUS - offsetVBUS;
r.VBUS_Calc = r.VBUS_Calc.toFixed(2);
r.VBUS_Calc = { DisplayValue: r.VBUS_Calc.toFixed(2), Value: r.VBUS_Calc };
r.Gps_Calc = r.Gps - offsetGPS;
r.Gps_Calc = r.Gps_Calc.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Gps_Calc = { DisplayValue: r.Gps_Calc.toFixed(2), Value: r.Gps_Calc };
rows.push(r);
grid_enginehoursmostrecentdt.sortIndex = -1;
grid_enginehoursmostrecentdt.sortDirection = -1;
@ -382,18 +363,17 @@ function ShowEngineHoursHis(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
var r = data[i];
r.VBUS = r.VBUS.toFixed(2);
r.VBUS_Calc = r.VBUS_Calc.toFixed(2);
r.Gps = r.Gps.toFixed(2);
r.Gps_Calc = r.Gps_Calc.toFixed(2);
r.VBUS = { DisplayValue: r.VBUS.toFixed(2), Value: r.VBUS };
r.VBUS_Calc = { DisplayValue: r.VBUS_Calc.toFixed(2), Value: r.VBUS_Calc };
r.Gps = { DisplayValue: r.Gps.toFixed(2), Value: r.Gps };
r.Gps_Calc = { DisplayValue: r.Gps_Calc.toFixed(2), Value: r.Gps_Calc };
for (var j in r) {
if (j === "EventTimeText")
r[j] = { DisplayValue: r["EventTimeText"], Value: r["AsofTime"] };
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTimeLocal"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_enginehourshisdt.sortIndex = -1;
grid_enginehourshisdt.sortDirection = -1;
@ -460,7 +440,7 @@ function OnAdjustEngineHours() {
showsubmask("adjustenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours');
var enginehourstxt = GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours");
showConfirm1('Do you want to adjust the engine hours?', alerttitle, function () {
showConfirm1(GetTextByKey("P_MA_DOYOUWANTADJUSTHOURS", 'Do you want to adjust the engine hours?'), alerttitle, function () {
showsubmask("adjustenginehoursmask", false);
var item = {
'CustomerID': contractorid,
@ -498,6 +478,7 @@ function OnAdjustEngineHours() {
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadjust_enginehourstimezone').find("option:selected").val();
var hour = $('#dialogenginehours_timehour').val();
var minute = $('#dialogenginehours_timeminute').val();
@ -635,6 +616,7 @@ function OnAddEngineHours() {
}
var offset = $('#dialogadd_enginehourstimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadd_enginehourstimezone').find("option:selected").val();
var hour = $('#dialogaddenginehours_timehour').val();
var minute = $('#dialogaddenginehours_timeminute').val();

View File

@ -15,10 +15,11 @@ function ShowFuelRemainings(data) {
r[j] = r[j] === true ? "Yes" : "";
else if (j === "Amount")
r[j] = { DisplayValue: r["PercentText"], Value: r["Amount"] };
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
//r.Amount = r.Amount.toFixed(2);
var fr = { Values: r };
rows.push(fr);
rows.push(r);
//if (r.DataSource.toLowerCase() == "calamp")
// hasCalamp = true;
@ -38,19 +39,14 @@ function ShowFuelRemainings(data) {
}
function InitFuelRemainingGridData() {
grid_fuelremainingdt = new GridView('#fuelremaininglist');
grid_fuelremainingdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_fuelremainingdt = createGridView('#fuelremaininglist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Amount', caption: GetTextByKey("P_MA_FUELREMAINING", "Fuel Remaining"), valueIndex: 'Amount', css: { 'width': 100, 'text-align': 'left' } },
//{ name: 'Units', caption: GetTextByKey("P_MA_UNITS", "Units"), valueIndex: 'UOM', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -67,8 +63,10 @@ function InitFuelRemainingGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key"; //GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(5, this);
@ -84,28 +82,16 @@ function InitFuelRemainingGridData() {
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.visible = IsSupperAdmin;
col.resizable = false;
}
columns.push(col);
}
grid_fuelremainingdt.canMultiSelect = false;
grid_fuelremainingdt.multiSelect = false;
grid_fuelremainingdt.columns = columns;
grid_fuelremainingdt.init();
grid_fuelremainingdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_fuelremainingdt.source[rowindex];
if (rowdata) {
}
}
}
function InitFuelRemainingHisGridData() {
grid_fuelremaininghisdt = new GridView('#fuelremaininghislist');
grid_fuelremaininghisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_fuelremaininghisdt = createGridView('#fuelremaininghislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'AsofTime', caption: GetTextByKey("P_MA_EVENTDATEUTC", "Event Date(UTC)"), valueIndex: 'EventTimeText', css: { 'width': 130, 'text-align': 'left' } },
@ -132,15 +118,9 @@ function InitFuelRemainingHisGridData() {
}
columns.push(col);
}
grid_fuelremaininghisdt.canMultiSelect = false;
grid_fuelremaininghisdt.multiSelect = false;
grid_fuelremaininghisdt.columns = columns;
grid_fuelremaininghisdt.init();
grid_fuelremaininghisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_fuelremaininghisdt.source[rowindex];
if (rowdata) {
}
}
}
@ -248,8 +228,7 @@ function ShowFuelRemainingHis(data) {
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTime_Local"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_fuelremaininghisdt.sortIndex = -1;
grid_fuelremaininghisdt.sortDirection = -1;

View File

@ -14,10 +14,11 @@ function ShowFueluseds(data) {
for (var j in r) {
if (j === "IsPrimary")
r[j] = r[j] === true ? "Yes" : "";
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
r.Amount = r.Amount.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Amount = { DisplayValue: r.Amount.toFixed(2), Value: r.Amount };
rows.push(r);
//if (r.DataSource.toLowerCase() == "calamp")
// hasCalamp = true;
@ -37,19 +38,14 @@ function ShowFueluseds(data) {
}
function InitFuelusedGridData() {
grid_fueluseddt = new GridView('#fuelusedlist');
grid_fueluseddt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_fueluseddt = createGridView('#fuelusedlist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Amount', caption: GetTextByKey("P_MA_FUELUSED", "Fuel Used"), valueIndex: 'Amount', css: { 'width': 100, 'text-align': 'left' } },
{ name: 'Units', caption: GetTextByKey("P_MA_UNITS", "Units"), valueIndex: 'UOM', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -66,8 +62,10 @@ function InitFuelusedGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key"; //GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(4, this);
@ -83,28 +81,16 @@ function InitFuelusedGridData() {
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.visible = IsSupperAdmin;
col.resizable = false;
}
columns.push(col);
}
grid_fueluseddt.canMultiSelect = false;
grid_fueluseddt.multiSelect = false;
grid_fueluseddt.columns = columns;
grid_fueluseddt.init();
grid_fueluseddt.selectedrowchanged = function (rowindex) {
var rowdata = grid_fueluseddt.source[rowindex];
if (rowdata) {
}
}
}
function InitFuelusedHisGridData() {
grid_fuelusedhisdt = new GridView('#fuelusedhislist');
grid_fuelusedhisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_fuelusedhisdt = createGridView('#fuelusedhislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'AsofTime', caption: GetTextByKey("P_MA_EVENTDATEUTC", "Event Date(UTC)"), valueIndex: 'EventTimeText', css: { 'width': 130, 'text-align': 'left' } },
@ -131,15 +117,9 @@ function InitFuelusedHisGridData() {
}
columns.push(col);
}
grid_fuelusedhisdt.canMultiSelect = false;
grid_fuelusedhisdt.multiSelect = false;
grid_fuelusedhisdt.columns = columns;
grid_fuelusedhisdt.init();
grid_fuelusedhisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_fuelusedhisdt.source[rowindex];
if (rowdata) {
}
}
}
@ -247,8 +227,7 @@ function ShowFuelusedHis(data) {
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTime_Local"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_fuelusedhisdt.sortIndex = -1;
grid_fuelusedhisdt.sortDirection = -1;

View File

@ -16,10 +16,11 @@ function ShowIdlehours(data) {
r[j] = r[j] === true ? "Yes" : "";
else if (j === "UOM")
r[j] = "Hour";
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
r.Hours = r.Hours.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Hours = { DisplayValue: r.Hours.toFixed(2), Value: r.Hours };
rows.push(r);
//if (r.DataSource.toLowerCase() == "calamp")
// hasCalamp = true;
@ -39,19 +40,14 @@ function ShowIdlehours(data) {
}
function InitIdlehourGridData() {
grid_idlehourdt = new GridView('#idlehourlist');
grid_idlehourdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_idlehourdt = createGridView('#idlehourlist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Hours', caption: GetTextByKey("P_MA_IDLEHOURS", "Idle Hours"), valueIndex: 'Hours', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'Units', caption: GetTextByKey("P_MA_UNITS", "Units"), valueIndex: 'UOM', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -68,8 +64,10 @@ function InitIdlehourGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key"; //GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(3, this);
@ -85,28 +83,16 @@ function InitIdlehourGridData() {
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.visible = IsSupperAdmin;
col.resizable = false;
}
columns.push(col);
}
grid_idlehourdt.canMultiSelect = false;
grid_idlehourdt.multiSelect = false;
grid_idlehourdt.columns = columns;
grid_idlehourdt.init();
grid_idlehourdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_idlehourdt.source[rowindex];
if (rowdata) {
}
}
}
function InitIdlehourHisGridData() {
grid_idlehourhisdt = new GridView('#idlehourhislist');
grid_idlehourhisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_idlehourhisdt = createGridView('#idlehourhislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'AsofTime', caption: GetTextByKey("P_MA_EVENTDATEUTC", "Event Date(UTC)"), valueIndex: 'EventTimeText', css: { 'width': 130, 'text-align': 'left' } },
@ -133,15 +119,9 @@ function InitIdlehourHisGridData() {
}
columns.push(col);
}
grid_idlehourhisdt.canMultiSelect = false;
grid_idlehourhisdt.multiSelect = false;
grid_idlehourhisdt.columns = columns;
grid_idlehourhisdt.init();
grid_idlehourhisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_idlehourhisdt.source[rowindex];
if (rowdata) {
}
}
}
@ -248,8 +228,7 @@ function ShowIdlehourHis(data) {
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTime_Local"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_idlehourhisdt.sortIndex = -1;
grid_idlehourhisdt.sortDirection = -1;

View File

@ -14,9 +14,10 @@ function ShowLocations(data) {
for (var j in r) {
if (j === "IsPrimary")
r[j] = r[j] === true ? "Yes" : "";
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
//if (r.DataSource.toLowerCase() == "calamp")
// hasCalamp = true;
@ -36,19 +37,14 @@ function ShowLocations(data) {
}
function InitLocationGridData() {
grid_locationdt = new GridView('#locationlist');
grid_locationdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_locationdt = createGridView('#locationlist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Longitude', caption: GetTextByKey("P_MA_LONGITUDE", "Longitude"), valueIndex: 'Longitude', css: { 'width': 90, 'text-align': 'left' } },
{ name: 'Latitude', caption: GetTextByKey("P_MA_LATITUDE", "Latitude"), valueIndex: 'Latitude', css: { 'width': 90, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -65,8 +61,10 @@ function InitLocationGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key";// GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(2, this);
@ -82,28 +80,16 @@ function InitLocationGridData() {
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.visible = IsSupperAdmin;
col.resizable = false;
}
columns.push(col);
}
grid_locationdt.canMultiSelect = false;
grid_locationdt.multiSelect = false;
grid_locationdt.columns = columns;
grid_locationdt.init();
grid_locationdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_locationdt.source[rowindex];
if (rowdata) {
}
}
}
function InitLocationHisGridData() {
grid_locationhisdt = new GridView('#locationhislist');
grid_locationhisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_locationhisdt = createGridView('#locationhislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'AsofTime', caption: GetTextByKey("P_MA_EVENTDATEUTC", "Event Date(UTC)"), valueIndex: 'EventTimeText', css: { 'width': 130, 'text-align': 'left' } },
@ -130,15 +116,9 @@ function InitLocationHisGridData() {
}
columns.push(col);
}
grid_locationhisdt.canMultiSelect = false;
grid_locationhisdt.multiSelect = false;
grid_locationhisdt.columns = columns;
grid_locationhisdt.init();
grid_locationhisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_locationhisdt.source[rowindex];
if (rowdata) {
}
}
}
@ -245,8 +225,7 @@ function ShowLocationHis(data) {
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTime_Local"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_locationhisdt.sortIndex = -1;
grid_locationhisdt.sortDirection = -1;

View File

@ -24,11 +24,12 @@ function ShowOdometers(data) {
for (var j in r) {
if (j === "IsPrimary")
r[j] = r[j] === true ? "Yes" : "";
else if (j === "AsofTimeLocal")
r[j] = { DisplayValue: r["ReceivedDateStr"], Value: r[j] };
}
r.Odometer = r.Odometer.toFixed(2);
r.Corrected = r.Corrected.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Odometer = { DisplayValue: r.Odometer.toFixed(2), Value: r.Odometer };
r.Corrected = { DisplayValue: r.Corrected.toFixed(2), Value: r.Corrected };
rows.push(r);
if (r.DataSource.toLowerCase() == "calamp" && r.IsPrimary.toLowerCase() == "yes")
isCalampOdo = true;
else if (r.DataSource.toLowerCase() == "pedigree") {
@ -71,20 +72,15 @@ function ShowOdometers(data) {
}
function InitOdometerGridData() {
grid_odometerdt = new GridView('#odometerlist');
grid_odometerdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_odometerdt = createGridView('#odometerlist');
var list_columns = [
{ name: 'IsPrimary', caption: GetTextByKey("P_MA_ISPRIMARY", "Is Primary"), valueIndex: 'IsPrimary', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'DataSourceName', caption: GetTextByKey("P_MA_DATASOURCE", "Data Source"), valueIndex: 'DataSourceName', css: { 'width': 120, 'text-align': 'left' } },
{ name: 'Odometer', caption: GetTextByKey("P_MA_ODOMETER", "Odometer"), valueIndex: 'Odometer', css: { 'width': 80, 'text-align': 'left' } },
{ name: 'Corrected', caption: GetTextByKey("P_MA_ADJUSTED", "Adjusted"), valueIndex: 'Corrected', css: { 'width': 75, 'text-align': 'left' } },
{ name: 'UOM', caption: GetTextByKey("P_MA_UNITS", "Units"), valueIndex: 'UOM', css: { 'width': 60, 'text-align': 'left' } },
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'ReceivedDateStr', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 100, 'text-align': 'left' } }
{ name: 'ReceivedDate', caption: GetTextByKey("P_MA_RECEIVEDDATE", "Received Date"), valueIndex: 'AsofTimeLocal', css: { 'width': 130, 'text-align': 'left' } },
{ name: 'SetPrmary', caption: "", css: { 'width': 30, 'text-align': 'left' } }
];
var columns = [];
// head
@ -93,7 +89,7 @@ function InitOdometerGridData() {
col.name = list_columns[hd].name;
col.caption = list_columns[hd].caption;
col.visible = true;
col.sortable = false;
col.sortable = true;
col.width = list_columns[hd].css.width;
col.align = list_columns[hd].css["text-align"]
col.key = list_columns[hd].valueIndex;
@ -101,8 +97,10 @@ function InitOdometerGridData() {
col.type = list_columns[hd].type;
}
if (col.name === "SetPrmary") {
col.isurl = true;
col.text = GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = "key"; //GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary');
col.events = {
onclick: function () {
openSetPrimary(0, this);
@ -117,28 +115,16 @@ function InitOdometerGridData() {
};
};
col.attrs = { 'title': GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary') };
col.resizable = false;
}
columns.push(col);
}
grid_odometerdt.canMultiSelect = false;
grid_odometerdt.multiSelect = false;
grid_odometerdt.columns = columns;
grid_odometerdt.init();
grid_odometerdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_odometerdt.source[rowindex];
if (rowdata) {
}
}
}
function InitOdometerMostRecentGridData() {
grid_odometermostrecentdt = new GridView('#odometermostrecent');
grid_odometermostrecentdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_odometermostrecentdt = createGridView('#odometermostrecent');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'DeviceSN', caption: GetTextByKey("P_MA_DEVICESN", "Device SN"), valueIndex: 'DeviceSN', css: { 'width': 140, 'text-align': 'left' } },
@ -166,18 +152,13 @@ function InitOdometerMostRecentGridData() {
}
columns.push(col);
}
grid_odometermostrecentdt.canMultiSelect = false;
grid_odometermostrecentdt.multiSelect = false;
grid_odometermostrecentdt.columns = columns;
grid_odometermostrecentdt.init();
}
function InitOdometerHisGridData() {
grid_odometerhisdt = new GridView('#odometerhislist');
grid_odometerhisdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_odometerhisdt = createGridView('#odometerhislist');
var list_columns = [
{ name: 'DeviceAirId', caption: GetTextByKey("P_MA_DEVICEAIRID", "Device Air ID"), valueIndex: 'DeviceAirId', css: { 'width': 140, 'text-align': 'left' } },
{ name: 'DeviceSN', caption: GetTextByKey("P_MA_DEVICESN", "Device SN"), valueIndex: 'DeviceSN', css: { 'width': 140, 'text-align': 'left' } },
@ -205,15 +186,9 @@ function InitOdometerHisGridData() {
}
columns.push(col);
}
grid_odometerhisdt.canMultiSelect = false;
grid_odometerhisdt.multiSelect = false;
grid_odometerhisdt.columns = columns;
grid_odometerhisdt.init();
grid_odometerhisdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_odometerhisdt.source[rowindex];
if (rowdata) {
}
}
}
@ -245,7 +220,8 @@ function getOdometerHis() {
else if (isSmartWitness)
methodname = "GetSmartWitnessOdometerHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
var timezone = $('#dialogadjust_enginehourstimezone').find("option:selected").val();
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid + String.fromCharCode(170) + htmlencode(timezone), function (data) {
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
@ -293,6 +269,7 @@ function getOdometerHisPreview() {
}
var offset = $('#dialogadjust_odometertimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadjust_odometertimezone').find("option:selected").val();
var hour = $('#dialogadjust_timehour').val();
var minute = $('#dialogadjust_timeminute').val();
@ -321,8 +298,8 @@ function GetOdometerHistoryPreview(item) {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowOdometerHis(data);
ShowMostRecentOdometerPreview(data);
ShowOdometerHis(data);
}, function (err) {
showsubloading("adjustodomask", false);
});
@ -333,8 +310,7 @@ function ShowMostRecentOdometer(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
mostrecentrecord = data[i];
var fr = { Values: mostrecentrecord };
rows.push(fr);
rows.push(mostrecentrecord);
break;// Display the most recent reading
}
grid_odometermostrecentdt.sortIndex = -1;
@ -356,12 +332,17 @@ function ShowMostRecentOdometerPreview(data) {
var rows = [];
var r = $.extend(true, {}, mostrecentrecord);
if (data.length > 0) {
r.AsofTime = data[0].AsofTime;
r.AsofTimeLocal = data[0].AsofTimeLocal;
r.EventTimeLocalText = data[0].EventTimeLocalText;
r.EventTimeText = data[0].EventTimeText;
}
r.VBUS_Calc = r.VBUS - offsetVBUS;
r.VBUS_Calc = r.VBUS_Calc.toFixed(2);
r.VBUS_Calc = { DisplayValue: r.VBUS_Calc.toFixed(2), Value: r.VBUS_Calc };
r.Gps_Calc = r.Gps - offsetGPS;
r.Gps_Calc = r.Gps_Calc.toFixed(2);
var fr = { Values: r };
rows.push(fr);
r.Gps_Calc = { DisplayValue: r.Gps_Calc.toFixed(2), Value: r.Gps_Calc };
rows.push(r);
grid_odometermostrecentdt.sortIndex = -1;
grid_odometermostrecentdt.sortDirection = -1;
@ -372,18 +353,17 @@ function ShowOdometerHis(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
var r = data[i];
r.VBUS = r.VBUS.toFixed(2);
r.VBUS_Calc = r.VBUS_Calc.toFixed(2);
r.Gps = r.Gps.toFixed(2);
r.Gps_Calc = r.Gps_Calc.toFixed(2);
r.VBUS = { DisplayValue: r.VBUS.toFixed(2), Value: r.VBUS };
r.VBUS_Calc = { DisplayValue: r.VBUS_Calc.toFixed(2), Value: r.VBUS_Calc };
r.Gps = { DisplayValue: r.Gps.toFixed(2), Value: r.Gps };
r.Gps_Calc = { DisplayValue: r.Gps_Calc.toFixed(2), Value: r.Gps_Calc };
for (var j in r) {
if (j === "EventTimeText")
r[j] = { DisplayValue: r["EventTimeText"], Value: r["AsofTime"] };
if (j === "EventTimeLocalText")
r[j] = { DisplayValue: r["EventTimeLocalText"], Value: r["AsofTime_Local"] };
}
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_odometerhisdt.sortIndex = -1;
grid_odometerhisdt.sortDirection = -1;
@ -482,6 +462,7 @@ function OnAdjustOdometer() {
}
var offset = $('#dialogadjust_odometertimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadjust_odometertimezone').find("option:selected").val();
var hour = $('#dialogadjust_timehour').val();
var minute = $('#dialogadjust_timeminute').val();
@ -615,6 +596,7 @@ function OnAddOdometer() {
}
var offset = $('#dialogadd_odometertimezone').find("option:selected").attr("offset");
item.OffsetMinute = offset;
item.TimeZone = $('#dialogadd_odometertimezone').find("option:selected").val();
var hour = $('#dialogadd_timehour').val();
var minute = $('#dialogadd_timeminute').val();

View File

@ -216,7 +216,7 @@ function openSetPrimary(type, datasource) {
selectedType = type;
$('#dialogprimary_notes').val('');
$('#dialog_setprimary .dialog-title span.title').text('Set As Primary');
$('#dialog_setprimary .dialog-title span.title').text(GetTextByKey("P_MA_SETASPRIMARY", 'Set As Primary'));
showmaskbg(true);
$('#dialog_setprimary')
.attr('act', 'add')

View File

@ -49,8 +49,10 @@ function GetContacts() {
}
function SetJobSites(data) {
if (!activejobsitedata)
if (!activejobsitedata) {
grid_jobsitedt.setData([]);
return;
}
for (var i = 0; i < activejobsitedata.length; i++) {
var js = activejobsitedata[i];
js.OnSite = false;
@ -103,15 +105,14 @@ function ShowActiveJobSites(data) {
var otherrows = [];
for (var i = 0; i < data.length; i++) {
var r = data[i];
var fr = { Values: r };
if (r.OnSite)
onsiterows.push(fr)
onsiterows.push(r)
else if (r.InJobSite)
injobsiterows.push(fr);
injobsiterows.push(r);
else if (r.Sugguested)
sugguestedrows.push(fr);
sugguestedrows.push(r);
else
otherrows.push(fr);
otherrows.push(r);
}
var rows = [];
@ -134,12 +135,7 @@ function ShowActiveJobSites(data) {
var grid_jobsitedt;
function InitJobSiteGridData() {
grid_jobsitedt = new GridView('#jobsitelist');
grid_jobsitedt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_jobsitedt = createGridView('#jobsitelist');
var list_columns = [
{ name: 'OnSite', caption: GetTextByKey("P_MA_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 60, 'text-align': 'center' } },
{ name: 'Name', caption: GetTextByKey("P_MA_JOBSITENAME", "Jobsite Name"), valueIndex: 'Name', css: { 'width': 150, 'text-align': 'left' } },
@ -175,23 +171,16 @@ function InitJobSiteGridData() {
}
columns.push(col);
}
grid_jobsitedt.canMultiSelect = true;
grid_jobsitedt.multiSelect = true;
grid_jobsitedt.columns = columns;
grid_jobsitedt.init();
grid_jobsitedt.selectedrowchanged = function (rowindex) {
var rowdata = grid_jobsitedt.source[rowindex];
if (rowdata) {
}
}
}
function ShowContacts(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
var r = data[i];
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_contactdt.sortIndex = 0;//已选默认拍在前面
grid_contactdt.sortDirection = -1;
@ -200,12 +189,7 @@ function ShowContacts(data) {
var grid_contactdt;
function InitContactGridData() {
grid_contactdt = new GridView('#contactlist');
grid_contactdt.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_contactdt = createGridView('#contactlist');
var list_columns = [
{ name: 'Assigned', caption: GetTextByKey("P_MA_ASSIGNED", "Assigned"), valueIndex: 'Assigned', type: 3, css: { 'width': 75, 'text-align': 'center' } },
{ name: 'DisplayName', caption: GetTextByKey("P_MA_CONTACTNAME", "Contact Name"), valueIndex: 'DisplayName', css: { 'width': 150, 'text-align': 'left' } },
@ -234,15 +218,9 @@ function InitContactGridData() {
}
columns.push(col);
}
grid_contactdt.canMultiSelect = false;
grid_contactdt.multiSelect = false;
grid_contactdt.columns = columns;
grid_contactdt.init();
grid_contactdt.selectedrowchanged = function (rowindex) {
var rowdata = grid_contactdt.source[rowindex];
if (rowdata) {
}
}
}
function reshowgrid() {
@ -259,12 +237,7 @@ function reshowgrid() {
var assetgroups
var grid_assetgroups;
function InitAssetGroupGridData() {
grid_assetgroups = new GridView('#assetgrouplist');
grid_assetgroups.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_assetgroups = createGridView('#assetgrouplist');
var list_columns = [
{ 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' } }
@ -292,7 +265,7 @@ function InitAssetGroupGridData() {
}
columns.push(col);
}
grid_assetgroups.canMultiSelect = false;
grid_assetgroups.multiSelect = false;
grid_assetgroups.columns = columns;
grid_assetgroups.init();
}
@ -316,10 +289,12 @@ function ShowMachineGroups() {
for (var i = 0; i < assetgroups.length; i++) {
var r = assetgroups[i];
r.Selected = false
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_assetgroups.setData(rows);
if (assetinfo)
SetMachineGroups(assetinfo.MachineGroupIDs);
}
function SetMachineGroups(ids) {

View File

@ -29,12 +29,7 @@ function showConfirmOKCancel(msg, title, fok, fcancel) {
var pmschedules
var grid_pmschedules;
function InitPMGridData() {
grid_pmschedules = new GridView('#pmschedulelist');
grid_pmschedules.lang = {
all: GetTextByKey("P_GRID_ALL", "(All)"),
ok: GetTextByKey("P_GRID_OK", "OK"),
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
grid_pmschedules = createGridView('#pmschedulelist');
var list_columns = [
{ 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' } },
@ -62,7 +57,7 @@ function InitPMGridData() {
if (this.Selected) {
showSetPMDialog(this);
this.Selected = false;//弹出对话框并取消勾选因为此时机器并没有真正加入到计划在对话框OK刷新列表
grid_pmschedules.reload();
grid_pmschedules.reload(true);
}
else {
var item = this;
@ -74,7 +69,7 @@ function InitPMGridData() {
removeAssetFromPMSchedule(item);
}, function () {
item.Selected = true;
grid_pmschedules.reload();
grid_pmschedules.reload(true);
});
}
}
@ -82,7 +77,7 @@ function InitPMGridData() {
}
columns.push(col);
}
grid_pmschedules.canMultiSelect = false;
grid_pmschedules.multiSelect = false;
grid_pmschedules.columns = columns;
grid_pmschedules.init();
}
@ -115,8 +110,7 @@ function ShowPMSchedules() {
else
r.StartValue = r.StartDateString;
var fr = { Values: r };
rows.push(fr);
rows.push(r);
}
grid_pmschedules.setData(rows);
}

View File

@ -1,9 +1,113 @@
$(function () {
InitAttachmentGridData();
$('#dialog_adddocument').dialog(function () {
showmaskbg(false);
});
$(window).resize(function () {
$("#documentlist").css("height", $(window).height() - $("#documentlist").offset().top - 4);
grid_attachmentdt && grid_attachmentdt.resize();
}).resize();
});
function showAttachments(data) {
var rows = [];
for (var i = 0; i < data.length; i++) {
var r = data[i];
for (var j in r) {
if (j === "VisibleOnWorkOrder")
r[j] = { DisplayValue: r["VisibleOnWorkOrder"] ? GetTextByKey("P_UTILITY_YES", "Yes") : GetTextByKey("P_UTILITY_NO", "No"), Value: r[j] };
else if (j === "VisibleOnMap")
r[j] = { DisplayValue: r["VisibleOnMap"] ? GetTextByKey("P_UTILITY_YES", "Yes") : GetTextByKey("P_UTILITY_NO", "No"), Value: r[j] };
else if (j === "VisibleOnMobile")
r[j] = { DisplayValue: r["VisibleOnMobile"] ? GetTextByKey("P_UTILITY_YES", "Yes") : GetTextByKey("P_UTILITY_NO", "No"), Value: r[j] };
else if (j === "AddedOnLocal")
r[j] = { DisplayValue: r["AddedOnLocalStr"], Value: r[j] };
}
rows.push(r);
}
grid_attachmentdt.setData(rows);
}
var grid_attachmentdt;
function InitAttachmentGridData() {
$('#btnEdit').attr("disabled", "disabled");
grid_attachmentdt = createGridView('#documentlist');
var list_columns = [
{ name: 'Name', caption: GetTextByKey("P_MA_NAME", "Name"), valueIndex: 'Name', allowFilter: true, css: { 'width': 120, 'text-align': 'left' } },
{ name: 'AddedBy', caption: GetTextByKey("P_MA_UPLOADEDBY", "Uploaded By"), valueIndex: 'AddedBy', allowFilter: true, css: { 'width': 100, 'text-align': 'left' } },
{ name: 'VisibleOnWorkOrder', caption: GetTextByKey("P_MA_VISIBLEONWORKORDER", "Visible On Work Order?"), valueIndex: 'VisibleOnWorkOrder', allowFilter: true, css: { 'width': 80, 'text-align': 'left' } },
{ name: 'VisibleOnMap', caption: GetTextByKey("P_MA_VISIBLEONMAP", "Visible On Map?"), valueIndex: 'VisibleOnMap', allowFilter: true, css: { 'width': 80, 'text-align': 'left' } },
{ name: 'VisibleOnMobile', caption: GetTextByKey("P_MA_VISIBLEONMOBILE", "Visible On Mobile?"), valueIndex: 'VisibleOnMobile', allowFilter: true, css: { 'width': 80, 'text-align': 'left' } },
{ name: 'AddedOnLocal', caption: GetTextByKey("P_MA_ADDEDON", "Added On"), valueIndex: 'AddedOnLocal', allowFilter: true, css: { 'width': 80, 'text-align': 'left' } },
{ name: 'Description', caption: GetTextByKey("P_MA_DESCRIPTION", "Desctiption"), valueIndex: 'Description', css: { 'width': 200, 'text-align': 'left' } },
{ name: 'View', caption: "", css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Edit', caption: "", css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Delete', caption: "", css: { 'width': 30, 'text-align': 'center' } }
];
var columns = [];
// head
for (var hd in list_columns) {
var col = {};
col.name = list_columns[hd].name;
col.caption = list_columns[hd].caption;
col.visible = true;
col.sortable = true;
col.width = list_columns[hd].css.width;
col.align = list_columns[hd].css["text-align"]
col.key = list_columns[hd].valueIndex;
col.allowFilter = list_columns[hd].allowFilter;
if (col.name === "View") {
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = 'eye';
col.iconType = 'fa-light';
col.events = {
onclick: function () {
openDocumentUrl();
}
};
col.attrs = { 'title': GetTextByKey("P_CRE_EDIT", 'Edit') };
}
else if (col.name === "Edit") {
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = 'edit';
col.iconType = 'fa-light';
col.events = {
onclick: function () {
onEditDocument();
}
};
col.attrs = { 'title': GetTextByKey("P_CRE_EDIT", 'Edit') };
}
else if (col.name === "Delete") {
col.sortable = false;
col.resizable = false;
col.type = GridView.ColumnTypes.Icon;
col.text = 'times';
col.iconType = 'fa-light';
col.events = {
onclick: function () {
onDeleteDocument(this);
}
};
col.attrs = { 'title': GetTextByKey("P_CRE_DELETE", 'Delete') };
}
columns.push(col);
}
grid_attachmentdt.canMultiSelect = false;
grid_attachmentdt.columns = columns;
grid_attachmentdt.init();
grid_attachmentdt.onRowDblClicked = onEditDocument;
}
function setPreviewAttachment() {
filedata = undefined;
$("#tbAssetAttas").empty();
@ -12,7 +116,6 @@ function setPreviewAttachment() {
}
function getAttachments(machineid) {
$('#tbody_documents').empty();
if (!machineid) return;
showLoading();
@ -30,7 +133,6 @@ function getAttachments(machineid) {
else
attdata = [];
sortTableData($('#tbdocuments'), attdata);
showAttachments(attdata);
}, function (err) {
hideLoading();
@ -38,40 +140,19 @@ function getAttachments(machineid) {
}
function onEditDocument() {
var doc = $(this).data('document');
if (!doc)
doc = $(this).parents("tr").data('document');
var doc = grid_attachmentdt.source[grid_attachmentdt.selectedIndex];
if (!doc) {
return;
}
openAddDocument(doc);
}
function openDocumentUrl() {
var doc = $(this).parents("tr").data('document');
window.open(doc.Url);
}
function showAttachments(data) {
var trs = [];
for (var i = 0; i < data.length; i++) {
var doc = data[i];
var tr = $('<tr></tr>').data('document', doc).dblclick(onEditDocument);
var span = $('<span style="cursor:pointer;"></span>').text(doc.Name).attr('title', doc.Name).click(openDocumentUrl);
tr.append($('<td class="machinetd" style="width: 120px;"></td>').append(span));
tr.append($('<td class="machinetd" style="width: 100px;"></td>').text(doc.AddedBy).attr('title', doc.AddedBy));
tr.append($('<td class="machinetd" style="width: 80px;"></td>').text(doc.VisibleOnWorkOrder ? "Yes" : "No"));
tr.append($('<td class="machinetd" style="width: 80px;"></td>').text(doc.VisibleOnMap ? "Yes" : "No"));
tr.append($('<td class="machinetd" style="width: 80px;"></td>').text(doc.VisibleOnMobile ? "Yes" : "No"));
tr.append($('<td class="machinetd" style="width: 100px;"></td>').text(doc.AddedOnLocalStr).attr('title', doc.AddedOnLocalStr));
tr.append($('<td class="machinetd" style="width: 200px;"></td>').html(replaceHtmlText(doc.Description)).attr('title', doc.Description));
var spview = $('<span class="button_document iconview" title="' + GetTextByKey('P_MA_VIEW', 'View') + '"></span>').click(openDocumentUrl);
var spedit = $('<span class="button_document iconedit" title="' + GetTextByKey('P_MA_EDIT', 'Edit') + '"></span>').click(onEditDocument);
var spdel = $('<span class="button_document icondelete" title="' + GetTextByKey('P_MA_DELETE', 'Delete') + '"></span>').click(onDeleteDocument);;
tr.append($('<td class="machinetd" style="width: 80px;"></td>').append(spview).append(spedit).append(spdel));
trs.push(tr);
var doc = grid_attachmentdt.source[grid_attachmentdt.selectedIndex];
if (!doc) {
return;
}
$('#tbody_documents').append(trs);
window.open(doc.Url);
}
var assetdocumentid;
@ -82,12 +163,12 @@ function openAddDocument(doc) {
$('#tr_document_radio').hide();
$('#dialog_adddoc_name').val(doc.Name);
$('#dialog_adddoc_desc').val(doc.Description);
$('#dialog_visibleonwo').prop('checked', doc.VisibleOnWorkOrder);
$('#dialog_visibleonmap').prop('checked', doc.VisibleOnMap);
$('#dialog_visibleonmobile').prop('checked', doc.VisibleOnMobile);
$('#dialog_visibleonwo').prop('checked', doc.VisibleOnWorkOrder.Value);
$('#dialog_visibleonmap').prop('checked', doc.VisibleOnMap.Value);
$('#dialog_visibleonmobile').prop('checked', doc.VisibleOnMobile.Value);
if (doc.FileType.toLowerCase() === "url") {
$('#dialog_rdourl').prop('checked', true);
$('#dialog_adddoc_url').attr("disabled", true);
//$('#dialog_adddoc_url').attr("disabled", true);
$('#dialog_adddoc_url').val(doc.Url);
$('#tr_document_url').show();
@ -263,6 +344,16 @@ function UpdateAssetDocument() {
$('#adddocumentmask').hide();
return;
}
var type = $('input[name="rdoattachmentmode"]:checked').val();
if (type === "0") {
item.FileType = "URL";
item.Url = $('#dialog_adddoc_url').val();
if (item.Url === "") {
showAlert(GetTextByKey("P_MA_URLCANNOTBEEMPTY", 'Url cannot be empty.'), alerttitle);
$('#adddocumentmask').hide();
return;
}
}
showloading(true);
var param = JSON.stringify(item);
@ -284,8 +375,11 @@ function UpdateAssetDocument() {
}
function onDeleteDocument() {
var doc = grid_attachmentdt.source[grid_attachmentdt.selectedIndex];
if (!doc) {
return;
}
var alerttitle = GetTextByKey("P_MA_DELETEDOCUMENTATION", "Delete Documentation");
var doc = $(this).parents("tr").data('document');
showConfirm(GetTextByKey("P_MA_DELETEDOCUMENTTTIPS", 'Are you sure you want to delete the document?'), alerttitle, function () {
devicerequest("DeleteAttachment", contractorid + String.fromCharCode(170) + doc.Id, function (data) {
if (data !== 'OK')

View File

@ -9,7 +9,7 @@ $(function () {
dialogAttachToAssets.onOK = function (source, selectedIndex) {
var selectedAsset = null;
if (selectedIndex >= 0)
selectedAsset = source[selectedIndex].Values;
selectedAsset = source[selectedIndex];
$("#dialog_attachtoasset").val(selectedAsset.Name).data("AttachedtoAssetId", selectedAsset.MachineID ? selectedAsset.MachineID : selectedAsset.Id);
inputChanged = true;
@ -17,7 +17,8 @@ $(function () {
};
$("#btnSelectAttachToAsset").click(function () {
showmaskbg(true);
dialogAttachToAssets.companyId = $('#sel_contractor').val();
dialogAttachToAssets.companyId = contractorid;
dialogAttachToAssets.exceptSource = [machineid];
dialogAttachToAssets.showSelector(3, true);//与mergeasset中的showSelector冲突需设置force
});

View File

@ -0,0 +1,47 @@
/// <reference path="../../js/jquery-3.6.0.min.js" />
/// <reference path="../../js/utility.js" />
// controls
$.fn.number = function () {
return this.each(function () {
function changed(e)
{
//if (this.className.indexOf('inp_priority') >= 0 && this.value == 0) {
// this.value = '';
//}
//else {
var m = this.value.match(/[0-9]+/g);
if (!m) {
this.value = '1';
} else {
this.value = m.join('');
}
//}
}
function keydown(e) {
if (e.altKey || e.ctrlKey) {
return true;
}
switch (e.keyCode) {
case 8: // backspace
case 9: // tab
case 46: // del
return true;
}
if ($(this).hasClass('inp_priority') && (e.keyCode == 96 || e.keyCode == 48) && $(this).val() == '')
{
return false;
}
//if ('0123456789'.indexOf(e.key) >= 0) {
// return true;
//}
if ((e.keyCode >= 96 && e.keyCode <= 105) || (e.keyCode >= 48 && e.keyCode <= 57)) {
return true;
}
return false;
}
$(this).unbind('change.num').unbind('keydown.num').bind('change.num', changed).bind('keydown.num', keydown);
});
};

View File

@ -92,7 +92,7 @@ function getPairingSignature(pairinglogid, logtab) {
if (data && data != null && data.length > 0) {
var logtr = $('<tr></tr>');
logtab.append(logtr);
var logtd = $('<td class="label"></td>').text(GetTextByKey('P_XXXX', 'Signature: '));
var logtd = $('<td class="label"></td>').text(GetTextByKey('P_MD_SIGNATURE_COLON', 'Signature: '));
logtr.append(logtd);
logtd = $('<td colspan="3"></td>');
logtr.append(logtd);
@ -110,27 +110,27 @@ function getPairingSignature(pairinglogid, logtab) {
function getPairingAttachmentCategory(key) {
switch (key) {
case "Odometer":
return GetTextByKey("P_XXXX", "Odometer");
return GetTextByKey("P_MD_ODOMETER", "Odometer");
case "Engine Hours":
return GetTextByKey("P_XXXX", "Engine Hours");
return GetTextByKey("P_MD_ENGINEHOURS", "Engine Hours");
case "Mounting Location":
return GetTextByKey("P_XXXX", "Mounting Location");
return GetTextByKey("P_MD_MOUNTINGLOCATION", "Mounting Location");
case "Power Connection":
return GetTextByKey("P_XXXX", "Power Connection");
return GetTextByKey("P_MD_POWERCONNECTION", "Power Connection");
case "Ground Connection":
return GetTextByKey("P_XXXX", "Ground Connection");
return GetTextByKey("P_MD_GROUNDCONNECTION", "Ground Connection");
case "Ignition Connection":
return GetTextByKey("P_XXXX", "Ignition Connection");
return GetTextByKey("P_MD_IGNITIONCONNECTION", "Ignition Connection");
case "Asset Number":
return GetTextByKey("P_XXXX", "Asset Number");
return GetTextByKey("P_MD_ASSETNUMBER", "Asset Number");
case "Left Front of Asset":
return GetTextByKey("P_XXXX", "Left Front of Asset");
return GetTextByKey("P_MD_LEFTFRONTOFASSET", "Left Front of Asset");
case "Right Rear of Asset":
return GetTextByKey("P_XXXX", "Right Rear of Asset");
return GetTextByKey("P_MD_RIGHTFRONTOFASSET", "Right Rear of Asset");
case "VIN":
return GetTextByKey("P_XXXX", "VIN");
return GetTextByKey("P_MD_VIN", "VIN");
case "ESN of GPS Device":
return GetTextByKey("P_XXXX", "ESN of GPS Device");
return GetTextByKey("P_MD_ESNOFGPSDEVICE", "ESN of GPS Device");
default:
break;
}
@ -149,11 +149,11 @@ function showPairingAttachments(pairinglog, attas, type) {//0.device,1.asset
divinfo.append(logtab);
var logtr = $('<tr></tr>');
logtab.append(logtr);
var logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'Date Time:'));
var logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MD_DATETIME_COLON', 'Date Time:'));
logtr.append(logtd);
logtd = $('<td style="width:300px;"></td>').text(log.InstallTime_LocalStr);
logtr.append(logtd);
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'Installer:'));
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MD_INSTALLER_COLON', 'Installer:'));
logtr.append(logtd);
logtd = $('<td></td>').text(log.InstallerName);
logtr.append(logtd);
@ -161,21 +161,21 @@ function showPairingAttachments(pairinglog, attas, type) {//0.device,1.asset
logtr = $('<tr></tr>');
logtab.append(logtr);
if (type == 0) {
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'VIN:'));
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MD_VIN_COLON', 'VIN:'));
logtr.append(logtd);
logtd = $('<td></td>').text(log.AssetVIN);
logtr.append(logtd);
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'Asset Name:'));
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MD_ASSETNAME_COLON', 'Asset Name:'));
logtr.append(logtd);
logtd = $('<td></td>').text(log.AssetName);
logtr.append(logtd);
}
else {
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'Device SN:'));
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MA_DEVICESN_COLON', 'Device SN:'));
logtr.append(logtd);
logtd = $('<td></td>').text(log.SerialNumber);
logtr.append(logtd);
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_XXXX', 'Source:'));
logtd = $('<td class="label" style="width:130px;"></td>').text(GetTextByKey('P_MD_SOURCE_COLON', 'Source:'));
logtr.append(logtd);
logtd = $('<td></td>').text(log.SourceName);
logtr.append(logtd);
@ -183,25 +183,25 @@ function showPairingAttachments(pairinglog, attas, type) {//0.device,1.asset
logtr = $('<tr></tr>');
logtab.append(logtr);
logtd = $('<td class="label"></td>').text(GetTextByKey('P_XXXX', 'Engine Hours: '));
logtd = $('<td class="label"></td>').text(GetTextByKey('P_MD_ENGINEHOURS_COLON', 'Engine Hours: '));
logtr.append(logtd);
logtd = $('<td></td>').text(log.EngineHours < 0 ? '' : log.EngineHours.toLocaleString());
logtr.append(logtd);
logtd = $('<td class="label"></td>').text(GetTextByKey('P_XXXX', 'Odometer: '));
logtd = $('<td class="label"></td>').text(GetTextByKey('P_MD_ODOMETER_COLON', 'Odometer: '));
logtr.append(logtd);
logtd = $('<td></td>').text(log.Odometer < 0 ? '' : (log.Odometer.toLocaleString() + " " + log.OdometerUnit));
logtr.append(logtd);
logtr = $('<tr></tr>');
logtab.append(logtr);
logtd = $('<td class="label"></td>').text(GetTextByKey('P_XXXX', 'Mounting Location:'));
logtd = $('<td class="label"></td>').text(GetTextByKey('P_MD_MOUNTINGLOCATION_COLON', 'Mounting Location:'));
logtr.append(logtd);
logtd = $('<td colspan="3"></td>').text(log.MountionLocation);
logtr.append(logtd);
logtr = $('<tr></tr>');
logtab.append(logtr);
logtd = $('<td class="label"></td>').text(GetTextByKey('P_XXXX', 'Notes: '));
logtd = $('<td class="label"></td>').text(GetTextByKey('P_MD_NOTES_COLON', 'Notes: '));
logtr.append(logtd);
logtd = $('<td colspan="3"></td>').text(log.Notes);
logtr.append(logtd);

View File

@ -314,14 +314,14 @@ function DoMergeAsset(mergetype) {
if (mergetype === 0) {
mid = mergeassetid;
tomid = machineid;
alerttile = GetTextByKey("P_MA_XXXXX", 'Merge Asset');
msg = GetTextByKey("P_MA_XXXXXX", 'WARNING: The merge process will strictly hide the Orphaned Asset and re-assign telematic data sources to the Master Asset for future incoming data. Existing data within the platform will not be assigned to the Master Asset. Are you sure you want to proceed?');
alerttile = GetTextByKey("P_MA_MERGEASSET", 'Merge Asset');
msg = GetTextByKey("P_MA_MERGEASSETWARNING", 'WARNING: The merge process will strictly hide the Orphaned Asset and re-assign telematic data sources to the Master Asset for future incoming data. Existing data within the platform will not be assigned to the Master Asset. Are you sure you want to proceed?');
}
else if (mergetype === 1) {
mid = machineid;
tomid = mergeassetid;
alerttile = GetTextByKey("P_MA_XXXXX", 'Merge Asset');
msg = GetTextByKey("P_MA_XXXXXX", 'WARNING: The merge process will strictly hide the Orphaned Asset and re-assign telematic data sources to the Master Asset for future incoming data. Existing data within the platform will not be assigned to the Master Asset. Are you sure you want to proceed?');
alerttile = GetTextByKey("P_MA_MERGEASSET", 'Merge Asset');
msg = GetTextByKey("P_MA_MERGEASSETWARNING", 'WARNING: The merge process will strictly hide the Orphaned Asset and re-assign telematic data sources to the Master Asset for future incoming data. Existing data within the platform will not be assigned to the Master Asset. Are you sure you want to proceed?');
}
showConfirm(msg, alerttile, function (e) {
@ -353,8 +353,8 @@ function OnDeleteAsset() {
return;
var mid = machineid;
var alerttile = GetTextByKey("P_MA_XXXXX", 'Delete Asset');
var msg = GetTextByKey("P_MA_XXXXXX", 'WARNING: This will delete the Asset. Are you sure you want to proceed?');
var alerttile = GetTextByKey("P_MA_DELETEASSET", 'Delete Asset');
var msg = GetTextByKey("P_MA_DELETEASSETWARNING", 'WARNING: This will delete the Asset. Are you sure you want to proceed?');
showConfirm(msg, alerttile, function (e) {
DeleteAsset(mid);