diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0f28c..0354cad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog +- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY. - [24-12-6] Add RTC to K1USN. -[24-12-5-1] ARRL 160 gets rtc. - [24-12-5] Add 'real time' score posting to external sites. diff --git a/README.md b/README.md index 4efbb29..a036913 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's. ## Recent Changes (Polishing the Turd) +- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY. - [24-12-6] Add RTC to K1USN. -[24-12-5-1] ARRL 160 gets rtc. - [24-12-5] Add 'real time' score posting to external sites. diff --git a/not1mm/lib/version.py b/not1mm/lib/version.py index f269c18..26ce08d 100644 --- a/not1mm/lib/version.py +++ b/not1mm/lib/version.py @@ -1,3 +1,3 @@ """It's the version""" -__version__ = "24.12.6" +__version__ = "24.12.8" diff --git a/not1mm/plugins/weekly_rtty.py b/not1mm/plugins/weekly_rtty.py index 35dff70..94a2c8a 100644 --- a/not1mm/plugins/weekly_rtty.py +++ b/not1mm/plugins/weekly_rtty.py @@ -34,7 +34,7 @@ from PyQt6 import QtWidgets from not1mm.lib.ham_utility import get_logged_band -from not1mm.lib.plugin_common import gen_adif, get_points +from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml from not1mm.lib.version import __version__ logger = logging.getLogger(__name__) @@ -138,9 +138,9 @@ def points(self): def show_mults(self): """Return display string for mults""" - result = self.database.fetch_section_band_count_nodx() + result = self.database.fetch_call_count() if result: - return int(result.get("sb_count", 0)) + return int(result.get("call_count", 0)) return 0 @@ -594,3 +594,23 @@ def check_call_history(self): self.other_1.setText(f"{result.get('Name', '')}") if self.other_2.text() == "": self.other_2.setText(f"{result.get('Sect', '')}") + + +# --------RTC Stuff----------- +def get_mults(self): + """""" + + mults = {} + mults["prefix"] = show_mults(self) + return mults + + +def just_points(self): + """""" + result = self.database.fetch_points() + if result is not None: + score = result.get("Points", "0") + if score is None: + score = "0" + return int(score) + return 0 diff --git a/pyproject.toml b/pyproject.toml index c1ad23f..9a4aaf2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "not1mm" -version = "24.12.6" +version = "24.12.8" description = "NOT1MM Logger" readme = "README.md" requires-python = ">=3.9"