From 44ee68c19f2988db9aa495f01bb4e80d8bc2c990 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 20:16:25 +0200 Subject: [PATCH 1/6] basic setup to make units selectable in band table --- application/controllers/Band.php | 1 + application/libraries/Frequency.php | 304 +++++++++++++++++----------- application/views/bands/index.php | 258 +++++++++++------------ 3 files changed, 318 insertions(+), 245 deletions(-) diff --git a/application/controllers/Band.php b/application/controllers/Band.php index 22c3ab3eed..ccde28422e 100644 --- a/application/controllers/Band.php +++ b/application/controllers/Band.php @@ -20,6 +20,7 @@ public function index() $this->load->model('bands'); $data['bands'] = $this->bands->get_all_bands_for_user(); + $data['units'] = $this->frequency->QRG_UNITS; // Render Page $data['page_title'] = __("Bands"); diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index 5578f50afe..ccd6537a6e 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -1,132 +1,188 @@ -array( - 'SSB'=>"1900000", - 'DATA'=>"1838000", - 'CW'=>"1830000", - 'NOMINAL'=>"1.8"), - '80m'=>array( - 'SSB'=>"3700000", - 'DATA'=>"3583000", - "CW"=>"3550000", - "NOMINAL"=>"3.5"), - '60m'=>array( - 'SSB'=>"5330000", - 'DATA'=>"5330000", - "CW"=>"5260000", - "NOMINAL"=>"5"), - '40m'=>array( - 'SSB'=>"7100000", - 'DATA'=>"7040000", - 'CW'=>"7020000", - 'NOMINAL'=>"7"), - '30m'=>array( - 'SSB'=>"10120000", - 'DATA'=>"10145000", - 'CW'=>"10120000", - 'NOMINAL'=>"10"), - '20m'=>array( - 'SSB'=>"14200000", - 'DATA'=>"14080000", - 'CW'=>"14020000", - 'NOMINAL'=>"14"), - '17m'=>array( - 'SSB'=>"18130000", - 'DATA'=>"18105000", - 'CW'=>"18080000", - 'NOMINAL'=>"18"), - '15m'=>array( - 'SSB'=>"21300000", - 'DATA'=>"21080000", - 'CW'=>"21020000", - 'NOMINAL'=>"21"), - '12m'=>array( - 'SSB'=>"24950000", - 'DATA'=>"24925000", - 'CW'=>"24900000", - 'NOMINAL'=>"24"), - '10m'=>array( - 'SSB'=>"28300000", - 'DATA'=>"28120000", - 'CW'=>"28050000", - 'NOMINAL'=>"28"), - '6m'=>array( - 'SSB'=>"50150000", - 'DATA'=>"50230000", - 'CW'=>"50090000", - 'NOMINAL'=>"50"), - '4m'=>array( - 'SSB'=>"70200000", - 'DATA'=>"70200000", - 'CW'=>"70200000", - 'NOMINAL'=>"70"), - '2m'=>array( - 'SSB'=>"144300000", - 'DATA'=>"144370000", - 'CW'=>"144050000", - 'NOMINAL'=>"144"), - '1.25m'=>array( - 'SSB'=>"222100000", - 'DATA'=>"222100000", - 'CW'=>"222100000", - 'NOMINAL'=>"222"), - '70cm'=>array( - 'SSB'=>"432200000", - 'DATA'=>"432088000", - 'CW'=>"432050000", - 'NOMINAL'=>"433"), - '33cm'=>array( - 'SSB'=>"902100000", - 'DATA'=>"902100000", - 'CW'=>"902100000", - 'NOMINAL'=>"902"), - '23cm'=>array( - 'SSB'=>"1296000000", - 'DATA'=>"1296138000", - 'CW'=>"129600000", - 'NOMINAL'=>"1296"), - '13cm'=>array( - 'SSB'=>"2320800000", - 'DATA'=>"2320800000", - 'CW'=>"2320800000", - 'NOMINAL'=>"2400"), - '9cm'=>array( - 'SSB'=>"3410000000", - 'DATA'=>"3410000000", - 'CW'=>"3400000000", - 'NOMINAL'=>"3400"), - '6cm'=>array( - 'SSB'=>"5670000000", - 'DATA'=>"5670000000", - 'CW'=>"5670000000", - 'NOMINAL'=>"5670"), - '3cm'=>array( - 'SSB'=>"10225000000", - 'DATA'=>"10225000000", - 'CW'=>"10225000000", - 'NOMINAL'=>"10225") - ); + public $QRG_UNITS = [ + 'Hz', + 'kHz', + 'MHz', + 'GHz' + ]; + + public $defaultFrequencies = array( + '160m' => array( + 'SSB' => "1900000", + 'DATA' => "1838000", + 'CW' => "1830000", + 'NOMINAL' => "1.8", + 'UNIT' => 'kHz' + ), + '80m' => array( + 'SSB' => "3700000", + 'DATA' => "3583000", + "CW" => "3550000", + "NOMINAL" => "3.5", + 'UNIT' => 'kHz' + ), + '60m' => array( + 'SSB' => "5330000", + 'DATA' => "5330000", + "CW" => "5260000", + "NOMINAL" => "5", + 'UNIT' => 'kHz' + ), + '40m' => array( + 'SSB' => "7100000", + 'DATA' => "7040000", + 'CW' => "7020000", + 'NOMINAL' => "7", + 'UNIT' => 'kHz' + ), + '30m' => array( + 'SSB' => "10120000", + 'DATA' => "10145000", + 'CW' => "10120000", + 'NOMINAL' => "10", + 'UNIT' => 'kHz' + ), + '20m' => array( + 'SSB' => "14200000", + 'DATA' => "14080000", + 'CW' => "14020000", + 'NOMINAL' => "14", + 'UNIT' => 'kHz' + ), + '17m' => array( + 'SSB' => "18130000", + 'DATA' => "18105000", + 'CW' => "18080000", + 'NOMINAL' => "18", + 'UNIT' => 'kHz' + ), + '15m' => array( + 'SSB' => "21300000", + 'DATA' => "21080000", + 'CW' => "21020000", + 'NOMINAL' => "21", + 'UNIT' => 'kHz' + ), + '12m' => array( + 'SSB' => "24950000", + 'DATA' => "24925000", + 'CW' => "24900000", + 'NOMINAL' => "24", + 'UNIT' => 'kHz' + ), + '10m' => array( + 'SSB' => "28300000", + 'DATA' => "28120000", + 'CW' => "28050000", + 'NOMINAL' => "28", + 'UNIT' => 'kHz' + ), + '6m' => array( + 'SSB' => "50150000", + 'DATA' => "50230000", + 'CW' => "50090000", + 'NOMINAL' => "50", + 'UNIT' => 'MHz' + ), + '4m' => array( + 'SSB' => "70200000", + 'DATA' => "70200000", + 'CW' => "70200000", + 'NOMINAL' => "70", + 'UNIT' => 'MHz' + ), + '2m' => array( + 'SSB' => "144300000", + 'DATA' => "144370000", + 'CW' => "144050000", + 'NOMINAL' => "144", + 'UNIT' => 'MHz' + ), + '1.25m' => array( + 'SSB' => "222100000", + 'DATA' => "222100000", + 'CW' => "222100000", + 'NOMINAL' => "222", + 'UNIT' => 'MHz' + ), + '70cm' => array( + 'SSB' => "432200000", + 'DATA' => "432088000", + 'CW' => "432050000", + 'NOMINAL' => "433", + 'UNIT' => 'MHz' + ), + '33cm' => array( + 'SSB' => "902100000", + 'DATA' => "902100000", + 'CW' => "902100000", + 'NOMINAL' => "902", + 'UNIT' => 'MHz' + ), + '23cm' => array( + 'SSB' => "1296000000", + 'DATA' => "1296138000", + 'CW' => "129600000", + 'NOMINAL' => "1296", + 'UNIT' => 'GHz' + ), + '13cm' => array( + 'SSB' => "2320800000", + 'DATA' => "2320800000", + 'CW' => "2320800000", + 'NOMINAL' => "2400", + 'UNIT' => 'GHz' + ), + '9cm' => array( + 'SSB' => "3410000000", + 'DATA' => "3410000000", + 'CW' => "3400000000", + 'NOMINAL' => "3400", + 'UNIT' => 'GHz' + ), + '6cm' => array( + 'SSB' => "5670000000", + 'DATA' => "5670000000", + 'CW' => "5670000000", + 'NOMINAL' => "5670", + 'UNIT' => 'GHz' + ), + '3cm' => array( + 'SSB' => "10225000000", + 'DATA' => "10225000000", + 'CW' => "10225000000", + 'NOMINAL' => "10225", + 'UNIT' => 'GHz' + ), + '1.25cm' => array( + 'SSB' => "24000000000", + 'DATA' => "24000000000", + 'CW' => "24000000000", + 'NOMINAL' => "24000", + 'UNIT' => 'GHz' + ), + ); /* Class to convert band and mode into a frequency in a format based on the specifications of the database table */ - public function convert_band($band, $mode='SSB') { + public function convert_band($band, $mode = 'SSB') { // Converting LSB and USB to SSB - if($mode =='LSB' or $mode =='USB'){ - $mode= "SSB"; + if ($mode == 'LSB' or $mode == 'USB') { + $mode = "SSB"; } // Use 'DATA' for any of the data modes - if($mode !='CW' and $mode !='SSB'){ - $mode= "DATA"; + if ($mode != 'CW' and $mode != 'SSB') { + $mode = "DATA"; } return $this->getDefaultFrequency($band, $mode); } function getDefaultFrequency($band, $mode) { - $CI =& get_instance(); - $db =& $CI->db; + $CI = &get_instance(); + $db = &$CI->db; $db->from('bands'); $db->where('bands.band', $band); @@ -198,10 +254,18 @@ public function GetBand($Frequency) { return $Band; } - // converts a frequency in Hz to MHz output - function hz_to_mhz($frequency) - { - return number_format (($frequency / 1000 / 1000), 3) . " MHz"; - } + // converts a frequency in Hz to MHz output + function hz_to_mhz($frequency) { + return number_format(($frequency / 1000 / 1000), 3) . " MHz"; + } + + function get_qrg_unit($band) { + if (isset($this->defaultFrequencies[$band]['UNIT'])) { + $unit = $this->defaultFrequencies[$band]['UNIT']; + } else { + $unit = 'kHz'; // we use kHz as fallback unit + } + return $unit; + } } /* End of file Frequency.php */ diff --git a/application/views/bands/index.php b/application/views/bands/index.php index ae9cce13e8..b4f1b2290e 100644 --- a/application/views/bands/index.php +++ b/application/views/bands/index.php @@ -17,139 +17,147 @@ ?>
-
+
session->flashdata('message')) { ?>
-

session->flashdata('message'); ?>

+

session->flashdata('message'); ?>

-

+

-
-
- -
-
-

- -

-

- -

-
+
+
+ +
+
+

+
+ +

+
- - - - - - - - - - - - - - - - - - - - - - - - - session->userdata('user_type') == '99') { ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - session->userdata('user_type') == '99') { ?> - - - - +
active == 1) {echo 'checked';}?>>band;?>cq == 1) {echo 'checked'; $cq++;}?>>dok == 1) {echo 'checked'; $dok++;}?>>dxcc == 1) {echo 'checked'; $dxcc++;}?>>helvetia == 1) {echo 'checked'; $helvetia++;}?>>iota == 1) {echo 'checked'; $iota++;}?>>jcc == 1) {echo 'checked'; $jcc++;}?>>pota == 1) {echo 'checked'; $pota++;}?>>rac == 1) {echo 'checked'; $rac++;}?>>sig == 1) {echo 'checked'; $sig++;}?>>sota == 1) {echo 'checked'; $sota++;}?>>uscounties == 1) {echo 'checked'; $uscounties++;}?>>vucc == 1) {echo 'checked'; $vucc++;}?>>waja == 1) {echo 'checked'; $waja++;}?>>was == 1) {echo 'checked'; $was++;}?>>wwff == 1) {echo 'checked'; $wwff++;}?>>bandgroup;?>ssb;?>data;?>cw;?> - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + session->userdata('user_type') == '99') { ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + session->userdata('user_type') == '99') { ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + session->userdata('user_type') == '99') { ?> + + + + +
active == 1) {echo 'checked';}?>>band;?>cq == 1) {echo 'checked'; $cq++;}?>>dok == 1) {echo 'checked'; $dok++;}?>>dxcc == 1) {echo 'checked'; $dxcc++;}?>>helvetia == 1) {echo 'checked'; $helvetia++;}?>>iota == 1) {echo 'checked'; $iota++;}?>>jcc == 1) {echo 'checked'; $jcc++;}?>>pota == 1) {echo 'checked'; $pota++;}?>>rac == 1) {echo 'checked'; $rac++;}?>>sig == 1) {echo 'checked'; $sig++;}?>>sota == 1) {echo 'checked'; $sota++;}?>>uscounties == 1) {echo 'checked'; $uscounties++;}?>>vucc == 1) {echo 'checked'; $vucc++;}?>>waja == 1) {echo 'checked'; $waja++;}?>>was == 1) {echo 'checked'; $was++;}?>>wwff == 1) {echo 'checked'; $wwff++;}?>>bandgroup;?>ssb;?>data;?>cw;?> + + + + + +
0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>>
+ +
+

+ session->userdata('user_type') == '99') { ?> + + + + - -

- - - - - - - - - - - - - - - - - - - - - - session->userdata('user_type') == '99') { ?> - - - - -
0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>> 0) echo 'checked';?>>
+

+ -
-

- session->userdata('user_type') == '99') { ?> - - - - - -

- - + \ No newline at end of file From ae5c93da46343f03a5dc41c91c5a897316d2ace8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 21:37:50 +0200 Subject: [PATCH 2/6] save the band unit and write it in session and user_options --- application/controllers/Band.php | 11 +++++++++++ assets/js/sections/bands.js | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/application/controllers/Band.php b/application/controllers/Band.php index ccde28422e..3704327ec3 100644 --- a/application/controllers/Band.php +++ b/application/controllers/Band.php @@ -155,4 +155,15 @@ public function saveBandAward() { echo json_encode(array('message' => 'OK')); return; } + + public function saveBandUnit() { + $unit = $this->security->xss_clean($this->input->post('unit')); + $band_id = $this->security->xss_clean($this->input->post('band_id')); + + $this->load->model('bands'); + $band = $this->bands->getband($band_id)->row()->band; + + $this->user_options_model->set_option('frequency', 'unit', array($band => $unit)); + $this->session->set_userdata('qrgunit_'.$band, $unit); + } } diff --git a/assets/js/sections/bands.js b/assets/js/sections/bands.js index bb6ffb0eca..16e248715a 100644 --- a/assets/js/sections/bands.js +++ b/assets/js/sections/bands.js @@ -14,6 +14,12 @@ $('.bandtable tfoot').on('click', 'input[type="checkbox"]', function() { saveBandAward(clickedaward, status); }); +$('.unitselect').change(function() { + var selectedValue = $(this).val(); + var bandId = $(this).closest('td').attr('class').split('_')[1]; + saveBandUnit(selectedValue, bandId); +}); + function saveBandAward(award, status) { $.ajax({ url: base_url + 'index.php/band/saveBandAward', @@ -230,3 +236,16 @@ function saveBand(id) { } }); } + +function saveBandUnit(unit, band_id) { + $.ajax({ + url: base_url + 'index.php/band/saveBandUnit', + type: 'post', + data: { + 'band_id': band_id, + 'unit': unit + }, + success: function(html) { + } + }) +} From 312f18f2552c4c654ef4dc3f0f2f7723c7dd1944 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 21:38:14 +0200 Subject: [PATCH 3/6] make sure the bands table shows set values --- application/libraries/Frequency.php | 15 +++++++++++---- application/views/bands/index.php | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index ccd6537a6e..01ad24159e 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -259,11 +259,18 @@ function hz_to_mhz($frequency) { return number_format(($frequency / 1000 / 1000), 3) . " MHz"; } - function get_qrg_unit($band) { - if (isset($this->defaultFrequencies[$band]['UNIT'])) { - $unit = $this->defaultFrequencies[$band]['UNIT']; + function qrg_unit($band) { + + $CI = &get_instance(); + + if ($CI->session->userdata('qrgunit_'.$band)) { + $unit = $CI->session->userdata('qrgunit_'.$band); } else { - $unit = 'kHz'; // we use kHz as fallback unit + if (isset($this->defaultFrequencies[$band]['UNIT'])) { + $unit = $this->defaultFrequencies[$band]['UNIT']; + } else { + $unit = 'kHz'; // we use kHz as fallback unit + } } return $unit; } diff --git a/application/views/bands/index.php b/application/views/bands/index.php index b4f1b2290e..d636223340 100644 --- a/application/views/bands/index.php +++ b/application/views/bands/index.php @@ -94,9 +94,9 @@ From 07a4682101fc7cd8b17bfac8d4e344823ab38c05 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 21:38:38 +0200 Subject: [PATCH 4/6] when updating the session fill the session data only with existing options. --- application/models/User_model.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 8e74048f61..7651c89d97 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -408,7 +408,7 @@ function update_session($id, $u = null) { if ($u == null) { $u = $this->get_by_id($id); } - + $userdata = array( 'user_id' => $u->row()->user_id, 'user_name' => $u->row()->user_name, @@ -450,7 +450,14 @@ function update_session($id, $u = null) { 'isWinkeyEnabled' => $u->row()->winkey, 'hasQrzKey' => $this->hasQrzKey($u->row()->user_id) ); - + + foreach (array_keys($this->frequency->defaultFrequencies) as $band) { + $qrg_unit = $this->session->userdata("qrgunit_$band") ?? ($this->user_options_model->get_options('frequency', array('option_name' => 'unit', 'option_key' => $band))->row()->option_value ?? ''); + if ($qrg_unit !== '') { + $userdata['qrgunit_'.$band] = $qrg_unit; + } + } + $this->session->set_userdata($userdata); } From e6e9694daf52ed2500846ef494efa6160d3d3b26 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 21:41:13 +0200 Subject: [PATCH 5/6] reduce changed lines --- application/libraries/Frequency.php | 66 ++++++++++------------------- 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index 01ad24159e..e4503363da 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -14,155 +14,133 @@ class Frequency { 'DATA' => "1838000", 'CW' => "1830000", 'NOMINAL' => "1.8", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '80m' => array( 'SSB' => "3700000", 'DATA' => "3583000", "CW" => "3550000", "NOMINAL" => "3.5", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '60m' => array( 'SSB' => "5330000", 'DATA' => "5330000", "CW" => "5260000", "NOMINAL" => "5", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '40m' => array( 'SSB' => "7100000", 'DATA' => "7040000", 'CW' => "7020000", 'NOMINAL' => "7", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '30m' => array( 'SSB' => "10120000", 'DATA' => "10145000", 'CW' => "10120000", 'NOMINAL' => "10", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '20m' => array( 'SSB' => "14200000", 'DATA' => "14080000", 'CW' => "14020000", 'NOMINAL' => "14", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '17m' => array( 'SSB' => "18130000", 'DATA' => "18105000", 'CW' => "18080000", 'NOMINAL' => "18", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '15m' => array( 'SSB' => "21300000", 'DATA' => "21080000", 'CW' => "21020000", 'NOMINAL' => "21", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '12m' => array( 'SSB' => "24950000", 'DATA' => "24925000", 'CW' => "24900000", 'NOMINAL' => "24", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '10m' => array( 'SSB' => "28300000", 'DATA' => "28120000", 'CW' => "28050000", 'NOMINAL' => "28", - 'UNIT' => 'kHz' - ), + 'UNIT' => 'kHz'), '6m' => array( 'SSB' => "50150000", 'DATA' => "50230000", 'CW' => "50090000", 'NOMINAL' => "50", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '4m' => array( 'SSB' => "70200000", 'DATA' => "70200000", 'CW' => "70200000", 'NOMINAL' => "70", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '2m' => array( 'SSB' => "144300000", 'DATA' => "144370000", 'CW' => "144050000", 'NOMINAL' => "144", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '1.25m' => array( 'SSB' => "222100000", 'DATA' => "222100000", 'CW' => "222100000", 'NOMINAL' => "222", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '70cm' => array( 'SSB' => "432200000", 'DATA' => "432088000", 'CW' => "432050000", 'NOMINAL' => "433", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '33cm' => array( 'SSB' => "902100000", 'DATA' => "902100000", 'CW' => "902100000", 'NOMINAL' => "902", - 'UNIT' => 'MHz' - ), + 'UNIT' => 'MHz'), '23cm' => array( 'SSB' => "1296000000", 'DATA' => "1296138000", 'CW' => "129600000", 'NOMINAL' => "1296", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), '13cm' => array( 'SSB' => "2320800000", 'DATA' => "2320800000", 'CW' => "2320800000", 'NOMINAL' => "2400", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), '9cm' => array( 'SSB' => "3410000000", 'DATA' => "3410000000", 'CW' => "3400000000", 'NOMINAL' => "3400", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), '6cm' => array( 'SSB' => "5670000000", 'DATA' => "5670000000", 'CW' => "5670000000", 'NOMINAL' => "5670", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), '3cm' => array( 'SSB' => "10225000000", 'DATA' => "10225000000", 'CW' => "10225000000", 'NOMINAL' => "10225", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), '1.25cm' => array( 'SSB' => "24000000000", 'DATA' => "24000000000", 'CW' => "24000000000", 'NOMINAL' => "24000", - 'UNIT' => 'GHz' - ), + 'UNIT' => 'GHz'), ); /* Class to convert band and mode into a frequency in a format based on the specifications of the database table */ From 285cf73efeb61caa3fb3df050e80b4659321017e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 5 Jul 2024 22:13:49 +0200 Subject: [PATCH 6/6] we can display the units directly to support gettext here --- application/controllers/Band.php | 1 - application/libraries/Frequency.php | 7 ------- application/views/bands/index.php | 7 ++++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/application/controllers/Band.php b/application/controllers/Band.php index 3704327ec3..052114aabc 100644 --- a/application/controllers/Band.php +++ b/application/controllers/Band.php @@ -20,7 +20,6 @@ public function index() $this->load->model('bands'); $data['bands'] = $this->bands->get_all_bands_for_user(); - $data['units'] = $this->frequency->QRG_UNITS; // Render Page $data['page_title'] = __("Bands"); diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index e4503363da..55fa02adf7 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -1,13 +1,6 @@ array( 'SSB' => "1900000", diff --git a/application/views/bands/index.php b/application/views/bands/index.php index d636223340..f431b0e06b 100644 --- a/application/views/bands/index.php +++ b/application/views/bands/index.php @@ -95,9 +95,10 @@ session->userdata('user_type') == '99') { ?> pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy

data;?> cw;?> - - + cw;?>