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

bunch of stuff moved to the right places

merge-requests/150/merge
Matthew Chambers 2021-06-28 22:50:49 -05:00
rodzic 68f81c6200
commit 0a85e76493
2 zmienionych plików z 12 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -89,6 +89,17 @@ function renderNormalRosterRow(callObj, showBands, showModes)
{
var thisCall = callObj.DEcall;
var acks = window.opener.g_acknowledgedCalls;
var grid = callObj.grid.length > 1 ? callObj.grid.substr(0, 4) : "-";
var 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(", ") : "-";
var ituzone = grid in window.opener.g_gridToITUZone ? window.opener.g_gridToITUZone[grid].join(", ") : "-";
var spotString = "";
if (g_rosterSettings.columns.Spot && callObj.qrz == false)
{
spotString = getSpotString(callObj);
}
var thisHash = thisCall + callObj.band + callObj.mode;
var callStr = thisCall.formatCallsign()

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

@ -76,18 +76,6 @@ function renderRoster(callRoster, rosterSettings)
if (callObj.shouldAlert == false && rosterSettings.onlyHits == true && callObj.qrz == false)
{ continue; }
var spotString = "";
if (g_rosterSettings.columns.Spot && callObj.qrz == false)
{
spotString = getSpotString(callObj);
// TODO: This is filtering
if (g_rosterSettings.onlySpot && spotString == "") continue;
}
var grid = callObj.grid.length > 1 ? callObj.grid.substr(0, 4) : "-";
var 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(", ") : "-";
var ituzone = grid in window.opener.g_gridToITUZone ? window.opener.g_gridToITUZone[grid].join(", ") : "-";
var thisCall = callObj.DEcall;
if (thisCall.match("^[A-Z][0-9][A-Z](/w+)?$"))
@ -104,7 +92,7 @@ function renderRoster(callRoster, rosterSettings)
}
}
worker += g_rosterSettings.compact ? renderCompactRosterRow(callObj) : renderNormalRosterRow(callObj)
worker += g_rosterSettings.compact ? renderCompactRosterRow(callObj) : renderNormalRosterRow(callObj, showBands, showModes)
}
RosterTable.innerHTML = g_rosterSettings.compact ? renderCompactRosterFooter() : renderNormalRosterFooter()