Merge branch 'award-tracker-not-alerting' into 'master'

Trigger alert if award tracker tests passed

See merge request gridtracker.org/gridtracker!217

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
merge-requests/215/merge
Matthew Chambers 2022-10-05 04:05:15 +00:00
commit 16b835280e
2 zmienionych plików z 8 dodań i 1 usunięć

Wyświetl plik

@ -378,6 +378,7 @@ function processRosterFiltering(callRoster, rosterSettings)
// TODO: Move award reason out of exclusions code?
callObj.awardReason = g_awards[x.sponsor].awards[x.name].tooltip + " (" + g_awards[x.sponsor].sponsor + ")";
callObj.reason.push(x.name + " - " + x.sponsor);
callObj.shouldAlert = true;
break;
}
}

Wyświetl plik

@ -778,7 +778,13 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
// Just in case, don't alert if we worked this callsign alread
if (didWork && shouldAlert) shouldAlert = false;
callObj.shouldAlert = shouldAlert;
// callObj.shouldAlert ||= shouldAlert; // eslint doesn't like this, why?
// If alert was set (award tracker), don't clear it
if (!callObj.shouldAlert)
{
callObj.shouldAlert = shouldAlert;
}
callObj.style = colorObject;