Skip to content

fix time issues #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukePrior merged 1 commit into from
Jul 24, 2021
Merged

fix time issues #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,8 @@ function updateVehicleInfo(vcallsign, newPosition) {
callsign_list = callsign_list.join(", ");
}

var timeNow = new Date();

//desktop
var a = '<div class="header">' +
'<span>' + sonde_type + vcallsign + ' <i class="icon-target"></i></span>' +
Expand Down Expand Up @@ -1256,7 +1258,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
'</div>' + // right
'</div>' + // data
'';
var c = '<dt class="receivers">Received <i class="friendly-dtime" data-timestamp='+(convert_time(newPosition.server_time))+'></i> via:</dt><dd class="receivers">' +
var c = '<dt class="receivers">Received <i class="friendly-dtime" data-timestamp='+timeNow.getTime()+'></i> via:</dt><dd class="receivers">' +
callsign_list + '</dd>';

if(!newPosition.callsign) c = '';
Expand Down Expand Up @@ -3353,6 +3355,16 @@ function update(response, flag) {
}
}

if (typeof flag == 'undefined') {
for (var i = response.positions.position.length - 1; i >= 0; i--) {
try {
if (response.positions.position[i].vehicle == ajax_single_serial) {
response.positions.position.splice(i, 1)
}
} catch (e) {}
}
}

ssdv = (!response.ssdv) ? {} : response.ssdv;

// create a dummy response object for postions
Expand All @@ -3379,7 +3391,9 @@ function update(response, flag) {
this_position_id.setMilliseconds(0)

if (new Date(position_id) < this_position_id || position_id == 0){
position_id = this_position_id.toISOString()
if (new Date() > this_position_id) {
position_id = this_position_id.toISOString()
}
}

if (!row.picture) {
Expand Down