diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 9853888d2..a2faefbe7 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -16,6 +16,7 @@ function echo_table_header_col($name) { case 'Frequency': echo ''.__("Frequency").''; break; case 'Operator': echo ''.__("Operator").''; break; case 'Name': echo ''.__("Name").''; break; + case 'Bearing': echo ''.__("Bearing").''; break; } } @@ -36,6 +37,7 @@ function echo_table_col($row, $name) { } echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ''; break; case 'Distance':echo '' . getDistance($row->COL_DISTANCE) . ''; break; + case 'Bearing':echo '' . getBearing($row->COL_GRIDSQUARE) . ''; 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_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { if($row->COL_FREQ != null) { echo $ci->frequency->qrg_conversion($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break; @@ -45,6 +47,19 @@ function echo_table_col($row, $name) { } } +function getBearing($grid = '') { + if ($grid == '') return ''; + $ci =& get_instance(); + if (($ci->session->userdata('user_locator') ?? '') != '') { + $ci->load->library('qra'); + $bearing=$ci->qra->get_bearing($ci->session->userdata('user_locator'),$grid); + return($bearing.'°'); + } else { + return ''; + } +} + + function getDistance($distance) { if (($distance ?? 0) == 0) return ''; diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 99c060074..3e6b5c17d 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -254,6 +254,7 @@ + @@ -276,6 +277,7 @@ + @@ -298,6 +300,7 @@ + @@ -320,6 +323,7 @@ + @@ -344,6 +348,7 @@ + diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 7d2be8f7d..f0581a556 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -17,6 +17,7 @@ function echo_table_header_col($ctx, $name) { case 'Operator': echo ''.__("Operator").''; break; case 'Location': echo ''.__("Station Location").''; break; case 'Name': echo ''.__("Name").''; break; + case 'Bearing': echo ''.__("Bearing").''; break; } } @@ -37,6 +38,7 @@ function echo_table_col($row, $name) { } echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ''; break; case 'Distance':echo '' . getDistance($row->COL_DISTANCE) . ''; break; + case 'Bearing':echo '' . getBearing($row->COL_GRIDSQUARE) . ''; break; case 'Band': echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).''; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break; case 'Frequency': @@ -48,6 +50,18 @@ function echo_table_col($row, $name) { } } +function getBearing($grid = '') { + if ($grid == '') return ''; + $ci =& get_instance(); + if (($ci->session->userdata('user_locator') ?? '') != '') { + $ci->load->library('qra'); + $bearing=$ci->qra->get_bearing($ci->session->userdata('user_locator'),$grid); + return($bearing.'°'); + } else { + return ''; + } +} + function getDistance($distance) { if (($distance ?? 0) == 0) return '';