From 440e3eb9225c1907a3a085647647398af66e8652 Mon Sep 17 00:00:00 2001 From: John Hays Date: Sat, 24 Feb 2024 12:46:15 -0800 Subject: [PATCH] Updated timestamps to local time --- client/script.js | 12 +++++++++--- index.js | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/client/script.js b/client/script.js index f14428b..e8f5bc7 100644 --- a/client/script.js +++ b/client/script.js @@ -28,16 +28,18 @@ socket.addEventListener("title", data => { socket.addEventListener("links", data => { // console.log("links " + data); + $("#links").empty(); $("#links").append(""); $("#linktable").append("" + ""); $.each(data, function(index,val){ + const utcDate = new Date(val.timestamp); var reflector = val.reflector.substring(0,7).trim(); if (reflector.substring(0,3) == "REF") reflector = "" + val.reflector + ""; $("#linktable").append(""); + val.direction + ""); // console.log(index, val); }); }); @@ -60,9 +62,12 @@ socket.addEventListener("lastheard", data => { // console.log("lastheard " + data); $("#lastheard").empty(); $("#lastheard").append("
Links
RepeaterReflectorProtocolDeviceDirectionTimestamp
" + val.repeater + "" + reflector + "" + val.protocol + "" + val.device + "" + - val.direction + "" + val.timestamp + "
" + utcDate.toLocaleString() + "
"); - $("#lhtable").append(""); + $("#lhtable").append(""); $.each(data, function(index,val){ // console.log(index, val); + const utcDate = val.date.trim() + 'T' + val.time.trim() + 'Z'; + const udate = new Date(utcDate); + const ldate = udate.toLocaleString(); var mcall = "" + val.mycall + ""; if (val.msg1 != "") mcall += " / " + val.msg1; var rpt1 = val.rpt1.substring(0,7).trim(); @@ -79,6 +84,7 @@ socket.addEventListener("lastheard", data => { } $("#lhtable").append(""); + "" + + ""); }) }); diff --git a/index.js b/index.js index 0c71092..a890ef9 100644 --- a/index.js +++ b/index.js @@ -86,7 +86,7 @@ function updatelinks() { if(lines[i] != "") { var mylinks = lines[i].match(linksregex); // console.log(JSON.stringify(lines[i])); - var linkrec = {'timestamp':mylinks[1].substr(0,19) , 'protocol':mylinks[2] , 'device':mylinks[4], + var linkrec = {'timestamp':mylinks[1].substr(0,19)+'Z' , 'protocol':mylinks[2] , 'device':mylinks[4], 'repeater':mylinks[5] , 'reflector':mylinks[6] , 'direction' : mylinks[7] }; linklist.push(linkrec); }
Last Heard
MYcallURcallRpt1Rpt2SourceDateTime
MYcallURcallRpt1Rpt2SourceDateTimeLocal
" + mcall + ""+ val.urcall + "" + rpt1 + "" + rpt2 + - "" + val.source + "" + val.date + "" + val.time + "
" + val.source + "" + val.date + "" + val.time + "" + ldate +"