kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Fixed "Spotted Me" exception
rodzic
4bf7b3d4e4
commit
046c76f377
|
@ -421,6 +421,7 @@ function realtimeRoster()
|
||||||
lifeCols[x].innerHTML = toDHMS(when);
|
lifeCols[x].innerHTML = toDHMS(when);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CR.rosterSettings.columns.Spot)
|
if (CR.rosterSettings.columns.Spot)
|
||||||
{
|
{
|
||||||
let spotCols = document.getElementsByClassName("spotCol");
|
let spotCols = document.getElementsByClassName("spotCol");
|
||||||
|
@ -428,14 +429,7 @@ function realtimeRoster()
|
||||||
{
|
{
|
||||||
if ((typeof spotCols[x].id != "undefined") && (typeof CR.callRoster[spotCols[x].id.substr(2)] != "undefined"))
|
if ((typeof spotCols[x].id != "undefined") && (typeof CR.callRoster[spotCols[x].id.substr(2)] != "undefined"))
|
||||||
{
|
{
|
||||||
spotCols[x].innerHTML = getSpotString(
|
spotCols[x].innerHTML = getSpotString(CR.callRoster[spotCols[x].id.substr(2)].callObj);
|
||||||
CR.callRoster[spotCols[x].id.substr(2)].callObj
|
|
||||||
);
|
|
||||||
if (CR.rosterSettings.onlySpot && spotCols[x].innerHTML == "")
|
|
||||||
{
|
|
||||||
viewRoster();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1099,8 +1093,6 @@ function wantedChanged(element)
|
||||||
|
|
||||||
function valuesChanged()
|
function valuesChanged()
|
||||||
{
|
{
|
||||||
setVisual();
|
|
||||||
|
|
||||||
CR.rosterSettings.callsign = callsignNeed.value;
|
CR.rosterSettings.callsign = callsignNeed.value;
|
||||||
CR.rosterSettings.hunting = huntMode.value;
|
CR.rosterSettings.hunting = huntMode.value;
|
||||||
CR.rosterSettings.huntNeed = huntNeed.value;
|
CR.rosterSettings.huntNeed = huntNeed.value;
|
||||||
|
@ -1155,7 +1147,8 @@ function valuesChanged()
|
||||||
{
|
{
|
||||||
window.opener.GT.callRoster[callHash].callObj.alerted = false;
|
window.opener.GT.callRoster[callHash].callObj.alerted = false;
|
||||||
}
|
}
|
||||||
viewRoster();
|
|
||||||
|
setVisual();
|
||||||
}
|
}
|
||||||
|
|
||||||
function loadFilterSettings()
|
function loadFilterSettings()
|
||||||
|
|
|
@ -182,6 +182,12 @@ function processRosterFiltering(callRoster, rosterSettings)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (CR.rosterSettings.columns.Spot == true && CR.rosterSettings.onlySpot == true && (callObj.spot.when == 0 || (timeNowSec() - callObj.spot.when > window.opener.GT.receptionSettings.viewHistoryTimeSec)))
|
||||||
|
{
|
||||||
|
entry.tx = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
let usesOneOf = 0;
|
let usesOneOf = 0;
|
||||||
let checkUses = 0;
|
let checkUses = 0;
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue