dominic/MMDVMHost-Websocketboard
1
0
Fork 0
Code Releases Activity

Trying to fix https://github.com/dg9vh/MMDVMHost-Websocketboard/issues/26

Browse source
This commit is contained in:
Kim Huebel 2021-04-28 18:39:52 +01:00
parent 9325017ff9
commit 2a24eaf807
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
html/js/functions.js
View file

@ -220,7 +220,9 @@ function resolveTarget(mode, timeslot, target) {
default: default:
break; break;
} }
if (retval.length > 0) { //if (retval.length > 0) {
if (retval != null && retval != "") {
logIt("Retval: " + retval);
if (retval[0][4] != "") { if (retval[0][4] != "") {
return '<a target="_new" href="'+retval[0][4]+'">'+retval[0][3]+'</a>'; return '<a target="_new" href="'+retval[0][4]+'">'+retval[0][3]+'</a>';
} else { } else {
@ -274,6 +276,7 @@ function getTarget(logline) {
} }
} else { } else {
retval = '<div class=\"tooltip2\">' + resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target) + '<span class=\"tooltip2text\">Origin:<br>' + target + '</span></div>'; retval = '<div class=\"tooltip2\">' + resolveTarget(getMode(logline), getTimeslot(getMode(logline)), target) + '<span class=\"tooltip2text\">Origin:<br>' + target + '</span></div>';
if (getMode(logline) == "YSF" && logline.indexOf(" at ") > 0) { if (getMode(logline) == "YSF" && logline.indexOf(" at ") > 0) {
via = logline.substr(logline.indexOf(" at ") + 4); via = logline.substr(logline.indexOf(" at ") + 4);
if (via.indexOf("$") > 0) { if (via.indexOf("$") > 0) {
@ -696,7 +699,12 @@ function getLastHeard(document, event) {
logIt("TS2: " + ts2TXing + "|" + ts2timestamp); logIt("TS2: " + ts2TXing + "|" + ts2timestamp);
getCurrentTXing(); getCurrentTXing();
if (line.indexOf("network watchdog") < 0 ) { if (line.indexOf("network watchdog") < 0 ) {
ts1tmp = [];
ts2tmp = []; ts2tmp = [];
if (ts1TXing != null) {
matchstring = "";
ts1tmp = ts1TXing.split(";");
}
if (ts2TXing != null) { if (ts2TXing != null) {
matchstring = ""; matchstring = "";
ts2tmp = ts2TXing.split(";"); ts2tmp = ts2TXing.split(";");
@ -706,12 +714,17 @@ function getLastHeard(document, event) {
timestamp = getTimestamp(line), timestamp = getTimestamp(line),
mode = getMode(line), mode = getMode(line),
callsign = getCallsign(line), callsign = getCallsign(line),
target = ts2tmp[2], target = "",
source = getSource(line), source = getSource(line),
duration = getDuration(line), duration = getDuration(line),
loss = getLoss(line), loss = getLoss(line),
ber = getBER(line), ber = getBER(line),
addToQSO = getAddToQSO(line); addToQSO = getAddToQSO(line);
if (getMode(line) == "DMR Slot 1" ) {
target = ts1tmp[2];
} else {
target = ts2tmp[2];
}
if (txing) { if (txing) {
duration = "TXing"; duration = "TXing";
loss = ""; loss = "";

2
html/js/version.js
View file

@ -1 +1 @@
var dashboard_version = "2021-04-26 21:09:52"; var dashboard_version = "2021-04-28 18:39:52";