diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 1470c924..b02a208a 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -509,7 +509,7 @@ class Logbook extends CI_Controller {
$html = "";
if(!empty($logbooks_locations_array)) {
- $this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
+ $this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_FREQ, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
$this->db->from($this->config->item('table_name'));
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
@@ -530,10 +530,14 @@ class Logbook extends CI_Controller {
$html .= "
";
$html .= "| Date | ";
$html .= "Callsign | ";
+ $html .= "Mode | ";
$html .= "RST (S) | ";
$html .= "RST (R) | ";
- $html .= "Band | ";
- $html .= "Mode | ";
+ if ($this->session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') {
+ $html .= "Frequency | ";
+ } else {
+ $html .= "Band | ";
+ }
switch($this->session->userdata('user_previous_qsl_type')) {
case 0:
$html .= "".$this->lang->line('gen_hamradio_qsl')." | ";
@@ -568,17 +572,21 @@ class Logbook extends CI_Controller {
$html .= "
";
$html .= "| ".date($custom_date_format, $timestamp). date(' H:i',strtotime($row->COL_TIME_ON)) . " | ";
$html .= "" . str_replace('0','Ø',strtoupper($row->COL_CALL)) . " | ";
- $html .= "".$row->COL_RST_SENT." | ";
- $html .= "".$row->COL_RST_RCVD." | ";
- if($row->COL_SAT_NAME != null) {
- $html .= "".$row->COL_SAT_NAME." | ";
- } else {
- $html .= "".$row->COL_BAND." | ";
- }
if ($row->COL_SUBMODE==null)
$html .= "".$row->COL_MODE." | ";
else
$html .= "".$row->COL_SUBMODE." | ";
+ $html .= "".$row->COL_RST_SENT." | ";
+ $html .= "".$row->COL_RST_RCVD." | ";
+ if($row->COL_SAT_NAME != null) {
+ $html .= "".$row->COL_SAT_NAME." | ";
+ } else {
+ if ($this->session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') {
+ $html .= "".$this->frequency->hz_to_mhz($row->COL_FREQ)." | ";
+ } else {
+ $html .= "".$row->COL_BAND." | ";
+ }
+ }
if ($this->session->userdata('user_previous_qsl_type') == 1) {
$html .= "";
$html .= "load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
- $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME');
+ $this->db->select('COL_CALL, COL_BAND, COL_FREQ, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME');
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit(10);
@@ -791,7 +791,7 @@ class Logbook_model extends CI_Model {
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
if(!empty($logbooks_locations_array)) {
- $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME');
+ $this->db->select('COL_CALL, COL_BAND, COL_FREQ, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME');
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit($num);
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 8b37b3d6..844aa5b1 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -12,11 +12,13 @@ function echo_table_header_col($ctx, $name) {
case 'State': echo ' | '.$ctx->lang->line('gen_hamradio_state').' | '; break;
case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').' | '; break;
case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').' | '; break;
+ case 'Frequency': echo ''.$ctx->lang->line('gen_hamradio_frequency').' | '; break;
case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').' | '; break;
}
}
function echo_table_col($row, $name) {
+ $ci =& get_instance();
switch($name) {
case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ' | '; break;
case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo 'COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo 'COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '';} echo ' | '; break;
@@ -28,6 +30,7 @@ function echo_table_col($row, $name) {
case 'POTA': echo '' . ($row->COL_POTA_REF) . ' | '; break;
case 'Grid': echo ''; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo ' | '; 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;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
}
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index 451999ed..0e5c597a 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -18,6 +18,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -32,6 +33,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_band'); break;
}
echo '';
@@ -46,6 +48,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -60,6 +63,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -74,6 +78,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo ' |
';
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 7f3683b6..1e504714 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -528,7 +528,12 @@
lang->line('gen_hamradio_mode'); ?> |
lang->line('gen_hamradio_rsts'); ?> |
lang->line('gen_hamradio_rstr'); ?> |
- lang->line('gen_hamradio_band'); ?> |
+ session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') {
+ echo ''.$this->lang->line('gen_hamradio_frequency').' | ';
+ } else {
+ echo ''.$this->lang->line('gen_hamradio_band').' | ';
+ }
+ ?>
COL_RST_RCVD; ?>
COL_SAT_NAME != null) { ?>
COL_SAT_NAME; ?> |
-
- COL_BAND; ?> |
-
+ session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') {
+ echo '';
+ if ($row->COL_FREQ != null) {
+ echo $this->frequency->hz_to_mhz($row->COL_FREQ);
+ } else {
+ echo $row->COL_BAND;
+ }
+ echo ' | ';
+ } else {
+ echo ''.$row->COL_BAND.' | ';
+ }
+ } ?>
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index 30c053b1..2ec79336 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -19,6 +19,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -33,6 +34,7 @@
case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -47,6 +49,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -61,6 +64,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
@@ -75,6 +79,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
+ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
}
echo '';
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 4ca651b5..76f280e3 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -170,6 +170,7 @@