Skip to content

Commit

Permalink
0.42.13 Awards - Fixed country awards with required qualifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
classaxe committed Mar 6, 2020
1 parent 280f10f commit 42df36e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
6 changes: 3 additions & 3 deletions public/css/style.css
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.min.css

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/Controller/Web/Listeners/ListenerAwards.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ private function getCountryDx($award)
}
$filtered[$s['khz'].'-'.$s['call']] = $s;
}
$offset = 0;
$result['total'] = count($filtered);

if ($spec['ALL']) {
Expand 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++) {
Expand Down
2 changes: 1 addition & 1 deletion src/css/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ fieldset#form_range_units {
}
.unqualified {
div {
border: 1px solid #a66;
border: 1px dashed #a66;
background: #ffe0e0;
a {
color: #800;
Expand Down

0 comments on commit 42df36e

Please sign in to comment.