Merge branch '48-chrbayer84-award-tracker-hits-alerts-script' into 'master'

issue #48 Some Award Tracker hits don't produce alert script to be executed

Closes #48

See merge request gridtracker.org/gridtracker!64
merge-requests/65/head
Matthew Chambers 2021-03-08 03:25:13 +00:00
commit 2c5c26158d
2 zmienionych plików z 4 dodań i 1 usunięć

Wyświetl plik

@ -85,3 +85,4 @@ Temporary artifacts are left in:
Final build results are left in:
gridtracker-dist/
gridtracker-dist/debian

Wyświetl plik

@ -958,6 +958,8 @@ function viewRoster()
continue;
}
}
var shouldAlert = false;
if (isAwardTracker)
{
var tx = false;
@ -973,6 +975,7 @@ function viewRoster()
if (tx)
{
var x = g_awardTracker[award];
shouldAlert = true;
callRoster[callHash].callObj.awardReason =
g_awards[x.sponsor].awards[x.name].tooltip +
" (" +
@ -1053,7 +1056,6 @@ function viewRoster()
var wpx = "#FFFF00";
hasGtPin = false;
var shouldAlert = false;
var callsignBg,
gridBg,
callingBg,