0.42.13 Awards - Fixed country awards with required qualifiers

classaxe · Mar 6, 2020 · 42df36e · 42df36e
1 parent 280f10f
commit 42df36e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -1,8 +1,8 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    0.42.10
- * Date:       2020-03-04
+ * Version:    0.42.13
+ * Date:       2020-03-06
  * Licence:    LGPL
  * Copyright:  2020 Martin Francis
  */
@@ -1338,7 +1338,7 @@ fieldset#form_range_units div label {
   border-width: 3px;
 }
 .results.award-signals .unqualified div {
-  border: 1px solid #a66;
+  border: 1px dashed #a66;
   background: #ffe0e0;
 }
 .results.award-signals .unqualified div a {

diff --git a/public/css/style.min.css b/public/css/style.min.css
diff --git a/src/Controller/Web/Listeners/ListenerAwards.php b/src/Controller/Web/Listeners/ListenerAwards.php
@@ -140,7 +140,6 @@ private function getCountryDx($award)
             }
             $filtered[$s['khz'].'-'.$s['call']] = $s;
         }
-        $offset = 0;
         $result['total'] = count($filtered);
 
         if ($spec['ALL']) {
@@ -162,9 +161,13 @@ private function getCountryDx($award)
                         unset($filtered[array_search($r, $filtered)]);
                     }
                 }
+                if ($result['total'] < $range) {
+                    break;
+                }
             }
         }
 
+        $offset = 0;
         foreach ($spec['QTY'] as $range) {
             $taken = count($result[$range]);
             for ($i = 0; $i < $range - $offset - $taken; $i++) {

diff --git a/src/css/style.less b/src/css/style.less
@@ -1280,7 +1280,7 @@ fieldset#form_range_units {
     }
     .unqualified {
         div {
-            border: 1px solid #a66;
+            border: 1px dashed #a66;
             background: #ffe0e0;
             a {
                 color: #800;