kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
review changes
rodzic
c665b58688
commit
a433ed7cef
|
@ -2847,7 +2847,7 @@ function buildAwardTypeHandlers()
|
||||||
g_awardTypes.cont2band.test = testAcont2band;
|
g_awardTypes.cont2band.test = testAcont2band;
|
||||||
g_awardTypes.calls2band.test = testAcalls2band;
|
g_awardTypes.calls2band.test = testAcalls2band;
|
||||||
g_awardTypes.dxcc2band.test = testAdxcc2band;
|
g_awardTypes.dxcc2band.test = testAdxcc2band;
|
||||||
g_awardTypes.states2band.test = testAstates2band;
|
g_awardTypes.states2band.test = testAstates;
|
||||||
|
|
||||||
g_awardTypes.IOTA.compile = singleCompile;
|
g_awardTypes.IOTA.compile = singleCompile;
|
||||||
g_awardTypes.call.compile = singleCompile;
|
g_awardTypes.call.compile = singleCompile;
|
||||||
|
@ -2891,7 +2891,12 @@ function scoreAstates(award, obj)
|
||||||
|
|
||||||
function testAstates(award, obj, baseHash)
|
function testAstates(award, obj, baseHash)
|
||||||
{
|
{
|
||||||
if (obj.state && obj.state + baseHash in g_tracker[award.test.look].state)
|
// calls with empty state will not match anything in the hash map. so filter those out
|
||||||
|
if (!obj.state || obj.state.trim() === "")
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (obj.state + baseHash in g_tracker[award.test.look].state)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -2915,15 +2920,6 @@ function scoreAstates2band(award, obj)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function testAstates2band(award, obj, baseHash)
|
|
||||||
{
|
|
||||||
if (obj.state && obj.state + baseHash in g_tracker[award.test.look].state)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function scoreAdxcc(award, obj)
|
function scoreAdxcc(award, obj)
|
||||||
{
|
{
|
||||||
if (!(obj.dxcc in award.stat)) award.stat[obj.dxcc] = newAwardCountObject();
|
if (!(obj.dxcc in award.stat)) award.stat[obj.dxcc] = newAwardCountObject();
|
||||||
|
@ -3457,9 +3453,14 @@ function scoreAcqz(award, obj)
|
||||||
|
|
||||||
function testAcqz(award, obj, baseHash)
|
function testAcqz(award, obj, baseHash)
|
||||||
{
|
{
|
||||||
if (obj.cqz)
|
// calls with empty cqz will not match anything in the hash map. so filter those out
|
||||||
|
if (!obj.cqz || obj.cqz.trim() === "")
|
||||||
{
|
{
|
||||||
if (obj.cqz + "|" + baseHash in g_tracker[award.test.look].cqz) return false;
|
return false;
|
||||||
|
}
|
||||||
|
if (obj.cqz + "|" + baseHash in g_tracker[award.test.look].cqz)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -392,22 +392,22 @@ function processRosterFiltering(callRoster, rosterSettings)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (g_rosterSettings.noUnknownRosterAlerts)
|
// if (g_rosterSettings.noUnknownRosterAlerts)
|
||||||
{
|
// {
|
||||||
if (callObj.dxcc === 291 || callObj.dxcc === 110 || callObj.dxcc === 6)
|
// if (callObj.dxcc === 291 || callObj.dxcc === 110 || callObj.dxcc === 6)
|
||||||
{
|
// {
|
||||||
if (!callObj.state)
|
// if (!callObj.state)
|
||||||
{
|
// {
|
||||||
callObj.shouldAlert = false;
|
// callObj.shouldAlert = false;
|
||||||
tx = false;
|
// tx = false;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if (callObj.cqz === -1)
|
// if (callObj.cqz === -1)
|
||||||
{
|
// {
|
||||||
callObj.shouldAlert = false;
|
// callObj.shouldAlert = false;
|
||||||
tx = false;
|
// tx = false;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
let didWork = (baseHash in g_worked.call);
|
let didWork = (baseHash in g_worked.call);
|
||||||
if (allOnlyNew.checked && didWork && !callObj.qrz)
|
if (allOnlyNew.checked && didWork && !callObj.qrz)
|
||||||
{
|
{
|
||||||
|
|
Ładowanie…
Reference in New Issue