diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index f55bbe32e..5f42cf33e 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -224,32 +224,56 @@ "; - foreach($bands as $band) { - echo '' . $band . ''; - } - if ($posted_band != 'SAT') { - echo "" . __("Total") . ""; - } + $addsat=''; + foreach($bands as $band) { + if ($band != 'SAT') { + echo '' . $band . ''; + } else { + $addsat='' . $band . ''; + } + } + echo '' . __("Total (ex SAT)") . ''; + if (count($bands) > 1) { + echo ''; + } + echo $addsat; echo " " . __("Total worked") . ""; - + $sat_value = ''; foreach ($cq_summary['worked'] as $cqz => $value) { // Fills the table with the data if ($posted_band == 'SAT' && $cqz == 'Total') { continue; } - echo '' . $value . ''; + if ($cqz == 'SAT') { + $sat_value = '' . $value . ''; + } else { + echo '' . $value . ''; + } } + if (count($bands) > 1) { + echo ''; + } + echo $sat_value; echo " " . __("Total confirmed") . ""; + $sat_value = ''; foreach ($cq_summary['confirmed'] as $cqz => $value) { // Fills the table with the data if ($posted_band == 'SAT' && $cqz == 'Total') { continue; } - echo '' . $value . ''; + if ($cqz == 'SAT') { + $sat_value = '' . $value . ''; + } else { + echo '' . $value . ''; + } } + if (count($bands) > 1) { + echo ''; + } + echo $sat_value; echo '