mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

change vars to lets per Tag's suggestion

merge-requests/144/head
Matthew Chambers 2021-12-12 15:56:58 -06:00
rodzic e2af34ea38
commit 8bf08bc9fa
6 zmienionych plików z 300 dodań i 300 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

372
package.nw/lib/roster.js
Wyświetl plik

Plik diff jest za duży Load Diff

2
package.nw/lib/roster/prepareRosterSettings.js
Wyświetl plik

@ -1,6 +1,6 @@
function prepareRosterSettings() function prepareRosterSettings()
{ {
var rosterSettings = { let rosterSettings = {
bands: {}, bands: {},
modes: {}, modes: {},
callMode: g_rosterSettings.callsign, callMode: g_rosterSettings.callsign,

44
package.nw/lib/roster/processRosterFiltering.js
Wyświetl plik

@ -2,12 +2,12 @@ function processRosterFiltering(callRoster, rosterSettings)
{ {
// First loop, exclude calls, mostly based on "Exceptions" settings // First loop, exclude calls, mostly based on "Exceptions" settings
// this whole section is full of individual if's that could be broken out // this whole section is full of individual if's that could be broken out
for (var callHash in callRoster) for (let callHash in callRoster)
{ {
var entry = callRoster[callHash]; let entry = callRoster[callHash];
var callObj = entry.callObj; let callObj = entry.callObj;
var call = entry.DEcall; let call = entry.DEcall;
entry.tx = true; entry.tx = true;
callObj.shouldAlert = false; callObj.shouldAlert = false;
@ -144,7 +144,7 @@ function processRosterFiltering(callRoster, rosterSettings)
} }
if (g_rosterSettings.maxLoTW < 27) if (g_rosterSettings.maxLoTW < 27)
{ {
var months = (g_day - window.opener.g_lotwCallsigns[call]) / 30; let months = (g_day - window.opener.g_lotwCallsigns[call]) / 30;
if (months > g_rosterSettings.maxLoTW) if (months > g_rosterSettings.maxLoTW)
{ {
entry.tx = false; entry.tx = false;
@ -179,7 +179,7 @@ function processRosterFiltering(callRoster, rosterSettings)
continue; continue;
} }
var hash = hashMaker(call, callObj, g_rosterSettings.reference); let hash = hashMaker(call, callObj, g_rosterSettings.reference);
if (rosterSettings.callMode == "worked" && hash in g_worked.call) if (rosterSettings.callMode == "worked" && hash in g_worked.call)
{ {
entry.tx = false; entry.tx = false;
@ -193,7 +193,7 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "grid") if (g_rosterSettings.hunting == "grid")
{ {
var hash = hashMaker(callObj.grid.substr(0, 4), let hash = hashMaker(callObj.grid.substr(0, 4),
callObj, g_rosterSettings.reference); callObj, g_rosterSettings.reference);
if (huntIndex && hash in huntIndex.grid) if (huntIndex && hash in huntIndex.grid)
{ {
@ -209,7 +209,7 @@ function processRosterFiltering(callRoster, rosterSettings)
} }
if (g_rosterSettings.hunting == "dxcc") if (g_rosterSettings.hunting == "dxcc")
{ {
var hash = hashMaker(String(callObj.dxcc), let hash = hashMaker(String(callObj.dxcc),
callObj, g_rosterSettings.reference); callObj, g_rosterSettings.reference);
if (huntIndex && (hash in huntIndex.dxcc)) if (huntIndex && (hash in huntIndex.dxcc))
@ -242,7 +242,7 @@ function processRosterFiltering(callRoster, rosterSettings)
entry.tx = false; entry.tx = false;
continue; continue;
} }
var hash = hashMaker(String(callObj.px), let hash = hashMaker(String(callObj.px),
callObj, g_rosterSettings.reference); callObj, g_rosterSettings.reference);
if (huntIndex && (hash in huntIndex.px)) if (huntIndex && (hash in huntIndex.px))
@ -256,16 +256,16 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "cq") if (g_rosterSettings.hunting == "cq")
{ {
var huntTotal = callObj.cqza.length; let huntTotal = callObj.cqza.length;
if (huntTotal == 0 || !huntIndex) if (huntTotal == 0 || !huntIndex)
{ {
entry.tx = false; entry.tx = false;
continue; continue;
} }
var huntFound = 0; let huntFound = 0;
for (index in callObj.cqza) for (index in callObj.cqza)
{ {
var hash = hashMaker(callObj.cqza[index], callObj, g_rosterSettings.reference); let hash = hashMaker(callObj.cqza[index], callObj, g_rosterSettings.reference);
if (hash in huntIndex.cqz) huntFound++; if (hash in huntIndex.cqz) huntFound++;
} }
@ -279,16 +279,16 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "itu") if (g_rosterSettings.hunting == "itu")
{ {
var huntTotal = callObj.ituza.length; let huntTotal = callObj.ituza.length;
if (huntTotal == 0 || !huntIndex) if (huntTotal == 0 || !huntIndex)
{ {
entry.tx = false; entry.tx = false;
continue; continue;
} }
var huntFound = 0; let huntFound = 0;
for (index in callObj.ituza) for (index in callObj.ituza)
{ {
var hash = hashMaker(callObj.ituza[index], callObj, g_rosterSettings.reference); let hash = hashMaker(callObj.ituza[index], callObj, g_rosterSettings.reference);
if (hash in huntIndex.ituz) huntFound++; if (hash in huntIndex.ituz) huntFound++;
} }
@ -308,13 +308,13 @@ function processRosterFiltering(callRoster, rosterSettings)
if (g_rosterSettings.hunting == "usstates" && window.opener.g_callsignLookups.ulsUseEnable == true) if (g_rosterSettings.hunting == "usstates" && window.opener.g_callsignLookups.ulsUseEnable == true)
{ {
var state = callObj.state; let state = callObj.state;
var finalDxcc = callObj.dxcc; let finalDxcc = callObj.dxcc;
if (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6) if (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6)
{ {
if (state in window.opener.g_StateData) if (state in window.opener.g_StateData)
{ {
var hash = hashMaker(state, callObj, g_rosterSettings.reference); let hash = hashMaker(state, callObj, g_rosterSettings.reference);
if (huntIndex && hash in huntIndex.state) if (huntIndex && hash in huntIndex.state)
{ {
@ -345,17 +345,17 @@ function processRosterFiltering(callRoster, rosterSettings)
} }
if (rosterSettings.isAwardTracker) if (rosterSettings.isAwardTracker)
{ {
var tx = false; let tx = false;
var baseHash = hashMaker("", callObj, g_rosterSettings.reference); let baseHash = hashMaker("", callObj, g_rosterSettings.reference);
for (var award in g_awardTracker) for (let award in g_awardTracker)
{ {
if (g_awardTracker[award].enable) if (g_awardTracker[award].enable)
{ {
tx = testAward(award, callObj, baseHash); tx = testAward(award, callObj, baseHash);
if (tx) if (tx)
{ {
var x = g_awardTracker[award]; let x = g_awardTracker[award];
// TODO: Move award reason out of exclusions code? // TODO: Move award reason out of exclusions code?
callObj.awardReason = callObj.awardReason =

128
package.nw/lib/roster/processRosterHunting.js
Wyświetl plik

@ -1,26 +1,26 @@
function processRosterHunting(callRoster, rosterSettings) function processRosterHunting(callRoster, rosterSettings)
{ {
// these vars, do they rely on anything between the top and here? // these lets, do they rely on anything between the top and here?
// if not could they be put in the var list at the beginning? // if not could they be put in the let list at the beginning?
var hasGtPin = false; let hasGtPin = false;
var inversionAlpha = "DD"; let inversionAlpha = "DD";
var row = "#000000"; let row = "#000000";
var bold = "#000000;font-weight: bold;"; let bold = "#000000;font-weight: bold;";
var unconf = "background-clip:padding-box;box-shadow: 0 0 7px 3px inset "; let unconf = "background-clip:padding-box;box-shadow: 0 0 7px 3px inset ";
var layeredAlpha = "77"; let layeredAlpha = "77";
var layeredInversionAlpha = "66"; let layeredInversionAlpha = "66";
var layeredUnconf = "background-clip:padding-box;box-shadow: 0 0 4px 2px inset "; let layeredUnconf = "background-clip:padding-box;box-shadow: 0 0 4px 2px inset ";
var layeredUnconfAlpha = "AA"; let layeredUnconfAlpha = "AA";
// TODO: Hunting results might be used to filter, based on the "Callsigns: Only Wanted" option, // TODO: Hunting results might be used to filter, based on the "Callsigns: Only Wanted" option,
// so maybe we can move this loop first, and add a check to the filtering loop? // so maybe we can move this loop first, and add a check to the filtering loop?
// Second loop, hunting and highlighting // Second loop, hunting and highlighting
for (var callHash in callRoster) for (let callHash in callRoster)
{ {
var entry = callRoster[callHash]; let entry = callRoster[callHash];
var callObj = entry.callObj; let callObj = entry.callObj;
// Special case check for called station // Special case check for called station
if (callObj.qrz == true && entry.tx == false) if (callObj.qrz == true && entry.tx == false)
@ -29,7 +29,7 @@ function processRosterHunting(callRoster, rosterSettings)
if (window.opener.g_instances[callObj.instance].crEnable == true) if (window.opener.g_instances[callObj.instance].crEnable == true)
{ {
// Calling us, but we wouldn't normally display // Calling us, but we wouldn't normally display
// If they are not ignored or we're in a QSO with them, var it through // If they are not ignored or we're in a QSO with them, let it through
// TODO: This is here because it's after the filtering stage // TODO: This is here because it's after the filtering stage
if ((!(entry.DEcall in g_blockedCalls) && !(callObj.dxcc in g_blockedDxcc)) || if ((!(entry.DEcall in g_blockedCalls) && !(callObj.dxcc in g_blockedDxcc)) ||
@ -45,7 +45,7 @@ function processRosterHunting(callRoster, rosterSettings)
{ {
// In layered mode ("Hunting: mixed") the workHashSuffix becomes a more stricter 'live band', // In layered mode ("Hunting: mixed") the workHashSuffix becomes a more stricter 'live band',
// while the layered suffix is a broader 'mixed band' // while the layered suffix is a broader 'mixed band'
var workHashSuffix, layeredHashSuffix; let workHashSuffix, layeredHashSuffix;
if (rosterSettings.layeredMode) if (rosterSettings.layeredMode)
{ {
workHashSuffix = hashMaker("", callObj, rosterSettings.layeredMode); workHashSuffix = hashMaker("", callObj, rosterSettings.layeredMode);
@ -56,42 +56,42 @@ function processRosterHunting(callRoster, rosterSettings)
workHashSuffix = hashMaker("", callObj, g_rosterSettings.reference); workHashSuffix = hashMaker("", callObj, g_rosterSettings.reference);
layeredHashSuffix = false layeredHashSuffix = false
} }
var workHash = workHashSuffix; // TODO: Remove after replacing all occurrences with Suffix let workHash = workHashSuffix; // TODO: Remove after replacing all occurrences with Suffix
var callsign = entry.DEcall; let callsign = entry.DEcall;
callObj.hunting = {} callObj.hunting = {}
callObj.callFlags = {} callObj.callFlags = {}
var colorObject = Object(); let colorObject = Object();
var callPointer = callObj.CQ == true ? "cursor:pointer" : ""; let callPointer = callObj.CQ == true ? "cursor:pointer" : "";
var didWork = false; let didWork = false;
var call = "#FFFF00"; let call = "#FFFF00";
var grid = "#00FFFF"; let grid = "#00FFFF";
var calling = "#90EE90"; let calling = "#90EE90";
var dxcc = "#FFA500"; let dxcc = "#FFA500";
var state = "#90EE90"; let state = "#90EE90";
var cnty = "#CCDD00"; let cnty = "#CCDD00";
var cont = "#00DDDD"; let cont = "#00DDDD";
var cqz = "#DDDDDD"; let cqz = "#DDDDDD";
var ituz = "#DDDDDD"; let ituz = "#DDDDDD";
var wpx = "#FFFF00"; let wpx = "#FFFF00";
hasGtPin = false; hasGtPin = false;
var shouldAlert = false; let shouldAlert = false;
var callBg, gridBg, callingBg, dxccBg, stateBg, cntyBg, contBg, cqzBg, ituzBg, wpxBg, gtBg; let callBg, gridBg, callingBg, dxccBg, stateBg, cntyBg, contBg, cqzBg, ituzBg, wpxBg, gtBg;
var callConf, gridConf, callingConf, dxccConf, stateConf, cntyConf, contConf, cqzConf, ituzConf, wpxConf; let callConf, gridConf, callingConf, dxccConf, stateConf, cntyConf, contConf, cqzConf, ituzConf, wpxConf;
callBg = gridBg = callingBg = dxccBg = stateBg = cntyBg = contBg = cqzBg = ituzBg = wpxBg = gtBg = row; callBg = gridBg = callingBg = dxccBg = stateBg = cntyBg = contBg = cqzBg = ituzBg = wpxBg = gtBg = row;
callConf = gridConf = callingConf = dxccConf = stateConf = cntyConf = contConf = cqzConf = ituzConf = wpxConf = callConf = gridConf = callingConf = dxccConf = stateConf = cntyConf = contConf = cqzConf = ituzConf = wpxConf =
""; "";
var hash = callsign + workHashSuffix; let hash = callsign + workHashSuffix;
var layeredHash = layeredHashSuffix && (callsign + layeredHashSuffix) let layeredHash = layeredHashSuffix && (callsign + layeredHashSuffix)
// Call worked in current logbook settings, regardless of hunting mode // Call worked in current logbook settings, regardless of hunting mode
if (hash in g_worked.call) if (hash in g_worked.call)
@ -141,8 +141,8 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for callsigns // Hunting for callsigns
if (huntCallsign.checked == true) if (huntCallsign.checked == true)
{ {
var hash = callsign + workHashSuffix; let hash = callsign + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (callsign + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (callsign + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.call)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.call))
{ {
@ -217,8 +217,8 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for grids // Hunting for grids
if (huntGrid.checked == true && callObj.grid.length > 1) if (huntGrid.checked == true && callObj.grid.length > 1)
{ {
var hash = callObj.grid.substr(0, 4) + workHashSuffix; let hash = callObj.grid.substr(0, 4) + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (callObj.grid.substr(0, 4) + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (callObj.grid.substr(0, 4) + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.grid)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.grid))
{ {
@ -267,8 +267,8 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for DXCC // Hunting for DXCC
if (huntDXCC.checked == true) if (huntDXCC.checked == true)
{ {
var hash = String(callObj.dxcc) + workHashSuffix; let hash = String(callObj.dxcc) + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (String(callObj.dxcc) + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (String(callObj.dxcc) + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.dxcc)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.dxcc))
{ {
@ -317,14 +317,14 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for US States // Hunting for US States
if (huntState.checked == true && window.opener.g_callsignLookups.ulsUseEnable == true) if (huntState.checked == true && window.opener.g_callsignLookups.ulsUseEnable == true)
{ {
var stateSearch = callObj.state; let stateSearch = callObj.state;
var finalDxcc = callObj.dxcc; let finalDxcc = callObj.dxcc;
if (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6) if (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6)
{ {
if (stateSearch in window.opener.g_StateData) if (stateSearch in window.opener.g_StateData)
{ {
var hash = stateSearch + workHashSuffix; let hash = stateSearch + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (stateSearch + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (stateSearch + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.state)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.state))
{ {
@ -375,24 +375,24 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for US Counties // Hunting for US Counties
if (huntCounty.checked == true && window.opener.g_callsignLookups.ulsUseEnable == true) if (huntCounty.checked == true && window.opener.g_callsignLookups.ulsUseEnable == true)
{ {
var finalDxcc = callObj.dxcc; let finalDxcc = callObj.dxcc;
if ( if (
callObj.cnty && callObj.cnty &&
(finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6 || finalDxcc == 202) && (finalDxcc == 291 || finalDxcc == 110 || finalDxcc == 6 || finalDxcc == 202) &&
callObj.cnty.length > 0 callObj.cnty.length > 0
) )
{ {
var hash = callObj.cnty + (rosterSettings.layeredMode ? layeredHashSuffix : workHashSuffix); let hash = callObj.cnty + (rosterSettings.layeredMode ? layeredHashSuffix : workHashSuffix);
if ((rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.cnty)) || callObj.qual == false) if ((rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.cnty)) || callObj.qual == false)
{ {
if (callObj.qual == false) if (callObj.qual == false)
{ {
var counties = window.opener.g_zipToCounty[callObj.zipcode]; let counties = window.opener.g_zipToCounty[callObj.zipcode];
var foundHit = false; let foundHit = false;
for (var cnt in counties) for (let cnt in counties)
{ {
var hh = counties[cnt] + workHash; let hh = counties[cnt] + workHash;
callObj.cnty = counties[cnt]; callObj.cnty = counties[cnt];
if (rosterSettings.huntIndex && !(hh in rosterSettings.huntIndex.cnty)) if (rosterSettings.huntIndex && !(hh in rosterSettings.huntIndex.cnty))
{ {
@ -430,13 +430,13 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for CQ Zones // Hunting for CQ Zones
if (huntCQz.checked == true) if (huntCQz.checked == true)
{ {
var huntTotal = callObj.cqza.length; let huntTotal = callObj.cqza.length;
var huntFound = 0, layeredFound = 0, workedFound = 0, layeredWorkedFound = 0; let huntFound = 0, layeredFound = 0, workedFound = 0, layeredWorkedFound = 0;
for (index in callObj.cqza) for (index in callObj.cqza)
{ {
var hash = callObj.cqza[index] + workHashSuffix; let hash = callObj.cqza[index] + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (callObj.cqza[index] + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (callObj.cqza[index] + layeredHashSuffix)
if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.cqz) huntFound++; if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.cqz) huntFound++;
if (rosterSettings.layeredMode && layeredHash in rosterSettings.huntIndex.cqz) layeredFound++; if (rosterSettings.layeredMode && layeredHash in rosterSettings.huntIndex.cqz) layeredFound++;
@ -489,13 +489,13 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for ITU Zones // Hunting for ITU Zones
if (huntITUz.checked == true) if (huntITUz.checked == true)
{ {
var huntTotal = callObj.ituza.length; let huntTotal = callObj.ituza.length;
var huntFound = 0, layeredFound = 0, workedFound = 0, layeredWorkedFound = 0; let huntFound = 0, layeredFound = 0, workedFound = 0, layeredWorkedFound = 0;
for (index in callObj.ituza) for (index in callObj.ituza)
{ {
var hash = callObj.ituza[index] + workHashSuffix; let hash = callObj.ituza[index] + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (callObj.ituza[index] + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (callObj.ituza[index] + layeredHashSuffix)
if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.ituz) huntFound++; if (rosterSettings.huntIndex && hash in rosterSettings.huntIndex.ituz) huntFound++;
if (rosterSettings.layeredMode && layeredHash in rosterSettings.huntIndex.ituz) layeredFound++; if (rosterSettings.layeredMode && layeredHash in rosterSettings.huntIndex.ituz) layeredFound++;
@ -548,8 +548,8 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for WPX (Prefixes) // Hunting for WPX (Prefixes)
if (huntPX.checked == true && callObj.px) if (huntPX.checked == true && callObj.px)
{ {
var hash = String(callObj.px) + workHashSuffix; let hash = String(callObj.px) + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (String(callObj.px) + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (String(callObj.px) + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.px)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.px))
{ {
@ -598,8 +598,8 @@ function processRosterHunting(callRoster, rosterSettings)
// Hunting for Continents // Hunting for Continents
if (huntCont.checked == true && callObj.cont) if (huntCont.checked == true && callObj.cont)
{ {
var hash = String(callObj.cont) + workHashSuffix; let hash = String(callObj.cont) + workHashSuffix;
var layeredHash = rosterSettings.layeredMode && (String(callObj.cont) + layeredHashSuffix) let layeredHash = rosterSettings.layeredMode && (String(callObj.cont) + layeredHashSuffix)
if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.cont)) if (rosterSettings.huntIndex && !(hash in rosterSettings.huntIndex.cont))
{ {

28
package.nw/lib/roster/renderNormalRoster.js
Wyświetl plik

@ -1,6 +1,6 @@
function renderNormalRosterHeaders(showBands, showModes) function renderNormalRosterHeaders(showBands, showModes)
{ {
var worker = "" let worker = ""
worker = "<table id='callTable' class='rosterTable' align=left>"; worker = "<table id='callTable' class='rosterTable' align=left>";
worker += "<thead><th style='cursor:pointer;' onclick='showRosterBox(0);' align=left>Callsign</th>"; worker += "<thead><th style='cursor:pointer;' onclick='showRosterBox(0);' align=left>Callsign</th>";
@ -87,29 +87,29 @@ function renderNormalRosterHeaders(showBands, showModes)
function renderNormalRosterRow(callObj, showBands, showModes) function renderNormalRosterRow(callObj, showBands, showModes)
{ {
var thisCall = callObj.DEcall; let thisCall = callObj.DEcall;
var acks = window.opener.g_acknowledgedCalls; let acks = window.opener.g_acknowledgedCalls;
var grid = callObj.grid.length > 1 ? callObj.grid.substr(0, 4) : "-"; let grid = callObj.grid.length > 1 ? callObj.grid.substr(0, 4) : "-";
var geo = window.opener.g_worldGeoData[window.opener.g_dxccToGeoData[callObj.dxcc]]; let geo = window.opener.g_worldGeoData[window.opener.g_dxccToGeoData[callObj.dxcc]];
var cqzone = grid in window.opener.g_gridToCQZone ? window.opener.g_gridToCQZone[grid].join(", ") : "-"; let cqzone = grid in window.opener.g_gridToCQZone ? window.opener.g_gridToCQZone[grid].join(", ") : "-";
var ituzone = grid in window.opener.g_gridToITUZone ? window.opener.g_gridToITUZone[grid].join(", ") : "-"; let ituzone = grid in window.opener.g_gridToITUZone ? window.opener.g_gridToITUZone[grid].join(", ") : "-";
var spotString = ""; let spotString = "";
if (g_rosterSettings.columns.Spot && callObj.qrz == false) if (g_rosterSettings.columns.Spot && callObj.qrz == false)
{ {
spotString = getSpotString(callObj); spotString = getSpotString(callObj);
} }
var thisHash = thisCall + callObj.band + callObj.mode; let thisHash = thisCall + callObj.band + callObj.mode;
var callStr = thisCall.formatCallsign() let callStr = thisCall.formatCallsign()
if (acks[thisCall]) if (acks[thisCall])
{ {
callStr = `${callStr} <span class='acknowledged'><img class='ackBadge' src='${acks[thisCall].badge}'></span>` callStr = `${callStr} <span class='acknowledged'><img class='ackBadge' src='${acks[thisCall].badge}'></span>`
callObj.awardReason += ` - ${acks[thisCall].message}` callObj.awardReason += ` - ${acks[thisCall].message}`
} }
var worker = "<tbody><tr id='" + thisHash + "'>"; let worker = "<tbody><tr id='" + thisHash + "'>";
worker += worker +=
"<td title='" + "<td title='" +
@ -135,7 +135,7 @@ function renderNormalRosterRow(callObj, showBands, showModes)
} }
if (showModes) if (showModes)
{ {
var color = "888888"; let color = "888888";
if (callObj.mode in g_modeColors) if (callObj.mode in g_modeColors)
{ color = g_modeColors[callObj.mode]; } { color = g_modeColors[callObj.mode]; }
worker += worker +=
@ -152,7 +152,7 @@ function renderNormalRosterRow(callObj, showBands, showModes)
"</td>"; "</td>";
if (g_rosterSettings.columns.Calling) if (g_rosterSettings.columns.Calling)
{ {
var lookString = callObj.CQ ? "name='CQ'" : "name='Calling'"; let lookString = callObj.CQ ? "name='CQ'" : "name='Calling'";
worker += worker +=
"<td " + "<td " +
callObj.style.calling + callObj.style.calling +
@ -294,7 +294,7 @@ function renderNormalRosterRow(callObj, showBands, showModes)
{ {
if (g_rosterSettings.maxLoTW < 27) if (g_rosterSettings.maxLoTW < 27)
{ {
var months = (g_day - window.opener.g_lotwCallsigns[thisCall]) / 30; let months = (g_day - window.opener.g_lotwCallsigns[thisCall]) / 30;
if (months > g_rosterSettings.maxLoTW) if (months > g_rosterSettings.maxLoTW)
{ {
worker += worker +=

26
package.nw/lib/roster/renderRoster.js
Wyświetl plik

@ -18,10 +18,10 @@ function renderRoster(callRoster, rosterSettings)
// Show the roster count in the window title // Show the roster count in the window title
// var visibleCallList = callRoster.filter(entry => entry.tx); // let visibleCallList = callRoster.filter(entry => entry.tx);
var visibleCallList = []; let visibleCallList = [];
var band = let band =
window.opener.g_appSettings.gtBandFilter == "auto" window.opener.g_appSettings.gtBandFilter == "auto"
? window.opener.g_appSettings.myBand ? window.opener.g_appSettings.myBand
: window.opener.g_appSettings.gtBandFilter.length == 0 : window.opener.g_appSettings.gtBandFilter.length == 0
@ -48,15 +48,15 @@ function renderRoster(callRoster, rosterSettings)
} }
} }
var totalCount = Object.keys(callRoster).length; let totalCount = Object.keys(callRoster).length;
var visibleCount = visibleCallList.length; let visibleCount = visibleCallList.length;
var huntedCount = 0; let huntedCount = 0;
if (typeof (obj) !== "undefined") if (typeof (obj) !== "undefined")
{ {
huntedCount = visibleCallList.filter(obj => Object.keys().length > 0).length huntedCount = visibleCallList.filter(obj => Object.keys().length > 0).length
} }
var countParts = []; let countParts = [];
if (totalCount != visibleCount) if (totalCount != visibleCount)
{ {
@ -86,21 +86,21 @@ function renderRoster(callRoster, rosterSettings)
visibleCallList.sort(r_sortFunction[6]).reverse(); visibleCallList.sort(r_sortFunction[6]).reverse();
} }
var showBands = (Object.keys(rosterSettings.bands).length > 1) || g_rosterSettings.columns.Band; let showBands = (Object.keys(rosterSettings.bands).length > 1) || g_rosterSettings.columns.Band;
var showModes = (Object.keys(rosterSettings.modes).length > 1) || g_rosterSettings.columns.Mode; let showModes = (Object.keys(rosterSettings.modes).length > 1) || g_rosterSettings.columns.Mode;
var worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(showBands, showModes) let worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(showBands, showModes)
// Third loop: render all rows // Third loop: render all rows
for (var x in visibleCallList) for (let x in visibleCallList)
{ {
var callObj = visibleCallList[x].callObj; let callObj = visibleCallList[x].callObj;
// TODO: This is filtering // TODO: This is filtering
if (callObj.shouldAlert == false && rosterSettings.onlyHits == true && callObj.qrz == false) if (callObj.shouldAlert == false && rosterSettings.onlyHits == true && callObj.qrz == false)
{ continue; } { continue; }
var thisCall = callObj.DEcall; let thisCall = callObj.DEcall;
if (thisCall.match("^[A-Z][0-9][A-Z](/w+)?$")) if (thisCall.match("^[A-Z][0-9][A-Z](/w+)?$"))
{ callObj.style.call = "class='oneByOne'"; } { callObj.style.call = "class='oneByOne'"; }