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

Solving "empty line in LH" (first throw)

Browse source
This commit is contained in:
Kim Huebel 2021-01-03 17:03:06 +00:00
parent ff19ca888b
commit 2e03c3ae3e
2 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
html/index.html
View file

@ -105,7 +105,7 @@
<th>QSO</th>
</tr>
</thead>
<tr>
<!--<tr>
<td></td>
<td></td>
<td></td>
@ -115,7 +115,7 @@
<td></td>
<td></td>
<td></td>
</tr>
</tr>-->
</table>
</div>
</div>

30
html/js/functions.js
View file

@ -307,6 +307,7 @@ function getLastHeard(document, event) {
// I: 2020-12-03 20:07:45.973 TX Frequency: 439812500Hz
$(document).ready(function() {
lines = event.data.split("\n");
var duration = 0;
lines.forEach(function(line, index, array) {
logIt(line);
@ -365,8 +366,11 @@ function getLastHeard(document, event) {
} else {
ts2TXing = null;
}
txing = false;
if (line.indexOf("network watchdog") > 0) {
logIt("Network Watchdog!");
var rowIndexes = [];
t_lh.rows( function ( idx, data, node ) {
if (getMode(line) == "DMR Slot 1" ) {
@ -380,11 +384,10 @@ function getLastHeard(document, event) {
}
}
});
var duration = 0;
if (getMode(line) == "DMR Slot 1" ) {
duration = Math.round((Date.now() - Date.parse(ts1timestamp.replace(" ","T")+".000Z"))/1000);
duration = Math.round(Date.parse(getRawTimestamp(line).replace(" ","T")+".000Z")/1000 - Date.parse(ts1timestamp.replace(" ","T")+".000Z")/1000);
} else {
duration = Math.round((Date.now() - Date.parse(ts2timestamp.replace(" ","T")+".000Z"))/1000);
duration = Math.round(Date.parse(getRawTimestamp(line).replace(" ","T")+".000Z")/1000 - Date.parse(ts2timestamp.replace(" ","T")+".000Z")/1000);
}
if (rowIndexes[0]) {
if (t_lh.row(rowIndexes[0]).data[0] != null) {
@ -399,7 +402,7 @@ function getLastHeard(document, event) {
"",
getAddToQSO(line)
]
t_lh.row(rowIndexes[0]).data( newData ).draw(false);
$('#lastHeard').dataTable().fnUpdate(newData,t_lh.data().rowIndexes[0],undefined,false);
} else {
logIt("Problem replacing watchdog! Indices: " + rowIndexes);
t_lh.row(rowIndexes[0]).remove().draw(false);
@ -411,7 +414,7 @@ function getLastHeard(document, event) {
logIt("TS2: " + ts2TXing + "|" + ts2timestamp);
getCurrentTXing();
if (line.indexOf("network watchdog") < 0) {
if (line.indexOf("network watchdog") < 0 ) {
var rowIndexes = [],
timestamp = getTimestamp(line),
mode = getMode(line),
@ -456,12 +459,6 @@ function getLastHeard(document, event) {
addToQSO
]
t_lh.row(rowIndexes[0]).data( newData ).draw(false);
var row = t_lh.row(rowIndexes[0]).node();
if (txing) {
$(row).addClass('red');
} else {
$(row).removeClass('red');
}
} else {
t_lh.row.add( [
timestamp,
@ -476,6 +473,17 @@ function getLastHeard(document, event) {
] ).draw(false);
}
}
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();
temp[5] = duration;
$('#lastHeard').dataTable().fnUpdate(temp,rowIndexes[0],undefined,false);
}
}
});
});