Weird, but okay

merge-requests/203/head
Tag 2022-09-26 17:27:22 -07:00
rodzic d78e4b9c5d
commit 1cf679098a
5 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -319,7 +319,7 @@
</div> </div>
<div> <div>
<label><input type="checkbox" id="wantRR73" onchange="valuesChanged();" /> RR73 as CQ</label> <label><input type="checkbox" id="wantRRCQ" onchange="valuesChanged();" /> RR73 as CQ</label>
</div> </div>
<div> <div>
<label title="No Decodes Containing..."> <label title="No Decodes Containing...">

Wyświetl plik

@ -72,7 +72,7 @@ var g_defaultSettings = {
wantMinDB: false, wantMinDB: false,
wantMinFreq: false, wantMinFreq: false,
wantMaxFreq: false, wantMaxFreq: false,
wantRR73: false, wantRRCQ: false,
maxDT: 0.5, maxDT: 0.5,
minDb: -25, minDb: -25,
minFreq: 0, minFreq: 0,
@ -1046,7 +1046,7 @@ function valuesChanged()
g_rosterSettings.wantMinDB = wantMinDB.checked; g_rosterSettings.wantMinDB = wantMinDB.checked;
g_rosterSettings.wantMinFreq = wantMinFreq.checked; g_rosterSettings.wantMinFreq = wantMinFreq.checked;
g_rosterSettings.wantMaxFreq = wantMaxFreq.checked; g_rosterSettings.wantMaxFreq = wantMaxFreq.checked;
g_rosterSettings.wantRR73 = wantRR73.checked; g_rosterSettings.wantRRCQ = wantRRCQ.checked;
maxDTView.innerHTML = g_rosterSettings.maxDT = maxDT.value; maxDTView.innerHTML = g_rosterSettings.maxDT = maxDT.value;
minDbView.innerHTML = g_rosterSettings.minDb = minDb.value; minDbView.innerHTML = g_rosterSettings.minDb = minDb.value;
@ -2032,7 +2032,7 @@ function init()
wantMinDB.checked = g_rosterSettings.wantMinDB; wantMinDB.checked = g_rosterSettings.wantMinDB;
wantMinFreq.checked = g_rosterSettings.wantMinFreq; wantMinFreq.checked = g_rosterSettings.wantMinFreq;
wantMaxFreq.checked = g_rosterSettings.wantMaxFreq; wantMaxFreq.checked = g_rosterSettings.wantMaxFreq;
wantRR73.checked = g_rosterSettings.wantRR73; wantRRCQ.checked = g_rosterSettings.wantRRCQ;
maxDTView.innerHTML = maxDT.value = g_rosterSettings.maxDT; maxDTView.innerHTML = maxDT.value = g_rosterSettings.maxDT;
minDbView.innerHTML = minDb.value = g_rosterSettings.minDb; minDbView.innerHTML = minDb.value = g_rosterSettings.minDb;

Wyświetl plik

@ -62,7 +62,7 @@ function processRosterFiltering(callRoster, rosterSettings)
} }
if (g_rosterSettings.cqOnly == true) if (g_rosterSettings.cqOnly == true)
{ {
if (g_rosterSettings.wantRR73) if (g_rosterSettings.wantRRCQ)
{ {
if (callObj.RR73 == false && callObj.CQ == false) if (callObj.RR73 == false && callObj.CQ == false)
{ {

Wyświetl plik

@ -784,12 +784,12 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
callingBg = "#0000FF" + inversionAlpha; callingBg = "#0000FF" + inversionAlpha;
calling = "#FFFF00;text-shadow: 0px 0px 2px #FFFF00"; calling = "#FFFF00;text-shadow: 0px 0px 2px #FFFF00";
} }
else if ((callObj.CQ == true || (g_rosterSettings.wantRR73 && callObj.RR73 == true)) && !g_rosterSettings.cqOnly) else if ((callObj.CQ == true || (g_rosterSettings.wantRRCQ && callObj.RR73 == true)) && !g_rosterSettings.cqOnly)
{ {
callingBg = calling + inversionAlpha; callingBg = calling + inversionAlpha;
calling = bold; calling = bold;
// If treating RR73/73 as CQ, soften highlighting to help differentiate foreshadow from an actual CQ // If treating RR73/73 as CQ, soften highlighting to help differentiate foreshadow from an actual CQ
if (g_rosterSettings.wantRR73 && callObj.RR73 == true) if (g_rosterSettings.wantRRCQ && callObj.RR73 == true)
{ {
callingConf = `${unconf}#90EE90${inversionAlpha};`; callingConf = `${unconf}#90EE90${inversionAlpha};`;
calling = `#90EE90${inversionAlpha};` calling = `#90EE90${inversionAlpha};`

Wyświetl plik

@ -104,7 +104,7 @@ const ROSTER_COLUMNS = {
tableData: (callObj) => ({ tableData: (callObj) => ({
rawAttrs: callObj.style.calling, rawAttrs: callObj.style.calling,
name: callObj.CQ ? "CQ" : "Calling", name: callObj.CQ ? "CQ" : "Calling",
html: (g_rosterSettings.wantRR73 && callObj.RR73) ? "RR73" : callObj.DXcall.formatCallsign() html: (g_rosterSettings.wantRRCQ && callObj.RR73) ? "RR73" : callObj.DXcall.formatCallsign()
}) })
}, },