Merge branch 'sd-rr73' into 'dev-test'

Resolve "Call Roster - CQ highlighting - RR73 / 73"

See merge request gridtracker.org/gridtracker!175

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
settings-file-dialogs test_POTAWanted_Beta5
Matthew Chambers 2022-07-23 14:10:20 +00:00
commit 58540c6cff
2 zmienionych plików z 12 dodań i 4 usunięć

Wyświetl plik

@ -6957,7 +6957,6 @@ function handleWsjtxDecode(newMessage)
theTimeStamp = theTimeStamp =
timeNowSec() - (timeNowSec() % 86400) + parseInt(newMessage.TM / 1000); timeNowSec() - (timeNowSec() % 86400) + parseInt(newMessage.TM / 1000);
var messageColor = "white"; var messageColor = "white";
if (CQ == true) messageColor = "cyan";
// Break up the decoded message // Break up the decoded message
var decodeWords = newMessage.Msg.split(" ").slice(0, 5); var decodeWords = newMessage.Msg.split(" ").slice(0, 5);
@ -7003,6 +7002,7 @@ function handleWsjtxDecode(newMessage)
CQ = true; CQ = true;
msgDXcallsign = "CQ"; msgDXcallsign = "CQ";
} }
if (decodeWords.length == 4 && CQ == true) if (decodeWords.length == 4 && CQ == true)
{ {
msgDXcallsign += " " + decodeWords[1]; msgDXcallsign += " " + decodeWords[1];
@ -7023,6 +7023,12 @@ function handleWsjtxDecode(newMessage)
msgDEcallsign = decodeWords[1]; msgDEcallsign = decodeWords[1];
} }
if (decodeWords[2] == "RR73")
{
CQ = true;
msgDXcallsign = "RR73";
}
var callsign = null; var callsign = null;
var hash = msgDEcallsign + newMessage.OB + newMessage.OM; var hash = msgDEcallsign + newMessage.OB + newMessage.OM;
@ -7222,7 +7228,7 @@ function handleWsjtxDecode(newMessage)
} }
} }
if (callsign.pota == null && g_potaSpots.some(item => item.activator === callsign.DEcall)) if (callsign.pota == null && g_potaSpots && g_potaSpots.some(item => item.activator === callsign.DEcall))
{ {
callsign.pota = g_potaSpots.filter(item => item.activator === callsign.DEcall)[0]; callsign.pota = g_potaSpots.filter(item => item.activator === callsign.DEcall)[0];
} }

Wyświetl plik

@ -50,8 +50,10 @@ function processRosterFiltering(callRoster, rosterSettings)
entry.tx = true; entry.tx = true;
if (callObj.pota == null) if (callObj.pota == null)
{ {
callObj.pota.reference = "?-????"; callObj.pota = {
callObj.pota.name = "Unknown Park"; reference: "?-????",
name: "Unknown Park"
}
} }
continue; continue;
} }