kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
rodzic
e71aa641aa
commit
6b32701b66
|
@ -1571,6 +1571,8 @@ function resize()
|
||||||
|
|
||||||
function init()
|
function init()
|
||||||
{
|
{
|
||||||
|
window.opener.g_rosterInitialized = true;
|
||||||
|
|
||||||
g_callsignDatabaseDXCC = window.opener.g_callsignDatabaseDXCC;
|
g_callsignDatabaseDXCC = window.opener.g_callsignDatabaseDXCC;
|
||||||
g_callsignDatabaseUS = window.opener.g_callsignDatabaseUS;
|
g_callsignDatabaseUS = window.opener.g_callsignDatabaseUS;
|
||||||
g_callsignDatabaseUSplus = window.opener.g_callsignDatabaseUSplus;
|
g_callsignDatabaseUSplus = window.opener.g_callsignDatabaseUSplus;
|
||||||
|
@ -2101,8 +2103,7 @@ function init()
|
||||||
maxFreqView.innerHTML = maxFreq.value = g_rosterSettings.maxFreq;
|
maxFreqView.innerHTML = maxFreq.value = g_rosterSettings.maxFreq;
|
||||||
|
|
||||||
maxLoTW.value = g_rosterSettings.maxLoTW;
|
maxLoTW.value = g_rosterSettings.maxLoTW;
|
||||||
maxLoTWView.innerHTML =
|
maxLoTWView.innerHTML = maxLoTW.value < 27 ? Number(maxLoTW.value).toYM() : "<b>∞</b>";
|
||||||
maxLoTW.value < 27 ? Number(maxLoTW.value).toYM() : "<b>∞</b>";
|
|
||||||
|
|
||||||
cqOnly.checked = g_rosterSettings.cqOnly;
|
cqOnly.checked = g_rosterSettings.cqOnly;
|
||||||
noMyDxcc.checked = g_rosterSettings.noMyDxcc;
|
noMyDxcc.checked = g_rosterSettings.noMyDxcc;
|
||||||
|
@ -2134,8 +2135,6 @@ function init()
|
||||||
g_timerInterval = nodeTimers.setInterval(realtimeRoster, 1000);
|
g_timerInterval = nodeTimers.setInterval(realtimeRoster, 1000);
|
||||||
|
|
||||||
updateInstances();
|
updateInstances();
|
||||||
|
|
||||||
window.opener.g_rosterInitialized = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleContextMenu(ev)
|
function handleContextMenu(ev)
|
||||||
|
@ -3180,44 +3179,49 @@ function testAcqz(award, obj, baseHash)
|
||||||
|
|
||||||
function scoreAnumsfx(award, obj)
|
function scoreAnumsfx(award, obj)
|
||||||
{
|
{
|
||||||
let test = g_awards[award.sponsor].awards[award.name];
|
if (obj.px)
|
||||||
let px = obj.px.substr(0, obj.px.length - 1);
|
|
||||||
let suf = obj.DEcall.replace(px, "");
|
|
||||||
suf = suf.substr(0, test.rule.numsfx[0][0].length);
|
|
||||||
for (const i in test.rule.numsfx)
|
|
||||||
{
|
{
|
||||||
for (const s in test.rule.numsfx[i])
|
let test = g_awards[award.sponsor].awards[award.name];
|
||||||
|
let px = obj.px.substr(0, obj.px.length - 1);
|
||||||
|
let suf = obj.DEcall.replace(px, "");
|
||||||
|
suf = suf.substr(0, test.rule.numsfx[0][0].length);
|
||||||
|
for (const i in test.rule.numsfx)
|
||||||
{
|
{
|
||||||
if (suf.indexOf(test.rule.numsfx[i][s]) == 0)
|
for (const s in test.rule.numsfx[i])
|
||||||
{
|
{
|
||||||
if (!(i in award.stat)) award.stat[i] = newAwardCountObject();
|
if (suf.indexOf(test.rule.numsfx[i][s]) == 0)
|
||||||
return workAwardObject(
|
{
|
||||||
award.stat[i],
|
if (!(i in award.stat)) award.stat[i] = newAwardCountObject();
|
||||||
obj.band,
|
return workAwardObject(
|
||||||
obj.mode,
|
award.stat[i],
|
||||||
obj.digital,
|
obj.band,
|
||||||
obj.phone
|
obj.mode,
|
||||||
);
|
obj.digital,
|
||||||
|
obj.phone
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function testAnumsfx(award, obj)
|
function testAnumsfx(award, obj)
|
||||||
{
|
{
|
||||||
let test = g_awards[award.sponsor].awards[award.name];
|
if (obj.px)
|
||||||
let px = obj.px.substr(0, obj.px.length - 1);
|
|
||||||
let suf = obj.DEcall.replace(px, "");
|
|
||||||
suf = suf.substr(0, test.rule.numsfx[0][0].length);
|
|
||||||
for (const i in test.rule.numsfx)
|
|
||||||
{
|
{
|
||||||
for (const s in test.rule.numsfx[i])
|
let test = g_awards[award.sponsor].awards[award.name];
|
||||||
|
let px = obj.px.substr(0, obj.px.length - 1);
|
||||||
|
let suf = obj.DEcall.replace(px, "");
|
||||||
|
suf = suf.substr(0, test.rule.numsfx[0][0].length);
|
||||||
|
for (const i in test.rule.numsfx)
|
||||||
{
|
{
|
||||||
if (suf.indexOf(test.rule.numsfx[i][s]) == 0)
|
for (const s in test.rule.numsfx[i])
|
||||||
{
|
{
|
||||||
return false;
|
if (suf.indexOf(test.rule.numsfx[i][s]) == 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"name": "GridTracker",
|
"name": "GridTracker",
|
||||||
"product_string_do_not_use": "gridtracker",
|
"product_string_do_not_use": "gridtracker",
|
||||||
"version": "1.22.1016",
|
"version": "1.22.1024",
|
||||||
"betaVersion": "Harvest",
|
"betaVersion": "Ernte",
|
||||||
"description": "GridTracker, an amateur radio companion",
|
"description": "GridTracker, an amateur radio companion",
|
||||||
"author": "GridTracker.org",
|
"author": "GridTracker.org",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
|
|
Ładowanie…
Reference in New Issue