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 '' . $band . ' | ';
- } else {
- $addsat='' . $band . ' | ';
+ echo '
+
+
+
+ | # |
+ ' . __("DXCC Name") . ' |
+ ' . __("Prefix") . ' | ';
+ foreach($bands as $band) {
+ echo '' . $band . ' | ';
}
- }
- echo '' . __("Total") . ' | ';
- if (count($bands) > 1) {
- echo ' | ';
- }
- echo $addsat;
- echo '
-
-
-
-
- | ' . __("Total worked") . ' | ';
- $addsat='';
- foreach ($dxcc_summary['worked'] as $band => $dxcc) { // Fills the table with the data
- if ($band != 'SAT') {
- echo '';
- if ($band == 'Total') {
- echo ''.$dxcc.'';
- } else {
- echo $dxcc;
- }
- echo ' | ';
- } else {
- $addsat='' . $dxcc . ' | ';
+ 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 '' . $band . ' | ';
+ } else {
+ $addsat='' . $band . ' | ';
+ }
+ }
+ echo '' . __("Total") . ' | ';
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
+ echo $addsat;
+ echo '
+
+
+
+
+ | ' . __("Total worked") . ' | ';
+ $addsat='';
+ foreach ($dxcc_summary['worked'] as $band => $dxcc) { // Fills the table with the data
+ if ($band != 'SAT') {
+ echo '';
+ if ($band == 'Total') {
+ echo ''.$dxcc.'';
+ } else {
+ echo $dxcc;
+ }
+ echo ' | ';
+ } else {
+ $addsat='' . $dxcc . ' | ';
+ }
+ }
if ($addsat != '' && count($dxcc_summary['worked']) > 1) {
- if (count($bands) > 1) {
- echo ' | ';
- }
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
echo $addsat;
}
- echo '
- | ' . __("Total confirmed") . ' | ';
+ echo '
+ | ' . __("Total confirmed") . ' | ';
$addsat='';
- foreach ($dxcc_summary['confirmed'] as $band => $dxcc) { // Fills the table with the data
- if ($band != 'SAT') {
- echo '';
- if ($band == 'Total') {
- echo ''.$dxcc.'';
- } else {
- echo $dxcc;
- }
- echo ' | ';
- } else {
- $addsat='' . $dxcc . ' | ';
- }
- }
+ foreach ($dxcc_summary['confirmed'] as $band => $dxcc) { // Fills the table with the data
+ if ($band != 'SAT') {
+ echo '';
+ if ($band == 'Total') {
+ echo ''.$dxcc.'';
+ } else {
+ echo $dxcc;
+ }
+ echo ' | ';
+ } else {
+ $addsat='' . $dxcc . ' | ';
+ }
+ }
if ($addsat != '' && count($dxcc_summary['confirmed']) > 1) {
- if (count($bands) > 1) {
- echo ' | ';
- }
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
echo $addsat;
}
- echo '
-
- ';
+ echo '
+
+ ';
- }
- else {
- echo '' . __("Nothing found!") . '
';
+ } else {
+ echo '' . __("Nothing found!") . '
';
}
?>
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 '' . $band . ' | ';
- }
- echo '' . __("Total") . ' |
';
-
+ $addsat='';
+ foreach($bands as $band) {
+ if ($band != 'SAT') {
+ echo '' . $band . ' | ';
+ } else {
+ $addsat='' . $band . ' | ';
+ }
+ }
+ echo '' . __("Total") . ' | ';
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
+ echo $addsat;
echo '
| ' . __("Total worked") . ' | ';
- foreach ($iota_summary['worked'] as $dxcc) { // Fills the table with the data
- echo '' . $dxcc . ' | ';
- }
+ $addsat='';
+ foreach ($iota_summary['worked'] as $band => $iota) { // Fills the table with the data
+ if ($band != 'SAT') {
+ echo '';
+ if ($band == 'Total') {
+ echo ''.$iota.'';
+ } else {
+ echo $iota;
+ }
+ echo ' | ';
+ } else {
+ $addsat='' . $iota . ' | ';
+ }
+ }
+ if ($addsat != '' && count($iota_summary['worked']) > 1) {
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
+ echo $addsat;
+ }
- echo '
- | ' . __("Total confirmed") . ' | ';
- foreach ($iota_summary['confirmed'] as $dxcc) { // Fills the table with the data
- echo '' . $dxcc . ' | ';
- }
+ echo '
+ | ' . __("Total confirmed") . ' | ';
+
+ $addsat='';
+ foreach ($iota_summary['confirmed'] as $band => $iota) { // Fills the table with the data
+ if ($band != 'SAT') {
+ echo '';
+ if ($band == 'Total') {
+ echo ''.$iota.'';
+ } else {
+ echo $iota;
+ }
+ echo ' | ';
+ } else {
+ $addsat='' . $iota . ' | ';
+ }
+ }
+ if ($addsat != '' && count($iota_summary['confirmed']) > 1) {
+ if (count($bands) > 1) {
+ echo ' | ';
+ }
+ echo $addsat;
+ }
echo '