OAMS column fix, BA score change

merge-requests/237/merge
Tag 2023-01-29 16:08:02 -08:00
rodzic 594adcf259
commit decfe19803
3 zmienionych plików z 16 dodań i 8 usunięć

Wyświetl plik

@ -177,11 +177,10 @@
<input type="checkbox" id="huntPOTA" onchange="wantedChanged(this);" /> <input type="checkbox" id="huntPOTA" onchange="wantedChanged(this);" />
<label data-i18n="roster.secondary.wanted.pota" for="huntPOTA" title="Parks On The Air">POTA</label> <label data-i18n="roster.secondary.wanted.pota" for="huntPOTA" title="Parks On The Air">POTA</label>
</div> </div>
<div> <div id="huntingMatrixOAMSDiv">
<input type="checkbox" id="huntOAMS" onchange="wantedChanged(this);" /> <input type="checkbox" id="huntOAMS" onchange="wantedChanged(this);" />
<label data-i18n="roster.secondary.wanted.OAMS" for="huntOAMS" title="Off-Air Message Service Users">OAMS</label> <label data-i18n="roster.secondary.wanted.OAMS" for="huntOAMS" title="Off-Air Message Service Users">OAMS</label>
</div> </div>
<div> <div>
</div> </div>
<div> <div>

Wyświetl plik

@ -10437,6 +10437,7 @@ function toggleGtShareEnable()
else g_appSettings.gtShareEnable = true; else g_appSettings.gtShareEnable = true;
setGtShareButtons(); setGtShareButtons();
goProcessRoster();
} }
function setGtShareButtons() function setGtShareButtons()
@ -10590,6 +10591,7 @@ function setMsgEnable(checkbox)
} }
} }
} }
goProcessRoster();
g_gtLiveStatusUpdate = true; g_gtLiveStatusUpdate = true;
setMsgSettingsView(); setMsgSettingsView();
} }
@ -10723,11 +10725,11 @@ function renderBandActivity()
if (place.oamsRx > 0) if (place.oamsRx > 0)
{ {
place.oamsScore = parseInt((place.oamsDecodes > place.oamsRxSpots) ? (place.oamsDecodes / place.oamsRx) + (place.oamsTxSpots * place.oamsTx) : (place.oamsRxSpots / place.oamsRx) + (place.oamsTxSpots * place.oamsTx)); place.oamsScore = parseInt((place.oamsDecodes > place.oamsRxSpots) ? (place.oamsDecodes / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0) : (place.oamsRxSpots / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0));
} }
else else
{ {
place.oamsScore = parseInt(place.oamsTxSpots * place.oamsTx); place.oamsScore = parseInt(place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0);
} }
if (maxValue < place.oamsScore) maxValue = place.oamsScore; if (maxValue < place.oamsScore) maxValue = place.oamsScore;
} }
@ -10808,10 +10810,7 @@ function pskGetBandActivity()
if (myMode.length > 0 && myDEGrid.length > 0 && g_timeNow > g_bandActivity.lastUpdate[myMode]) if (myMode.length > 0 && myDEGrid.length > 0 && g_timeNow > g_bandActivity.lastUpdate[myMode])
{ {
getBuffer( getBuffer(
"https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" + "https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" + myMode + "&grid=" + myDEGrid.substr(0, 4) + "&cb=" + timeNowSec(),
myMode +
"&grid=" +
myDEGrid.substr(0, 4),
pskBandActivityCallback, pskBandActivityCallback,
null, null,
"https", "https",

Wyświetl plik

@ -33,6 +33,16 @@ function renderRoster(callRoster, rosterSettings)
columnOverrides.LoTW = false; columnOverrides.LoTW = false;
} }
if (rosterSettings.canMsg == true)
{
huntingMatrixOAMSDiv.style.display = "";
}
else
{
huntingMatrixOAMSDiv.style.display = "none";
columnOverrides.OAMS = false;
}
if (window.opener.g_appSettings.potaEnabled === 1) if (window.opener.g_appSettings.potaEnabled === 1)
{ {
huntingMatrixPotaDiv.style.display = ""; huntingMatrixPotaDiv.style.display = "";