|
|
@ -29,8 +29,9 @@ function timestampToDateTimeString(timestamp) {
|
|
|
|
|
|
|
|
|
|
|
|
var pm = date.getHours() >= 12;
|
|
|
|
var pm = date.getHours() >= 12;
|
|
|
|
var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
|
|
|
|
var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
|
|
|
|
|
|
|
|
hours = (hours == 0 ? 12 : hours);
|
|
|
|
var minutes = date.getMinutes();
|
|
|
|
var minutes = date.getMinutes();
|
|
|
|
var time = hours + ":" + minutes + " " + (pm ? "PM" : "AM");
|
|
|
|
var time = hours + ":" + (minutes < 10 ? "0" + minutes : minutes) + " " + (pm ? "PM" : "AM");
|
|
|
|
|
|
|
|
|
|
|
|
return date.toLocaleDateString() + " " + time;
|
|
|
|
return date.toLocaleDateString() + " " + time;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -79,6 +80,8 @@ function openTrackingHistory(trackingcode) {
|
|
|
|
infocontext.current.location.display = locationArrayToString(infocontext.current.location);
|
|
|
|
infocontext.current.location.display = locationArrayToString(infocontext.current.location);
|
|
|
|
infocontext.current.date = timestampToDateTimeString(infocontext.current.date);
|
|
|
|
infocontext.current.date = timestampToDateTimeString(infocontext.current.date);
|
|
|
|
infocontext.current.status = trackingStatusToNiceString(infocontext.current.status, true);
|
|
|
|
infocontext.current.status = trackingStatusToNiceString(infocontext.current.status, true);
|
|
|
|
|
|
|
|
infocontext.addresses.from = locationArrayToString(infocontext.addresses.from);
|
|
|
|
|
|
|
|
infocontext.addresses.to = locationArrayToString(infocontext.addresses.to);
|
|
|
|
|
|
|
|
|
|
|
|
for (var i = 0; i < infocontext.history.length; i++) {
|
|
|
|
for (var i = 0; i < infocontext.history.length; i++) {
|
|
|
|
infocontext.history[i].location.display = locationArrayToString(infocontext.history[i].location);
|
|
|
|
infocontext.history[i].location.display = locationArrayToString(infocontext.history[i].location);
|
|
|
|