Merge branch 'aa5sh_588' into testing_0.42

foldynl · Feb 2, 2025 · 7e054ac · 7e054ac
2 parents 183d2e0 + 873d44f
commit 7e054ac
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/ui/AwardsDialog.cpp b/ui/AwardsDialog.cpp
@@ -342,6 +342,17 @@ void AwardsDialog::refreshTable(int)
 
     addlCTEs.append(sourceContactsTable);
 
+    QString totalTable;
+
+    if (awardSelected == "dxcc")
+    {
+        totalTable = "dxcc_entities d   LEFT OUTER JOIN source_contacts c ON d.id = c.dxcc";
+    }
+    else
+    {
+        totalTable = "source_contacts c";
+    }
+
     QString finalSQL(QString(
               "WITH "
               "   %1, "
@@ -352,12 +363,12 @@ void AwardsDialog::refreshTable(int)
               "     GROUP BY  1,2) "
               "SELECT * FROM ( "
               "     SELECT 0 column_idx, '%6', COUNT(DISTINCT %7), %8"
-              "     FROM source_contacts c INNER JOIN modes m ON c.mode = m.name"
+              "     FROM %23 INNER JOIN modes m ON c.mode = m.name"
               "     WHERE m.dxcc IN (%9)"
               "           %10"
               "   UNION ALL "
               "     SELECT 0 column_idx, '%11', COUNT(DISTINCT %12), %13"
-              "     FROM source_contacts c INNER JOIN modes m ON c.mode = m.name "
+              "     FROM %23 INNER JOIN modes m ON c.mode = m.name "
               "     WHERE (%14)"
               "           AND m.dxcc IN (%15)"
               "           %16"
@@ -406,7 +417,7 @@ void AwardsDialog::refreshTable(int)
                                                            tr("Worked")).arg(
                                                            stmt_sum_worked.join(","),
                                                            stmt_sum_total.join(","),
-                                                           ui->notWorkedCheckBox->isChecked() ? QString("HAVING %1").arg(stmt_having.join(" AND ")) : QString() ));
+                                                           ui->notWorkedCheckBox->isChecked() ? QString("HAVING %1").arg(stmt_having.join(" AND ")) : QString(),totalTable ));
     qDebug(runtime) << finalSQL;
 
     detailedViewModel->setQuery(finalSQL);