not1mm 25.6.4__tar.gz → 25.6.5__tar.gz

{not1mm-25.6.4 → not1mm-25.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.4
+Version: 25.6.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later

{not1mm-25.6.4 → not1mm-25.6.5}/not1mm/dxcc_tracker.py

@@ -49,7 +49,7 @@ class DXCCWindow(QDockWidget):
         self.model = CustomSqlModel(self)
         query = QSqlQuery(self.db)
         query.prepare(
-            """
+            f"""
             SELECT CountryPrefix,
                 SUM(CASE WHEN Band = 1.8 THEN 1 ELSE 0 END) AS '160m',
                 SUM(CASE WHEN Band = 3.5 THEN 1 ELSE 0 END) AS '80m',
@@ -58,7 +58,7 @@ class DXCCWindow(QDockWidget):
                 SUM(CASE WHEN Band = 21.0 THEN 1 ELSE 0 END) AS '15m',
                 SUM(CASE WHEN Band = 28.0 THEN 1 ELSE 0 END) AS '10m',
                 COUNT(*) AS Total
-            FROM DXLOG
+            FROM DXLOG where ContestNR = {self.pref.get('contest', 1)} 
             GROUP BY CountryPrefix
             ORDER BY Total DESC
             """
@@ -121,7 +121,7 @@ class DXCCWindow(QDockWidget):
             print("Error: Could not open database")
             return
         self.setWindowTitle(
-            f"Log Display - {self.pref.get('current_database', 'ham.db')}"
+            f"DXCC Tracker - {self.pref.get('current_database', 'ham.db')}"
         )
 
     def msg_from_main(self, msg):

{not1mm-25.6.4 → not1mm-25.6.5}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.6.4"
+__version__ = "25.6.5"

{not1mm-25.6.4 → not1mm-25.6.5}/not1mm/statistics.py

@@ -107,27 +107,41 @@ class StatsWindow(QDockWidget):
         for band in result:
             query = f"select count(*) as qs, count(DISTINCT(Call)) as calls, sum(Points) as points from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}';"
             result = self.database.exec_sql(query)
-            item = QtWidgets.QTableWidgetItem(str(band.get("band", "")))
+            item = QtWidgets.QTableWidgetItem(
+                str(band.get("band", "")).replace("None", "")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 0, item)
-            item = QtWidgets.QTableWidgetItem(str(result.get("qs", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("qs", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 1, item)
-            item = QtWidgets.QTableWidgetItem(str(result.get("calls", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("calls", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 2, item)
-            item = QtWidgets.QTableWidgetItem(str(result.get("points", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("points", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 6, item)
             query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE WHEN Mode IN ('LSB','USB','SSB','FM','AM') THEN 'PH' WHEN Mode IN ('CW','CW-R') THEN 'CW' WHEN Mode IN ('FT8','FT4','RTTY','PSK31','FSK441','MSK144','JT65','JT9','Q65') THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}') as sortedmode;"
             result = self.database.exec_sql(query)
-            item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("CW", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 3, item)
-            item = QtWidgets.QTableWidgetItem(str(result.get("PH", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("PH", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 4, item)
-            item = QtWidgets.QTableWidgetItem(str(result.get("DI", "0")))
+            item = QtWidgets.QTableWidgetItem(
+                str(result.get("DI", "0")).replace("None", "0")
+            )
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 5, item)
 
@@ -137,25 +151,37 @@ class StatsWindow(QDockWidget):
         item = QtWidgets.QTableWidgetItem("TOTAL")
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 0, item)
-        item = QtWidgets.QTableWidgetItem(str(result.get("qs", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("qs", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 1, item)
-        item = QtWidgets.QTableWidgetItem(str(result.get("calls", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("calls", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 2, item)
-        item = QtWidgets.QTableWidgetItem(str(result.get("points", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("points", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 6, item)
 
         query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE WHEN Mode IN ('LSB','USB','SSB','FM','AM') THEN 'PH' WHEN Mode IN ('CW','CW-R') THEN 'CW' WHEN Mode In ('FT8','FT4','RTTY','PSK31','FSK441','MSK144','JT65','JT9','Q65') THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest}) as sortedmode;"
         result = self.database.exec_sql(query)
-        item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("CW", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 3, item)
-        item = QtWidgets.QTableWidgetItem(str(result.get("PH", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("PH", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 4, item)
-        item = QtWidgets.QTableWidgetItem(str(result.get("DI", "0")))
+        item = QtWidgets.QTableWidgetItem(
+            str(result.get("DI", "0")).replace("None", "0")
+        )
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 5, item)
         self.tableWidget.resizeColumnsToContents()

{not1mm-25.6.4 → not1mm-25.6.5}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.4
+Version: 25.6.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later

{not1mm-25.6.4 → not1mm-25.6.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.6.4"
+version = "25.6.5"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"