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

Further fixes for CQz and ITUz non-array support 

Fixes issues in 1008
merge-requests/227/head test_1.22.1009
Tag 2022-10-08 10:33:20 -07:00
rodzic b82c1a432d
commit 41a6d15da8
5 zmienionych plików z 66 dodań i 58 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
debian/changelog vendored
Wyświetl plik

@ -1,3 +1,8 @@
gridtracker (1.22.1009) unstable; urgency=low
- Fix issue loading logs and generating scores tab
-- Tag Loomis <n0ttl@gridtracker.org> Sat, 08 Oct 2022 12:00:00 -0000
gridtracker (1.22.1008) unstable; urgency=low
- Fix missing callsigns in mh-root when importing BIGCTY

4
gridtracker.spec
Wyświetl plik

@ -1,6 +1,6 @@
Name: {{{ git_name name=gridtracker }}}
Summary: GridTracker: An amateur radio companion to WSJT-X or JTDX
Version: {{{ git_version lead=1.22.1008 }}}
Version: {{{ git_version lead=1.22.1009 }}}
Release: 1%{?dist}
BuildArch: noarch
Source0: {{{ git_dir_pack }}}
@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
%license %{_docdir}/%{name}/
%changelog
* Sat Oct 08 2022 Tag Loomis <n0ttl@gridtracker.org> - 1.22.1009-1
- Fix issue with loading logs and generating scores
* Sat Oct 08 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1008-1
- Fix missing callsigns in mh-root when importing BIGCTY
* Fri Oct 07 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.1006-1

BIN
package.nw/gt_update.odt
Wyświetl plik

Plik binarny nie jest wyświetlany.

113
package.nw/lib/gt.js
Wyświetl plik

@ -1371,7 +1371,7 @@ function addDeDx(
g_tracker.confirmed.grid[fourGrid + band + "dg"] = true;
}
}
if (details.ituz.length > 0)
if (details.ituz && details.ituz.length > 0)
{
g_tracker.confirmed.ituz[details.ituz + "|" + band + mode] = true;
g_tracker.confirmed.ituz[details.ituz + "|"] = true;
@ -1383,7 +1383,7 @@ function addDeDx(
g_tracker.confirmed.ituz[details.ituz + "|" + band + "dg"] = true;
}
}
if (details.cqz.length > 0)
if (details.cqz && details.cqz.length > 0)
{
g_tracker.confirmed.cqz[details.cqz + "|" + band + mode] = true;
g_tracker.confirmed.cqz[details.cqz + "|"] = true;
@ -9681,7 +9681,7 @@ function renderStatsBox()
);
}
if (cqz.length > 0)
if (cqz && cqz.length > 0)
{
var name = g_cqZones[cqz].name;
if (!(name in cqZones)) cqZones[name] = newStatObject();
@ -9689,7 +9689,7 @@ function renderStatsBox()
workObject(cqZones[name], false, band, mode, type, didConfirm);
}
if (ituz.length > 0)
if (ituz && ituz.length > 0)
{
if (!(ituz in ituZones)) ituZones[ituz] = newStatObject();
@ -10580,6 +10580,59 @@ function redrawGrids()
~~g_worldGeoData[g_dxccToGeoData[finalDxcc]].confirmed_modes[mode] +
1;
}
if (cqz && cqz.length > 0)
{
if (g_cqZones[cqz].worked == false)
{
g_cqZones[cqz].worked = worked;
}
if (worked)
{
g_cqZones[cqz].worked_bands[band] =
~~g_cqZones[cqz].worked_bands[band] + 1;
g_cqZones[cqz].worked_modes[mode] =
~~g_cqZones[cqz].worked_modes[mode] + 1;
}
if (g_cqZones[cqz].confirmed == false)
{
g_cqZones[cqz].confirmed = didConfirm;
}
if (didConfirm)
{
g_cqZones[cqz].confirmed_bands[band] =
~~g_cqZones[cqz].confirmed_bands[band] + 1;
g_cqZones[cqz].confirmed_modes[mode] =
~~g_cqZones[cqz].confirmed_modes[mode] + 1;
}
}
if (ituz && ituz.length > 0)
{
if (g_ituZones[ituz].worked == false)
{
g_ituZones[ituz].worked = worked;
}
if (worked)
{
g_ituZones[ituz].worked_bands[band] =
~~g_ituZones[ituz].worked_bands[band] + 1;
g_ituZones[ituz].worked_modes[mode] =
~~g_ituZones[ituz].worked_modes[mode] + 1;
}
if (g_ituZones[ituz].confirmed == false)
{
g_ituZones[ituz].confirmed = didConfirm;
}
if (didConfirm)
{
g_ituZones[ituz].confirmed_bands[band] =
~~g_ituZones[ituz].confirmed_bands[band] + 1;
g_ituZones[ituz].confirmed_modes[mode] =
~~g_ituZones[ituz].confirmed_modes[mode] + 1;
}
}
if (finalGrid.length > 0)
{
var gridCheck = finalGrid.substr(0, 4);
@ -10609,58 +10662,6 @@ function redrawGrids()
~~g_us48Data[gridCheck].confirmed_modes[mode] + 1;
}
}
if (cqz.length > 0)
{
if (g_cqZones[cqz].worked == false)
{
g_cqZones[cqz].worked = worked;
}
if (worked)
{
g_cqZones[cqz].worked_bands[band] =
~~g_cqZones[cqz].worked_bands[band] + 1;
g_cqZones[cqz].worked_modes[mode] =
~~g_cqZones[cqz].worked_modes[mode] + 1;
}
if (g_cqZones[cqz].confirmed == false)
{
g_cqZones[cqz].confirmed = didConfirm;
}
if (didConfirm)
{
g_cqZones[cqz].confirmed_bands[band] =
~~g_cqZones[cqz].confirmed_bands[band] + 1;
g_cqZones[cqz].confirmed_modes[mode] =
~~g_cqZones[cqz].confirmed_modes[mode] + 1;
}
}
if (ituz.length > 0)
{
if (g_ituZones[ituz].worked == false)
{
g_ituZones[ituz].worked = worked;
}
if (worked)
{
g_ituZones[ituz].worked_bands[band] =
~~g_ituZones[ituz].worked_bands[band] + 1;
g_ituZones[ituz].worked_modes[mode] =
~~g_ituZones[ituz].worked_modes[mode] + 1;
}
if (g_ituZones[ituz].confirmed == false)
{
g_ituZones[ituz].confirmed = didConfirm;
}
if (didConfirm)
{
g_ituZones[ituz].confirmed_bands[band] =
~~g_ituZones[ituz].confirmed_bands[band] + 1;
g_ituZones[ituz].confirmed_modes[mode] =
~~g_ituZones[ituz].confirmed_modes[mode] + 1;
}
}
}
for (var key in g_QSOhash[i].vucc_grids)

2
package.nw/package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "GridTracker",
"product_string_do_not_use": "gridtracker",
"version": "1.22.1008",
"version": "1.22.1009",
"betaVersion": "",
"description": "GridTracker, an amateur radio companion",
"author": "GridTracker.org",