mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'sd-unknown-dxcc' into 'master' 

Display QRX from unknown DXCC entities

See merge request gridtracker.org/gridtracker!230

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
merge-requests/231/merge
T Loomis 2022-10-15 18:14:37 +00:00
rodzic 4b5a6dd4bb afdd145880
commit cc928f7114
2 zmienionych plików z 8 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
package.nw/lib/roster/processRosterFiltering.js
Wyświetl plik

@ -22,7 +22,7 @@ function processRosterFiltering(callRoster, rosterSettings)
callObj.reset = true;
continue;
}
if (!callObj.dxcc || callObj.dxcc == -1)
if (!callObj.dxcc)
{
entry.tx = false;
continue;
@ -238,12 +238,6 @@ function processRosterFiltering(callRoster, rosterSettings)
continue;
}
if (callObj.dxcc === -1)
{
entry.tx = false;
continue;
}
if (g_rosterSettings.hunting == "dxccs" && r_currentDXCCs != -1)
{
if (callObj.dxcc != r_currentDXCCs)

14
package.nw/lib/roster/processRosterHunting.js
Wyświetl plik

@ -44,7 +44,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
}
// Only render entries with `tx == true`, ignore the rest
if (callObj.dxcc != -1 && entry.tx == true)
if (entry.tx == true)
{
// In layered mode ("Hunting: mixed") the workHashSuffix becomes a more stricter 'live band',
// while the layered suffix is a broader 'mixed band'
@ -96,7 +96,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
"";
let cntyPointer = (callObj.cnty && callObj.qual == false) ? "cursor: pointer;" : "";
let hash = callsign + workHashSuffix;
let layeredHash = layeredHashSuffix && (callsign + layeredHashSuffix)
@ -294,7 +294,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
}
// Hunting for DXCC
if (huntDXCC.checked)
if (huntDXCC.checked && callObj.dxcc && callObj.dxcc > 0)
{
let hash = String(callObj.dxcc) + "|" + workHashSuffix;
let layeredHash = rosterSettings.layeredMode && (String(callObj.dxcc) + "|" + layeredHashSuffix)
@ -493,7 +493,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
{
shouldAlert = true;
callObj.reason.push("pota");
callObj.hunting.pota = "hunted";
potaBg = `${pota}${inversionAlpha};`;
pota = bold;
@ -518,7 +518,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
if (rosterSettings.huntIndex && marathonHash in rosterSettings.huntIndex.cqz) marathonFound++;
else if (rosterSettings.workedIndex && marathonHash in rosterSettings.workedIndex.cqz) marathonFound++;
}
if (huntFound != huntTotal)
{
shouldAlert = true;
@ -591,7 +591,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
if (rosterSettings.layeredMode && layeredHash in rosterSettings.huntIndex.ituz) layeredFound++;
if (rosterSettings.workedIndex && hash in rosterSettings.workedIndex.ituz) workedFound++;
if (rosterSettings.layeredMode && layeredHash in rosterSettings.workedIndex.ituz) layeredWorkedFound++;
if (huntFound != huntTotal)
{
shouldAlert = true;
@ -773,7 +773,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
if (didWork && shouldAlert) shouldAlert = false;
// callObj.shouldAlert ||= shouldAlert; // eslint doesn't like this, why?
// If alert was set (award tracker), don't clear it
if (!callObj.shouldAlert)
{