Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remember selected callsign when changing filter

Browse source
This commit is contained in:
Mashintime 2023-02-24 20:00:34 -05:00
parent 8b33544bdd
commit bfb2543c05
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gui/preload-chat.js
View file

@ -761,7 +761,8 @@ update_chat = function (obj) {
if (!document.getElementById("chat-" + dxcallsign + "-list")) { if (!document.getElementById("chat-" + dxcallsign + "-list")) {
// increment callsign counter // increment callsign counter
callsign_counter++; callsign_counter++;
if (callsign_counter == 1) { dxcallsigns.add(dxcallsign);
if ((callsign_counter == 1 && selected_callsign=="") || selected_callsign == dxcallsign ) {
var callsign_selected = "active show"; var callsign_selected = "active show";
//document.getElementById('chatModuleDxCall').value = dxcallsign; //document.getElementById('chatModuleDxCall').value = dxcallsign;
selected_callsign = dxcallsign; selected_callsign = dxcallsign;
@ -1481,14 +1482,14 @@ function createUserIndex() {
}); });
} }
function updateAllChat(clear) { async function updateAllChat(clear) {
if (clear == true) { if (clear == true) {
filetype = ""; filetype = "";
file = ""; file = "";
filename = ""; filename = "";
callsign_counter = 0; callsign_counter = 0;
selected_callsign = ""; //selected_callsign = "";
dxcallsigns = new Set(); dxcallsigns.clear();
document.getElementById("list-tab").innerHTML = ""; document.getElementById("list-tab").innerHTML = "";
document.getElementById("nav-tabContent").innerHTML = ""; document.getElementById("nav-tabContent").innerHTML = "";
//document.getElementById("list-tab").childNodes.remove(); //document.getElementById("list-tab").childNodes.remove();
@ -1496,14 +1497,14 @@ function updateAllChat(clear) {
} }
//Ensure we create an index before running db.find //Ensure we create an index before running db.find
//We can't rely on the default index existing before we get here...... :'( //We can't rely on the default index existing before we get here...... :'(
db.createIndex({ await db.createIndex({
index: { index: {
fields: [{ timestamp: "asc" }], fields: [{ timestamp: "asc" }],
}, },
}) })
.then(function (result) { .then(async function (result) {
// handle result // handle result
db.find({ await db.find({
selector: { selector: {
$and: [{ timestamp: { $exists: true } }, { $or: chatFilter }], $and: [{ timestamp: { $exists: true } }, { $or: chatFilter }],
//$or: chatFilter //$or: chatFilter
@ -1536,4 +1537,12 @@ function updateAllChat(clear) {
.catch(function (err) { .catch(function (err) {
console.log(err); console.log(err);
}); });
if (clear == true && dxcallsigns.has(selected_callsign) == false) {
//Selected call sign is not visible, reset to first call sign
let tmp = dxcallsigns.entries().next().value[0];
selected_callsign=tmp;
document.getElementById("chat-" + tmp + "-list").classList.add("active","show");
document.getElementById("chat-" + tmp ).classList.add("active","show");
scrollMessagesToBottom();
}
} }