From 6bd4308b01ca0e331c7ab12a199466add54df76a Mon Sep 17 00:00:00 2001 From: iddq Date: Sat, 6 Nov 2021 12:14:45 +0100 Subject: [PATCH] Added Operator (COL_OPERATOR) to possible columns --- application/views/dashboard/index.php | 31 +++++++++++++++++++ application/views/qslcard/searchresult.php | 10 ++++++ .../views/search/search_result_ajax.php | 10 ++++++ 3 files changed, 51 insertions(+) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 3f1fa8d7..d207943a 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -1,3 +1,34 @@ +'.$ctx->lang->line('gen_hamradio_mode').''; break; + case 'RSTS': echo ''.$ctx->lang->line('gen_hamradio_rsts').''; break; + case 'RSTR': echo ''.$ctx->lang->line('gen_hamradio_rstr').''; break; + case 'Country': echo ''.$ctx->lang->line('general_word_country').''; break; + case 'IOTA': echo ''.$ctx->lang->line('gen_hamradio_iota').''; break; + case 'SOTA': echo ''.$ctx->lang->line('gen_hamradio_sota').''; break; + 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 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').''; break; + } +} + +function echo_table_col($row, $name) { + 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_STRING) { echo '' . $row->COL_STX_STRING . '';} echo ''; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';} echo ''; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY))) . ''; break; + case 'IOTA': echo '' . ($row->COL_IOTA) . ''; break; + case 'SOTA': echo '' . ($row->COL_SOTA_REF) . ''; break; + case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$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 'State': echo '' . ($row->COL_STATE) . ''; break; + case 'Operator': echo '' . ($row->COL_OPERATOR) . ''; break; + } +} +?>
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?> diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php index 20f2e8f1..1217e301 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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -31,6 +32,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 'Operator': echo $this->lang->line('gen_hamradio_band'); break; } echo ''; echo ''; @@ -44,6 +46,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -57,6 +60,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -70,6 +74,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; @@ -104,6 +109,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { @@ -116,6 +122,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; @@ -129,6 +136,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { @@ -141,6 +149,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { @@ -153,6 +162,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ' '; diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 1d20cc77..081121d6 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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -32,6 +33,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -45,6 +47,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -58,6 +61,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -71,6 +75,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 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; @@ -122,6 +127,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { @@ -134,6 +140,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; @@ -147,6 +154,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { @@ -159,6 +167,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { @@ -171,6 +180,7 @@ case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>