diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 57f6e28d8..70472b050 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -217,110 +217,109 @@ - - - # - ' . __("DXCC Name") . ' - ' . __("Prefix") . ''; - foreach($bands as $band) { - echo '' . $band . ''; - } - echo ' - - '; - foreach ($dxcc_array as $dxcc => $value) { // Fills the table with the data - echo ' - '. $i++ .''; - foreach ($value as $name => $key) { - if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") { - echo '' . $key . ' '.__("Deleted DXCC").''; - } else if ($name == "Deleted") { - continue; - } else { - echo '' . $key . ''; - } - } - echo ''; - } - echo ' -

' . __("Summary") . '

- - - - '; - - $addsat=''; - foreach($bands as $band) { - if ($band != 'SAT') { - echo ''; - } else { - $addsat=''; + echo ' +
' . $band . '' . $band . '
+ + + + + '; + foreach($bands as $band) { + echo ''; } - } - echo ''; - if (count($bands) > 1) { - echo ''; - } - echo $addsat; - echo ' - - - - - '; - $addsat=''; - foreach ($dxcc_summary['worked'] as $band => $dxcc) { // Fills the table with the data - if ($band != 'SAT') { - echo ''; - } else { - $addsat=''; + echo ' + + '; + foreach ($dxcc_array as $dxcc => $value) { // Fills the table with the data + echo ' + '; + foreach ($value as $name => $key) { + if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") { + echo ''; + } else if ($name == "Deleted") { + continue; + } else { + echo ''; + } + } + echo ''; } - } + echo '
#' . __("DXCC Name") . '' . __("Prefix") . '' . $band . '' . __("Total") . '
' . __("Total worked") . ''; - if ($band == 'Total') { - echo ''.$dxcc.''; - } else { - echo $dxcc; - } - echo '' . $dxcc . '
'. $i++ .'' . $key . ' '.__("Deleted DXCC").'' . $key . '
+

' . __("Summary") . '

+ + + + '; + + $addsat=''; + foreach($bands as $band) { + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } + echo ''; + if (count($bands) > 1) { + echo ''; + } + echo $addsat; + echo ' + + + + + '; + $addsat=''; + foreach ($dxcc_summary['worked'] as $band => $dxcc) { // Fills the table with the data + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } if ($addsat != '' && count($dxcc_summary['worked']) > 1) { - if (count($bands) > 1) { - echo ''; - } + if (count($bands) > 1) { + echo ''; + } echo $addsat; } - echo ' - '; + echo ' + '; $addsat=''; - foreach ($dxcc_summary['confirmed'] as $band => $dxcc) { // Fills the table with the data - if ($band != 'SAT') { - echo ''; - } else { - $addsat=''; - } - } + foreach ($dxcc_summary['confirmed'] as $band => $dxcc) { // Fills the table with the data + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } if ($addsat != '' && count($dxcc_summary['confirmed']) > 1) { - if (count($bands) > 1) { - echo ''; - } + if (count($bands) > 1) { + echo ''; + } echo $addsat; } - echo ' -
' . $band . '' . $band . '' . __("Total") . '
' . __("Total worked") . ''; + if ($band == 'Total') { + echo ''.$dxcc.''; + } else { + echo $dxcc; + } + echo '' . $dxcc . '
' . __("Total confirmed") . '
' . __("Total confirmed") . ''; - if ($band == 'Total') { - echo ''.$dxcc.''; - } else { - echo $dxcc; - } - echo '' . $dxcc . ''; + if ($band == 'Total') { + echo ''.$dxcc.''; + } else { + echo $dxcc; + } + echo '' . $dxcc . '
- '; + echo ' + + '; - } - else { - echo ''; + } else { + echo ''; } ?> diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 643449877..26169def2 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -220,26 +220,68 @@ '; - - foreach($bands as $band) { - echo ''; - } - echo ''; - + $addsat=''; + foreach($bands as $band) { + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } + echo ''; + if (count($bands) > 1) { + echo ''; + } + echo $addsat; echo ''; - foreach ($iota_summary['worked'] as $dxcc) { // Fills the table with the data - echo ''; - } + $addsat=''; + foreach ($iota_summary['worked'] as $band => $iota) { // Fills the table with the data + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } + if ($addsat != '' && count($iota_summary['worked']) > 1) { + if (count($bands) > 1) { + echo ''; + } + echo $addsat; + } - echo ' - '; - foreach ($iota_summary['confirmed'] as $dxcc) { // Fills the table with the data - echo ''; - } + echo ' + '; + + $addsat=''; + foreach ($iota_summary['confirmed'] as $band => $iota) { // Fills the table with the data + if ($band != 'SAT') { + echo ''; + } else { + $addsat=''; + } + } + if ($addsat != '' && count($iota_summary['confirmed']) > 1) { + if (count($bands) > 1) { + echo ''; + } + echo $addsat; + } echo '
' . $band . '' . __("Total") . '
' . $band . '' . $band . '' . __("Total") . '
' . __("Total worked") . '' . $dxcc . ''; + if ($band == 'Total') { + echo ''.$iota.''; + } else { + echo $iota; + } + echo '' . $iota . '
' . __("Total confirmed") . '' . $dxcc . '
' . __("Total confirmed") . ''; + if ($band == 'Total') { + echo ''.$iota.''; + } else { + echo $iota; + } + echo '' . $iota . '