From f6cb5793755a276fa7769b454a69541b9ce2fcfe Mon Sep 17 00:00:00 2001 From: Tag Date: Tue, 4 Oct 2022 18:06:56 -0700 Subject: [PATCH] Trigger alert if award tracker tests passed --- package.nw/lib/roster/processRosterFiltering.js | 1 + package.nw/lib/roster/processRosterHunting.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package.nw/lib/roster/processRosterFiltering.js b/package.nw/lib/roster/processRosterFiltering.js index d787416..45f429b 100644 --- a/package.nw/lib/roster/processRosterFiltering.js +++ b/package.nw/lib/roster/processRosterFiltering.js @@ -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; } } diff --git a/package.nw/lib/roster/processRosterHunting.js b/package.nw/lib/roster/processRosterHunting.js index c42d21d..aa3a338 100644 --- a/package.nw/lib/roster/processRosterHunting.js +++ b/package.nw/lib/roster/processRosterHunting.js @@ -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;