diff --git a/debian/changelog b/debian/changelog index bdbd83c..abdc920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +gridtracker (1.22.1009) unstable; urgency=low + - Fix issue loading logs and generating scores tab + + -- Tag Loomis Sat, 08 Oct 2022 12:00:00 -0000 + gridtracker (1.22.1008) unstable; urgency=low - Fix missing callsigns in mh-root when importing BIGCTY diff --git a/gridtracker.spec b/gridtracker.spec index 1056ce6..faa2e06 100644 --- a/gridtracker.spec +++ b/gridtracker.spec @@ -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 - 1.22.1009-1 + - Fix issue with loading logs and generating scores * Sat Oct 08 2022 Matthew Chambers - 1.22.1008-1 - Fix missing callsigns in mh-root when importing BIGCTY * Fri Oct 07 2022 Matthew Chambers - 1.22.1006-1 diff --git a/package.nw/gt_update.odt b/package.nw/gt_update.odt index e8b11b2..a9c9cff 100644 Binary files a/package.nw/gt_update.odt and b/package.nw/gt_update.odt differ diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 2a51769..200bcc8 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -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) diff --git a/package.nw/package.json b/package.nw/package.json index e726be3..838d86e 100644 --- a/package.nw/package.json +++ b/package.nw/package.json @@ -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",