diff --git a/application/libraries/Qra.php b/application/libraries/Qra.php index f887d7ba0..7b6675638 100644 --- a/application/libraries/Qra.php +++ b/application/libraries/Qra.php @@ -114,11 +114,14 @@ class Qra { return array($lat * 180 / pi(), $lon * 180 / pi()); } - function echoQrbCalcLink($mygrid, $grid, $vucc) { + function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor=false) { + $echo = ""; if (!empty($grid)) { - $echo = $grid . ' '; + $echo = $grid; + $echo .= (!$isVisitor)?(' '):''; } else if (!empty($vucc)) { - $echo = $vucc .' '; + $echo = $vucc; + $echo .= (!$isVisitor)?(' '):''; } return $echo; } diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index be0b6bc1a..a4b29a6cc 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -27,7 +27,7 @@ function echo_table_col($row, $name) { case 'SOTA': echo '' . ($row->COL_SOTA_REF) . ''; break; case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ''; break; case 'POTA': echo '' . ($row->COL_POTA_REF) . ''; break; - case 'Grid': echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ''; break; + case 'Grid': echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE, true)) . ''; break; case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo strtolower($row->COL_BAND); } echo ''; break; case 'Frequency': echo ''; if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } echo ''; break;