From 7d940ac5f4c0c663a76c80f4e78e3d9dd621f9b4 Mon Sep 17 00:00:00 2001
From: Kim Huebel <dg9vh@darc.de>
Date: Fri, 30 Apr 2021 11:27:21 +0100
Subject: [PATCH] Now fixed
 https://github.com/dg9vh/MMDVMHost-Websocketboard/issues/26 also for P25
 transmissions

---
 html/js/config.js    |  2 +-
 html/js/functions.js | 17 +++++++++++------
 html/js/version.js   |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/html/js/config.js b/html/js/config.js
index b8429c8..d088937 100644
--- a/html/js/config.js
+++ b/html/js/config.js
@@ -5,7 +5,7 @@ var config_struc_ver = 20210421.1;
 var qrz = 1;
 
 // 1 = enable debug in javascript-console, 0 = 0ff
-var debug = 0;
+var debug = 1;
 
 // Set messagecounters for different badge-colors
 var warnlevel = 200;
diff --git a/html/js/functions.js b/html/js/functions.js
index 5316e7e..bec2ebf 100644
--- a/html/js/functions.js
+++ b/html/js/functions.js
@@ -633,8 +633,8 @@ function getLastHeard(document, event) {
 		lines.forEach(function(line, index, array) {
 			if (!inDashboardBlacklist(line)) {
 				txing = false;
-				if (line.indexOf("Talker Alias") < 0 && line.indexOf("Downlink Activate") < 0 && line.indexOf("Preamble CSBK") < 0 && line.indexOf("data header") < 0 && line.indexOf("0000:") < 0 && line.length > 0 && (line.indexOf("received") > 0 || line.indexOf("network watchdog") > 0 || line.indexOf("transmission lost") > 0)) {
-					if (line.indexOf("received network data") > 0 || line.indexOf("late entry") > 0 || line.indexOf("voice header") > 0 || line.indexOf("network header") > 0 || line.indexOf("received RF header") > 0) {
+				if (line.indexOf("Talker Alias") < 0 && line.indexOf("Downlink Activate") < 0 && line.indexOf("Preamble CSBK") < 0 && line.indexOf("data header") < 0 && line.indexOf("0000:") < 0 && line.length > 0 && (line.indexOf("received") > 0 || line.indexOf("network watchdog") > 0 || line.indexOf("transmission lost") > 0 || line.indexOf("network end of transmission") > 0)) {
+					if (line.indexOf("received network data") > 0 || line.indexOf("late entry") > 0 || line.indexOf("voice header") > 0 || line.indexOf("network header") > 0 || line.indexOf("received RF header") > 0 || line.indexOf("received RF voice") > 0 || line.indexOf("received network transmission") > 0) {
 						txing = true;
 						if (getMode(line) == "DMR Slot 1" ) {
 							ts1TXing = getMode(line) + ";" + line.substring(line.indexOf("from") + 5, line.indexOf("to")).trim() + ";" + getTarget(line)  + ";" + getSource(line);
@@ -644,7 +644,7 @@ function getLastHeard(document, event) {
 							ts2timestamp = getRawTimestamp(line);
 						}
 					}
-					if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0 || line.indexOf("transmission lost") > 0 ) {
+					if (line.indexOf("network watchdog") > 0 || line.indexOf("end of voice transmission") > 0 || line.indexOf("end of transmission") > 0 || line.indexOf("transmission lost") > 0) {
 						txing = false;
 						if (line.indexOf("network watchdog") > 0) {
 							logIt("Network Watchdog!");
@@ -659,6 +659,7 @@ function getLastHeard(document, event) {
 									if(data[0] == getLocaltimeFromTimestamp(ts2timestamp)){
 										rowIndexes.push(idx);
 									}
+									return false;
 								}
 							});
 							if (getMode(line) == "DMR Slot 1" ) {
@@ -703,12 +704,12 @@ function getLastHeard(document, event) {
 						ts1tmp = [];
 						ts2tmp = [];
 						if (ts1TXing != null) {
-							matchstring = "";
 							ts1tmp = ts1TXing.split(";");
 						}
 						if (ts2TXing != null) {
-							matchstring = "";
 							ts2tmp = ts2TXing.split(";");
+							logIt("ts2tmp: " + ts2tmp);
+							logIt("ts2timestamp: " + ts2timestamp);
 						}
 
 						var rowIndexes = [],
@@ -726,6 +727,7 @@ function getLastHeard(document, event) {
 						} else {
 							target = ts2tmp[2];
 						}
+						logIt("TXing:" + txing);
 						if (txing) {
 							duration = "TXing";
 							loss = "";
@@ -747,11 +749,14 @@ function getLastHeard(document, event) {
 							addToQSO = "";
 						}
 						t_lh.rows( function ( idx, data, node ) {
-							if(data[2] == callsign){
+							//if(data[2] == callsign){
+							if(data[2].indexOf(callsign) > -1){
 								rowIndexes.push(idx);
 							}
 							return false;
 						});
+						
+						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 b46d1d1..ec955ed 100644
--- a/html/js/version.js
+++ b/html/js/version.js
@@ -1 +1 @@
-var dashboard_version = "2021-04-28 19:11:05";
+var dashboard_version = "2021-04-30 11:27:21";