From 7f2953de4e3bea2aaa9ad61938805e640bf84aab Mon Sep 17 00:00:00 2001 From: Kim Huebel Date: Sat, 1 May 2021 10:51:24 +0100 Subject: [PATCH] Fixing problem with transmissions ending without beginning :-) --- html/js/functions.js | 14 ++++++++++++-- html/js/version.js | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/html/js/functions.js b/html/js/functions.js index 3459138..b243175 100644 --- a/html/js/functions.js +++ b/html/js/functions.js @@ -5,6 +5,7 @@ var ts2TXing = null; var ts1timestamp = ""; var ts2timestamp = ""; var talkgroups = []; +var BreakException = {}; // Setting config-defaults if not set qrz = typeof(qrz) == 'undefined' ? 1 : qrz; debug = typeof(debug) == 'undefined' ? 0 : debug; @@ -221,7 +222,7 @@ function resolveTarget(mode, timeslot, target) { default: break; } - //if (retval.length > 0) { + if (retval != null && retval != "") { logIt("Retval: " + retval); if (retval[0][4] != "") { @@ -667,6 +668,11 @@ function getLastHeard(document, event) { return false; } }); + + if (rowIndexes.length == 0) { + throw BreakException; + } + if (getMode(line) == "DMR Slot 1" ) { duration = Math.round(Date.parse(getRawTimestamp(line).replace(" ","T")+".000Z")/1000 - Date.parse(ts1timestamp.replace(" ","T")+".000Z")/1000); } else { @@ -754,13 +760,17 @@ function getLastHeard(document, event) { addToQSO = ""; } t_lh.rows( function ( idx, data, node ) { - //if(data[2] == callsign){ if(data[2].indexOf(callsign) > -1){ rowIndexes.push(idx); } return false; }); + if (rowIndexes.length == 0 && line.indexOf(" end of transmission") > 0) { + logIt("Sende-Ende ohne Anfang!"); + throw BreakException; + } + logIt("RowIndexes: " + rowIndexes); if (rowIndexes[0] == "0") { t_lh.row(rowIndexes[0]).remove().draw(false); diff --git a/html/js/version.js b/html/js/version.js index ad52dc4..877a92f 100644 --- a/html/js/version.js +++ b/html/js/version.js @@ -1 +1 @@ -var dashboard_version = "2021-04-30 19:52:34"; +var dashboard_version = "2021-05-01 10:51:24";