Bugfixing

html/index.html

@@ -94,7 +94,7 @@
 			<div class="tab-pane fade" id="lastheard" role="tabpanel" aria-labelledby="lastheard-tab">
 				<div class="panel panel-default">
 					<!-- Standard-Panel-Inhalt -->
-					<div class="panel-heading">Last Heard List of today's callsigns.<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
+					<div class="panel-heading">Last Heard List<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
 					<div class="panel-body">
 						<!-- Tabelle -->
 						<div class="table-responsive">
@@ -122,7 +122,7 @@
 			<div class="tab-pane fade" id="localheard" role="tabpanel" aria-labelledby="localheard-tab">
 				<div class="panel panel-default">
 					<!-- Standard-Panel-Inhalt -->
-					<div class="panel-heading">Local Heard List of today<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
+					<div class="panel-heading">Local Heard List<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
 					<div class="panel-body">
 						<!-- Tabelle -->
 						<div class="table-responsive">
@@ -149,7 +149,7 @@
 			<div class="tab-pane fade" id="allheard" role="tabpanel" aria-labelledby="allheard-tab">
 				<div class="panel panel-default">
 					<!-- Standard-Panel-Inhalt -->
-					<div class="panel-heading">ALl Heard List<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
+					<div class="panel-heading">All Heard List<span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
 					<div class="panel-body">
 						<!-- Tabelle -->
 						<div class="table-responsive">

html/js/config.js

@@ -2,7 +2,7 @@
 var qrz = 1;
 
 // 1 = enable debug in javascript-console, 0 = 0ff
-var debug = 1;
+var debug = 0;
 
 // Set messagecounters for different badge-colors
 var warnlevel = 200;

html/js/functions.js

@@ -59,6 +59,8 @@ function inDashboardBlacklist(logline) {
 	name = "";
 	if (callsign.indexOf("$") > 0) {
 		name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+		if (name == "$")
+			name = "";
 		callsign = callsign.substring(0, callsign.indexOf("$"));
 	}
 	return dashboard_blacklist.includes(callsign);
@@ -119,9 +121,9 @@ function getCallsign(logline) {
 
 function getRawTarget(logline) {
 	if(logline.indexOf(" at ") > 0 && logline.indexOf("late entry") < 0 ) {
-		return logline.substring(logline.indexOf("to") + 3, logline.lastIndexOf(" at ") + 1);
+		return logline.substring(logline.indexOf(" to ") + 4, logline.lastIndexOf(" at ") + 1);
 	} else {
-		val = logline.substring(logline.indexOf("to") + 3);
+		val = logline.substring(logline.indexOf(" to ") + 4);
 		if (val.indexOf(",") > 0) {
 			val = val.substring(0, val.indexOf(","));
 		}
@@ -141,6 +143,8 @@ function getTarget(logline) {
 			name = "";
 			if (target.indexOf("$") > 0) {
 				name = target.substring(target.indexOf("$") + 1, target.lastIndexOf("$"));
+				if (name == "$")
+					name = "";
 				target = target.substring(0, target.indexOf("$"));
 			}
 			if (qrz == 1 && isNaN(target) && !qrz_blacklist.includes(target)) {
@@ -231,7 +235,18 @@ function getBER(logline) {
 
 function getAddToQSO(logline) {
 	callsign = logline.substring(logline.indexOf("from") + 5, logline.indexOf("to")).trim();
-	retval = '<div class="bd-clipboard"><button type="button" class="btn-cpQSO" title="Copy to QSO" id="' + callsign + '" onclick="copyToQSO(\'' + callsign + '\')">Copy</button></div>';
+	name = "";
+	if (callsign.indexOf("$") > 0) {
+		name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+		if (name == "$")
+			name = "";
+		callsign = callsign.substring(0, callsign.indexOf("$"));
+	}
+	if (name == "" ) {
+		retval = '<div class="bd-clipboard"><button type="button" class="btn-cpQSO" title="Copy to QSO" id="' + callsign + '" onclick="copyToQSO(\'' + callsign + '\')">Copy</button></div>';
+	} else {
+		retval = '<div class="bd-clipboard"><button type="button" class="btn-cpQSO" title="Copy to QSO" id="' + callsign + ' - ' + name + '" onclick="copyToQSO(\'' + callsign + ' - ' + name + '\')">Copy</button></div>';
+	}
 	return retval;
 }
 
@@ -318,6 +333,8 @@ function getCallsign(logline) {
 	name = "";
 	if (callsign.indexOf("$") > 0) {
 		name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+		if (name == "$")
+			name = "";
 		callsign = callsign.substring(0, callsign.indexOf("$"));
 	}
 	if (qrz == 1 && isNaN(callsign) && !qrz_blacklist.includes(callsign)) {
@@ -339,20 +356,48 @@ function getCurrentTXing() {
 	ts1 = null;
 	ts2 = null;
 	if (ts1TXing != null) {
+		matchstring = "";
 		ts1 = ts1TXing.split(";");
 		ts1[4] = Math.round((Date.now() - Date.parse(ts1timestamp.replace(" ","T")+".000Z"))/1000);
 		t_qso.rows( function ( idx, data, node ) {
-			if(data[0] == ts1[1]){
+			callsign = ts1[1];
+			name = "";
+			if (callsign.indexOf("$") > 0) {
+				name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+				if (name == "$")
+					name = "";
+				callsign = callsign.substring(0, callsign.indexOf("$"));
+			}
+			if (name == "" ) {
+				matchstring = callsign;
+			} else {
+				matchstring = callsign + ' - ' + name;
+			}
+			if(data[0] == matchstring){
 				data[2] = getLocaltimeFromTimestamp(ts1timestamp);
 				$('#inQSO').dataTable().fnUpdate(data,idx,undefined,false);
 			}
 		}).draw(false);
 	}
 	if (ts2TXing != null) {
+		matchstring = "";
 		ts2 = ts2TXing.split(";");
 		ts2[4] = Math.round((Date.now() - Date.parse(ts2timestamp.replace(" ","T")+".000Z"))/1000);
 		t_qso.rows( function ( idx, data, node ) {
-			if(data[0] == ts2[1]){
+						callsign = ts2[1];
+			name = "";
+			if (callsign.indexOf("$") > 0) {
+				name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+				if (name == "$")
+					name = "";
+				callsign = callsign.substring(0, callsign.indexOf("$"));
+			}
+			if (name == "" ) {
+				matchstring = callsign;
+			} else {
+				matchstring = callsign + ' - ' + name;
+			}
+			if(data[0] == matchstring){
 				data[2] = getLocaltimeFromTimestamp(ts2timestamp);
 				$('#inQSO').dataTable().fnUpdate(data,idx,undefined,false);
 			}
@@ -364,7 +409,9 @@ function getCurrentTXing() {
 		name = "";
 		if (callsign.indexOf("$") > 0) {
 			name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
-			callsign = callsign.substring(0, callsign.indexOf("$"));
+			if (name == "$")
+				name = "";
+		callsign = callsign.substring(0, callsign.indexOf("$"));
 		}
 		if (qrz == 1 && isNaN(callsign) && !qrz_blacklist.includes(callsign)) {
 			if (name != "") {
@@ -392,6 +439,8 @@ function getCurrentTXing() {
 		name = "";
 		if (callsign.indexOf("$") > 0) {
 			name = callsign.substring(callsign.indexOf("$") + 1, callsign.lastIndexOf("$"));
+			if (name == "$")
+				name = "";
 			callsign = callsign.substring(0, callsign.indexOf("$"));
 		}
 		if (qrz == 1 && isNaN(callsign) && !qrz_blacklist.includes(callsign)) {
@@ -569,13 +618,6 @@ function getLastHeard(document, event) {
 					}
 					if (rowIndexes[0]) {
 						var row = t_lh.row(rowIndexes[0]).node();
-						/*
-						if (txing) {
-							$(row).addClass('red');
-						} else {
-							$(row).removeClass('red');
-						}
-						*/
 						var temp = t_lh.row(rowIndexes[0]).data();
 						logIt("Temp: "+ temp);
 						logIt("Duration: " + duration);

html/js/version.js

@@ -1 +1 @@
-var dashboard_version = "2021-02-07 21:49:21";
+var dashboard_version = "2021-02-08 20:53:38";