diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 216dedeae..061c12c7a 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -1319,7 +1319,7 @@ class Logbook extends CI_Controller {
case 'Grid': $ret.= '
' . $this->part_QrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE) . ' | '; break;
case 'Distance': $ret.= '' . (($row->COL_DISTANCE ?? '' != '') ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { $ret.= strtolower($row->COL_BAND); } $ret.= ''; break;
- case 'Frequency': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { $ret.= $this->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= ''; break;
+ case 'Frequency': $ret.= ''; if($row->COL_SAT_NAME != null) { $ret.= ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { $ret.= $this->frequency->qrg_conversion($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= ''; break;
case 'State': $ret.= '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': $ret.= '' . ($row->COL_OPERATOR) . ' | '; break;
}
diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 1d9af0cfd..2ce8a1b7d 100644
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -59,9 +59,9 @@ class Radio extends CI_Controller {
if (empty($row->frequency) || $row->frequency == "0") {
echo "- / - | ";
} elseif (empty($row->frequency_rx) || $row->frequency_rx == "0") {
- echo "" . $this->frequency->hz_to_mhz($row->frequency) . " | ";
+ echo "" . $this->frequency->qrg_conversion($row->frequency) . " | ";
} else {
- echo "" . $this->frequency->hz_to_mhz($row->frequency_rx) . " / " . $this->frequency->hz_to_mhz($row->frequency) . " | ";
+ echo "" . $this->frequency->qrg_conversion($row->frequency_rx) . " / " . $this->frequency->qrg_conversion($row->frequency) . " | ";
}
if (empty($row->mode) || $row->mode == "non") {
diff --git a/application/views/components/radio_display_table.php b/application/views/components/radio_display_table.php
index 78ce5eca7..74deda7a7 100644
--- a/application/views/components/radio_display_table.php
+++ b/application/views/components/radio_display_table.php
@@ -12,7 +12,7 @@
- frequency->hz_to_mhz($row['frequency']); ?> ()
+ frequency->qrg_conversion($row['frequency']); ?> ()
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 793456227..4a8f7d184 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -36,7 +36,7 @@ function echo_table_col($row, $name) {
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_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break;
+ 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;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
case 'Name': echo '' . ($row->COL_NAME) . ' | '; break;
diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php
index de5b457bd..a6e2033c0 100644
--- a/application/views/qso/components/previous_contacts.php
+++ b/application/views/qso/components/previous_contacts.php
@@ -67,7 +67,7 @@ function echo_table_col($row, $name) {
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_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break;
+ 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;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
}
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index 1ec06b442..e81a82db7 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -63,7 +63,7 @@ function echo_table_col($row, $name) {
break;
case 'Frequency':
$CI =& get_instance();
- if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$CI->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } };
+ if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$CI->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } };
break;
case 'State':
echo ($row->COL_STATE);
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 1525af49f..2bdcd47b2 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -36,9 +36,9 @@ function echo_table_col($row, $name) {
echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.$row->COL_SAT_NAME.' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.$row->COL_SAT_NAME.' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
case 'Frequency':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE ?? '') . ' | '; break;
case 'Operator':echo '' . ($row->COL_OPERATOR ?? '') . ' | '; break;
case 'Location':echo '' . ($row->station_profile_name ?? '') . ' | '; break;
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 213e82df2..f8203a1dd 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -91,12 +91,12 @@
config->item('display_freq') == true) { ?>
| = __("Frequency"); ?> |
- frequency->hz_to_mhz($row->COL_FREQ); ?> |
+ frequency->qrg_conversion($row->COL_FREQ); ?> |
COL_FREQ_RX != 0) { ?>
| = __("Frequency (RX)"); ?> |
- frequency->hz_to_mhz($row->COL_FREQ_RX); ?> |
+ frequency->qrg_conversion($row->COL_FREQ_RX); ?> |
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index 6978cad2c..ea9ae8b4b 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -107,7 +107,7 @@ function echo_table_col($row, $name)
case 'Frequency':
echo '';
if ($row->COL_FREQ != null) {
- echo $CI->frequency->hz_to_mhz($row->COL_FREQ);
+ echo $CI->frequency->qrg_conversion($row->COL_FREQ);
} else {
echo strtolower($row->COL_BAND);
}
|