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

Wanted Regex now working with "Only Wanted" and alerts properly

merge-requests/236/head
Tag 2022-10-16 10:46:41 -07:00
rodzic 8dbcf29c97
commit 4981d133f8
4 zmienionych plików z 45 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
package.nw/lib/callsigns.js
Wyświetl plik

@ -150,7 +150,7 @@ function lotwValuesChanged()
setAlertVisual();
goProcessRoster();
if (g_callRosterWindowHandle) g_callRosterWindowHandle.window.resize();
if (g_rosterInitialized) g_callRosterWindowHandle.window.resize();
}
function lotwDownload(fromSettings)
@ -272,7 +272,7 @@ function oqrsValuesChanged()
setAlertVisual();
goProcessRoster();
if (g_callRosterWindowHandle) g_callRosterWindowHandle.window.resize();
if (g_rosterInitialized) g_callRosterWindowHandle.window.resize();
}
function oqrsDownload(fromSettings)
@ -367,7 +367,7 @@ function eqslValuesChanged()
setAlertVisual();
goProcessRoster();
if (g_callRosterWindowHandle) g_callRosterWindowHandle.window.resize();
if (g_rosterInitialized) g_callRosterWindowHandle.window.resize();
}
function eqslDownload(fromSettings)
@ -531,7 +531,7 @@ function ulsValuesChanged()
ulsSettingsDisplay();
goProcessRoster();
if (g_callRosterWindowHandle) g_callRosterWindowHandle.window.resize();
if (g_rosterInitialized) g_callRosterWindowHandle.window.resize();
}
function ulsDownload()

39
package.nw/lib/gt.js
Wyświetl plik

@ -333,7 +333,7 @@ function saveAndCloseApp()
try
{
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
g_callRosterWindowHandle.window.writeRosterSettings();
}
@ -2618,19 +2618,22 @@ function openCallRosterWindow(show = true)
{
try
{
if (g_callRosterWindowHandle.window.g_isShowing == false)
if (g_rosterInitialized)
{
g_callRosterWindowHandle.show();
g_callRosterWindowHandle.window.g_isShowing = true;
g_callRosterWindowHandle.window.saveScreenSettings();
g_callRosterWindowHandle.focus();
goProcessRoster();
}
else
{
g_callRosterWindowHandle.window.g_isShowing = false;
g_callRosterWindowHandle.window.saveScreenSettings();
g_callRosterWindowHandle.hide();
if (g_callRosterWindowHandle.window.g_isShowing == false)
{
g_callRosterWindowHandle.show();
g_callRosterWindowHandle.window.g_isShowing = true;
g_callRosterWindowHandle.window.saveScreenSettings();
g_callRosterWindowHandle.focus();
goProcessRoster();
}
else
{
g_callRosterWindowHandle.window.g_isShowing = false;
g_callRosterWindowHandle.window.saveScreenSettings();
g_callRosterWindowHandle.hide();
}
}
}
catch (e) { }
@ -2639,7 +2642,7 @@ function openCallRosterWindow(show = true)
function updateRosterWorked()
{
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
try
{
@ -2651,7 +2654,7 @@ function updateRosterWorked()
function updateRosterInstances()
{
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
try
{
@ -6397,7 +6400,7 @@ function handleWsjtxStatus(newMessage)
{
if (g_ignoreMessages == 1) return;
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
try
{
@ -7584,7 +7587,7 @@ function goProcessRoster(isRealtime = false)
continue;
}
}
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
try
{
@ -16291,7 +16294,7 @@ function changeRosterTop(butt)
function setRosterTop()
{
if (g_callRosterWindowHandle && g_rosterInitialized)
if (g_rosterInitialized)
{
try
{

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

@ -2,12 +2,11 @@ function processRosterFiltering(callRoster, rosterSettings)
{
// First loop, exclude calls, mostly based on "Exceptions" settings
// this whole section is full of individual if's that could be broken out
for (let callHash in callRoster)
for (const callHash in callRoster)
{
let entry = callRoster[callHash];
let callObj = entry.callObj;
let call = entry.DEcall;
var entry = callRoster[callHash];
var callObj = entry.callObj;
var call = entry.DEcall;
entry.tx = true;
callObj.shouldAlert = false;
@ -164,7 +163,7 @@ function processRosterFiltering(callRoster, rosterSettings)
}
if (g_rosterSettings.maxLoTW < 27)
{
let months = (g_day - window.opener.g_lotwCallsigns[call]) / 30;
var months = (g_day - window.opener.g_lotwCallsigns[call]) / 30;
if (months > g_rosterSettings.maxLoTW)
{
entry.tx = false;
@ -199,7 +198,7 @@ function processRosterFiltering(callRoster, rosterSettings)
continue;
}
let hash = hashMaker(call, callObj, g_rosterSettings.reference);
var hash = hashMaker(call, callObj, g_rosterSettings.reference);
if (rosterSettings.callMode == "worked" && hash in g_worked.call)
{
entry.tx = false;
@ -213,7 +212,7 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "grid")
{
let hash = hashMaker(callObj.grid.substr(0, 4),
var hash = hashMaker(callObj.grid.substr(0, 4),
callObj, g_rosterSettings.reference);
if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.grid)
{
@ -229,7 +228,7 @@ function processRosterFiltering(callRoster, rosterSettings)
}
if (g_rosterSettings.hunting == "dxcc")
{
let hash = hashMaker(String(callObj.dxcc) + "|",
var hash = hashMaker(String(callObj.dxcc) + "|",
callObj, g_rosterSettings.reference);
if (rosterSettings.huntIndex && (hash in rosterSettings.huntIndex.dxcc))
@ -256,7 +255,7 @@ function processRosterFiltering(callRoster, rosterSettings)
entry.tx = false;
continue;
}
let hash = hashMaker(String(callObj.px),
var hash = hashMaker(String(callObj.px),
callObj, g_rosterSettings.reference);
if (rosterSettings.huntIndex && (hash in rosterSettings.huntIndex.px))
@ -276,7 +275,7 @@ function processRosterFiltering(callRoster, rosterSettings)
continue;
}
let hash = hashMaker(callObj.cqz + "|", callObj, g_rosterSettings.reference);
var hash = hashMaker(callObj.cqz + "|", callObj, g_rosterSettings.reference);
if (hash in rosterSettings.huntIndex.cqz)
{
@ -295,7 +294,7 @@ function processRosterFiltering(callRoster, rosterSettings)
continue;
}
let hash = hashMaker(callObj.ituz + "|", callObj, g_rosterSettings.reference);
var hash = hashMaker(callObj.ituz + "|", callObj, g_rosterSettings.reference);
if (hash in rosterSettings.huntIndex.ituz)
{
@ -308,13 +307,13 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "usstates" && window.opener.g_callsignLookups.ulsUseEnable == true)
{
let state = callObj.state;
let finalDxcc = callObj.dxcc;
var state = callObj.state;
var finalDxcc = callObj.dxcc;
if (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6)
{
if (state in window.opener.g_StateData)
{
let hash = hashMaker(state, callObj, g_rosterSettings.reference);
var hash = hashMaker(state, callObj, g_rosterSettings.reference);
if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.state)
{
@ -343,19 +342,20 @@ function processRosterFiltering(callRoster, rosterSettings)
continue;
}
}
if (rosterSettings.isAwardTracker)
{
let tx = false;
let baseHash = hashMaker("", callObj, g_rosterSettings.reference);
var tx = false;
var baseHash = hashMaker("", callObj, g_rosterSettings.reference);
for (let award in g_awardTracker)
for (const award in g_awardTracker)
{
if (g_awardTracker[award].enable)
{
tx = testAward(award, callObj, baseHash);
if (tx)
{
let x = g_awardTracker[award];
var x = g_awardTracker[award];
// TODO: Move award reason out of exclusions code?
callObj.awardReason = g_awards[x.sponsor].awards[x.name].tooltip + " (" + g_awards[x.sponsor].sponsor + ")";
@ -366,11 +366,6 @@ function processRosterFiltering(callRoster, rosterSettings)
}
}
if (callObj.shouldAlert == false && rosterSettings.onlyHits == true && callObj.qrz == false)
{
tx = false
}
entry.tx = tx;
}
}

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

@ -234,6 +234,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
{
if (callsign.match(huntRegexObj))
{
shouldAlert = true;
callObj.reason.push("regex");
callObj.hunting.regex = "hunted";
callObj.DEcallHTML = callsign.replace(huntRegexObj, (x, y) => `<span class='regexMatch'>${x}</span>`)