Merge remote-tracking branch 'int/dev' into dev

This commit is contained in:
2025-04-11 14:45:44 +02:00
2 changed files with 45 additions and 51 deletions

View File

@@ -47,6 +47,9 @@
</table>
<script type="text/javascript">
(function() {
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
const filter = urlParams.get('call') || '';
const tableBody = document.getElementById('messagesTable').querySelector('tbody');
var lines = 0;
var buffer = $('#mqtt');
@@ -55,9 +58,7 @@
console.log('Connected to:', socket.host);
});
socket.on('mqtt', function(message) {
try {
showit=JSON.stringify(message);
} catch {};
if ((filter == '') || (filter == message.station_call)) {
const row = document.createElement('tr');
const timestampCell = document.createElement('td');
const CellCall = document.createElement('td');
@@ -96,16 +97,9 @@
setTimeout(() => {
row.classList.remove('new-row');
}, 1500);
}
});
/*
$( "#i_topic" ).change(function() {
socket.emit("wishtopic",this.value);
$('#mqtt').empty();
});
*/
})();
function tsclean(timestamp) {
const parts = timestamp.split(':');

View File

@@ -56,7 +56,7 @@ mqttC.on('message', function (topic, message) { // Handler, wenn mqtt-message ko
} else {
tobrowser=parse_cat_msg(topic,msg.content);
// io.emit("cat",tobrowser); // und raus an den Browser (nur fuer DIESES Socket, nicht fuer alle Clients) damit
console.log(topic+' / CAT for User '+tobrowser.user_id+' at '+tobrowser.qrg+' in Mode '+tobrowser.mode);
console.log(topic+' / CAT for User '+tobrowser.user_id+' ('+msg.content.user_name+') at '+tobrowser.qrg+' in Mode '+tobrowser.mode);
}
} else {
console.log(msg.content.user_name+' not in Whitelist');