From b2b7596bca2394b14ebcdc08eb6e1efc78f4c5ce Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 14 Dec 2022 12:45:32 +0100 Subject: [PATCH 01/24] Add Frequency to selectable colums and previous QSOs --- application/controllers/Logbook.php | 28 ++++++++++++------- application/models/Logbook_model.php | 4 +-- application/views/dashboard/index.php | 3 ++ application/views/qslcard/searchresult.php | 5 ++++ application/views/qso/index.php | 23 ++++++++++++--- .../views/search/search_result_ajax.php | 5 ++++ application/views/user/add.php | 5 ++++ application/views/user/edit.php | 5 ++++ .../views/view_log/partial/log_ajax.php | 9 ++++-- application/views/visitor/index.php | 2 ++ 10 files changed, 70 insertions(+), 19 deletions(-) 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 @@ + @@ -202,6 +204,7 @@ + @@ -234,6 +238,7 @@ + @@ -368,6 +369,7 @@ + @@ -404,6 +407,7 @@ + diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 9500f152..666e970d 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -8,15 +8,17 @@ function echo_table_header_col($ctx, $name) { case 'IOTA': echo ''.$ctx->lang->line('gen_hamradio_iota').''; break; case 'SOTA': echo ''.$ctx->lang->line('gen_hamradio_sota').''; break; case 'WWFF': echo ''.$ctx->lang->line('gen_hamradio_wwff').''; break; - case 'POTA': echo ''.$ctx->lang->line('gen_hamradio_pota').''; break; + case 'POTA': echo ''.$ctx->lang->line('gen_hamradio_pota').''; 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; + 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; @@ -27,7 +29,8 @@ function echo_table_col($row, $name) { case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ''; break; 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 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; } else { if ($row->COL_FREQ != null) { echo ''. strtolower($row->COL_BAND).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; + case 'Frequency': echo ''; 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); } } echo ''; break; case 'State': echo '' . ($row->COL_STATE) . ''; break; case 'Operator':echo '' . ($row->COL_OPERATOR) . ''; break; } diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index ddc4cb2b..1915f86c 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -10,6 +10,7 @@ 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; } } @@ -26,6 +27,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_FREQ != null) { echo $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; } From 8384d7d421cff6e1d04c5df91cb7f62ed7a219b3 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 14 Dec 2022 12:48:56 +0100 Subject: [PATCH 02/24] [PHP8.1] Added some fixes for PHP 8.1 --- system/core/Common.php | 3 +++ system/libraries/Profiler.php | 3 ++- system/libraries/Session/drivers/Session_files_driver.php | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index 03f62c09..158213c0 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -727,6 +727,9 @@ if ( ! function_exists('remove_invisible_characters')) do { + if ($str == null) { + $str = ""; + } $str = preg_replace($non_displayables, '', $str, -1, $count); } while ($count); diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 5531f336..0ef908bc 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -490,10 +490,10 @@ class CI_Profiler { if (is_array($val) OR is_object($val)) { $val = print_r($val, TRUE); - $pre = '
' ;
 				$pre_close = '
'; } + $val = $val == null ? "" : $val; $output .= '' .$config.'  '.$pre.htmlspecialchars($val, ENT_QUOTES, config_item('charset')).$pre_close."\n"; @@ -522,6 +522,7 @@ class CI_Profiler { foreach ($this->CI->session->userdata() as $key => $val) { + $val = $val == null ? "" : $val; $pre = ''; $pre_close = ''; diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php index 49bf5b78..af380524 100644 --- a/system/libraries/Session/drivers/Session_files_driver.php +++ b/system/libraries/Session/drivers/Session_files_driver.php @@ -129,7 +129,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * @param string $name Session cookie name * @return bool */ - public function open($save_path, $name) + public function open($save_path, $name): bool { if ( ! is_dir($save_path)) { @@ -165,6 +165,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * @param string $session_id Session ID * @return string Serialized session data */ + #[\ReturnTypeWillChange] public function read($session_id) { // This might seem weird, but PHP 5.6 introduces session_reset(), @@ -238,6 +239,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * @param string $session_data Serialized session data * @return bool */ + #[\ReturnTypeWillChange] public function write($session_id, $session_data) { // If the two IDs don't match, we have a session_regenerate_id() call @@ -295,6 +297,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * * @return bool */ + #[\ReturnTypeWillChange] public function close() { if (is_resource($this->_file_handle)) @@ -318,6 +321,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * @param string $session_id Session ID * @return bool */ + #[\ReturnTypeWillChange] public function destroy($session_id) { if ($this->close() === $this->_success) @@ -359,6 +363,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle * @param int $maxlifetime Maximum lifetime of sessions * @return bool */ + #[\ReturnTypeWillChange] public function gc($maxlifetime) { if ( ! is_dir($this->_config['save_path']) OR ($directory = opendir($this->_config['save_path'])) === FALSE) From 1a786f88e8ec7523e15a279a50776473b4ddcd6d Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 14 Dec 2022 13:24:00 +0100 Subject: [PATCH 03/24] Fix strlen stuff --- application/views/dashboard/index.php | 4 ++-- application/views/view_log/partial/log_ajax.php | 4 ++-- application/views/visitor/index.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 8b37b3d6..534ef2a0 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -34,9 +34,9 @@ function echo_table_col($row, $name) { } function echoQrbCalcLink($mygrid, $grid, $vucc) { - if (strlen($grid) != 0) { + if (!empty($grid)) { echo $grid . ' '; - } else if (strlen($vucc) != 0) { + } else if (!empty($vucc)) { echo $vucc .' '; } } diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 9500f152..5091b647 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -34,9 +34,9 @@ function echo_table_col($row, $name) { } function echoQrbCalcLink($mygrid, $grid, $vucc) { - if (strlen($grid) != 0) { + if (!empty($grid)) { echo $grid . ' '; - } else if (strlen($vucc) != 0) { + } else if (!empty($vucc)) { echo $vucc .' '; } } diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index ddc4cb2b..1bd73907 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -32,9 +32,9 @@ function echo_table_col($row, $name) { } function echoQrbCalcLink($mygrid, $grid, $vucc) { - if (strlen($grid) != 0) { + if (!empty($grid)) { echo $grid . ' '; - } else if (strlen($vucc) != 0) { + } else if (!empty($vucc)) { echo $vucc .' '; } } From 85ca34bf801ae22169aef724ff8d7bcc65f1bee3 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 14 Dec 2022 13:53:14 +0100 Subject: [PATCH 04/24] [PHP8.1] Replaced output.php with a newer one --- system/core/Output.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/system/core/Output.php b/system/core/Output.php index c56aff4b..02f3933f 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2019, British Columbia Institute of Technology + * Copyright (c) 2019 - 2022, CodeIgniter Foundation * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -30,6 +30,7 @@ * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/) + * @copyright Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/) * @license https://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 @@ -55,7 +56,7 @@ class CI_Output { * * @var string */ - public $final_output; + public $final_output = ''; /** * Cache expiration time @@ -145,7 +146,7 @@ class CI_Output { && extension_loaded('zlib') ); - isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload')); + isset(self::$func_overload) OR self::$func_overload = ( ! is_php('8.0') && extension_loaded('mbstring') && @ini_get('mbstring.func_overload')); // Get mime types for later $this->mimes =& get_mimes(); @@ -299,10 +300,14 @@ class CI_Output { */ public function get_header($header) { - // Combine headers already sent with our batched headers + // We only need [x][0] from our multi-dimensional array + $header_lines = array_map(function ($headers) + { + return array_shift($headers); + }, $this->headers); + $headers = array_merge( - // We only need [x][0] from our multi-dimensional array - array_map('array_shift', $this->headers), + $header_lines, headers_list() ); From ee14821e59a81bc88b74fd3b1ebb3c1d06485b10 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 16 Dec 2022 11:37:53 +0000 Subject: [PATCH 05/24] [Satellites] changed cas5a to FO-118 in the satellite_data.json file --- assets/json/satellite_data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json index 13ac63db..2dc73a2a 100644 --- a/assets/json/satellite_data.json +++ b/assets/json/satellite_data.json @@ -143,7 +143,7 @@ ] } }, - "CAS-5A":{ + "FO-118":{ "Modes":{ "H/U":[ { From c93a32da8bd15514b8879f7ef29ad106614807ac Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 18 Dec 2022 09:21:21 +0100 Subject: [PATCH 06/24] Rename CAS-5A to FO-118 --- application/config/migration.php | 2 +- application/migrations/110_rename_cas5a.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 application/migrations/110_rename_cas5a.php diff --git a/application/config/migration.php b/application/config/migration.php index bb486284..fc8056f6 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 109; +$config['migration_version'] = 110; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/110_rename_cas5a.php b/application/migrations/110_rename_cas5a.php new file mode 100644 index 00000000..d3cf1fab --- /dev/null +++ b/application/migrations/110_rename_cas5a.php @@ -0,0 +1,19 @@ +db->set('COL_SAT_NAME', 'FO-118'); + $this->db->where('COL_SAT_NAME', 'CAS-5A'); + $this->db->update($this->config->item('table_name')); + } + + public function down() + { + $this->db->set('COL_SAT_NAME', 'CAS-5A'); + $this->db->where('COL_SAT_NAME', 'FO-118'); + $this->db->update($this->config->item('table_name')); + } +} From 96219b634a22224559ff5f7d7f8e672bd45b1b3b Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 18 Dec 2022 14:54:37 +0000 Subject: [PATCH 07/24] [Satellites] Adds CAS-10 XW-4 support to dropdowns --- assets/json/satellite_data.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json index 2dc73a2a..41676d4c 100644 --- a/assets/json/satellite_data.json +++ b/assets/json/satellite_data.json @@ -143,6 +143,18 @@ ] } }, + "CAS-10":{ + "Modes":{ + "V/U":[ + { + "Uplink_Mode":"LSB", + "Uplink_Freq":"145870000", + "Downlink_Mode":"USB", + "Downlink_Freq":"435180000" + } + ] + } + }, "FO-118":{ "Modes":{ "H/U":[ From dbc8a5451a5de8cb2589d8c3825142fd340a9b2f Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 18 Dec 2022 16:49:54 +0100 Subject: [PATCH 08/24] [Logbookadvanced] First version of a logbook with filtering and batchprocessing of QSL handling. --- application/controllers/Logbookadvanced.php | 170 +++++ .../helpers/psr4_autoloader_helper.php | 21 + application/models/Logbookadvanced_model.php | 184 +++++ application/views/interface_assets/footer.php | 9 + application/views/interface_assets/header.php | 4 +- application/views/logbookadvanced/index.php | 193 ++++++ assets/js/sections/logbookadvanced.js | 345 +++++++++ src/QSLManager/QSO.php | 652 ++++++++++++++++++ 8 files changed, 1576 insertions(+), 2 deletions(-) create mode 100644 application/controllers/Logbookadvanced.php create mode 100644 application/helpers/psr4_autoloader_helper.php create mode 100644 application/models/Logbookadvanced_model.php create mode 100644 application/views/logbookadvanced/index.php create mode 100644 assets/js/sections/logbookadvanced.js create mode 100644 src/QSLManager/QSO.php diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php new file mode 100644 index 00000000..1a0c8226 --- /dev/null +++ b/application/controllers/Logbookadvanced.php @@ -0,0 +1,170 @@ +load->helper(array('form', 'url', 'psr4_autoloader')); + + $this->load->model('user_model'); + if (!$this->user_model->authorize(2)) { + $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); + redirect('dashboard'); + } + } + + function index() { + $this->load->model('stations'); + $this->load->model('logbookadvanced_model'); + $this->load->model('logbook_model'); + $this->load->model('bands'); + $this->load->model('iota'); + $this->load->model('dxcc'); + + $stationIds = []; + + $deOptions = []; + foreach ($this->stations->all_of_user()->result() as $station) { + $deOptions[$station->station_callsign] = 1; + $stationIds[] = $station->station_id; + } + ksort($deOptions); + $deOptions = array_keys($deOptions); + + $modes = []; + if ($stationIds !== []) { + foreach ($this->logbookadvanced_model->get_worked_modes($stationIds) as $mode) { + $key = $mode['mode']; + if ($mode['submode'] !== null) { + $key .= "|" . $mode['submode']; + } + if ($mode['submode'] == null) { + $modes[$key] = $mode['mode']; + } else { + $modes[$key] = $mode['submode']; + } + } + } + + $data = []; + $data['page_title'] = "Advanced logbook"; + $data['hasDatePicker'] = true; + + $pageData = []; + $pageData['datePlaceholder'] = 'DD/MM/YYYY'; + $pageData['deOptions'] = $deOptions; + $pageData['modes'] = $modes; + $pageData['dxccarray'] = $this->logbook_model->fetchDxcc(); + $pageData['iotaarray'] = $this->logbook_model->fetchIota(); + + $pageData['bands'] = $this->bands->get_worked_bands(); + + $footerData = []; + $footerData['scripts'] = [ + 'assets/js/moment.min.js', + 'assets/js/tempusdominus-bootstrap-4.min.js', + 'assets/js/sections/logbookadvanced.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/logbookadvanced.js")) + ]; + + $this->load->view('interface_assets/header', $data); + $this->load->view('logbookadvanced/index', $pageData); + $this->load->view('interface_assets/footer', $footerData); + } + + public function search() { + $this->load->model('logbookadvanced_model'); + + $searchCriteria = array( + 'user_id' => (int)$this->session->userdata('user_id'), + 'dateFrom' => xss_clean($this->input->post('dateFrom')), + 'dateTo' => xss_clean($this->input->post('dateTo')), + 'de' => xss_clean($this->input->post('de')), + 'dx' => xss_clean($this->input->post('dx')), + 'mode' => xss_clean($this->input->post('mode')), + 'band' => xss_clean($this->input->post('band')), + 'qslSent' => xss_clean($this->input->post('qslSent')), + 'qslReceived' => xss_clean($this->input->post('qslReceived')), + 'iota' => xss_clean($this->input->post('iota')), + 'dxcc' => xss_clean($this->input->post('dxcc')), + 'propmode' => xss_clean($this->input->post('propmode')), + 'gridsquare' => xss_clean($this->input->post('gridsquare')), + 'state' => xss_clean($this->input->post('state')), + ); + + $qsos = []; + foreach ($this->logbookadvanced_model->searchQsos($searchCriteria) as $qso) { + $qsos[] = $qso->toArray(); + } + + header("Content-Type: application/json"); + print json_encode($qsos); + } + + public function updateFromCallbook() { + $this->load->model('logbook_model'); + + $qsoID = xss_clean($this->input->post('qsoID')); + $qso = $this->logbook_model->qso_info($qsoID)->row_array(); + if ($qso === null) { + header("Content-Type: application/json"); + echo json_encode([]); + return; + } + + $callbook = $this->logbook_model->loadCallBook($qso['COL_CALL'], $this->config->item('use_fullname')); + + if ($callbook['callsign'] !== "") { + $qso['COL_NAME'] = trim($callbook['name']); + $qso['COL_QSL_VIA'] = trim($callbook['qslmgr']); + } + + $qsoObj = new QSO($qso); + + header("Content-Type: application/json"); + echo json_encode($qsoObj->toArray()); + } + + function export_to_adif() { + $this->load->model('logbookadvanced_model'); + + $ids = xss_clean($this->input->post('id')); + $user_id = (int)$this->session->userdata('user_id'); + + $data['qsos'] = $this->logbookadvanced_model->getQsosForAdif($ids, $user_id); + + $this->load->view('adif/data/exportall', $data); + } + + function update_qsl() { + $this->load->model('logbookadvanced_model'); + + $ids = xss_clean($this->input->post('id')); + $user_id = (int)$this->session->userdata('user_id'); + $method = xss_clean($this->input->post('method')); + $sent = xss_clean($this->input->post('sent')); + + $status = $this->logbookadvanced_model->updateQsl($ids, $user_id, $method, $sent); + + $data = $this->logbookadvanced_model->getQsosForAdif($ids, $user_id); + + $results = $data->result('array'); + + $qsos = []; + foreach ($results as $data) { + $qsos[] = new QSO($data); + } + + $q = []; + foreach ($qsos as $qso) { + $q[] = $qso->toArray(); + } + + header("Content-Type: application/json"); + print json_encode($q); + } +} \ No newline at end of file diff --git a/application/helpers/psr4_autoloader_helper.php b/application/helpers/psr4_autoloader_helper.php new file mode 100644 index 00000000..74a00521 --- /dev/null +++ b/application/helpers/psr4_autoloader_helper.php @@ -0,0 +1,21 @@ +load->model('logbooks_model'); + + $ids = "'".implode("','",$stationIds)."'"; + + $sql = " + SELECT distinct `COL_MODE`, `COL_SUBMODE` + FROM `" . $this->config->item('table_name') . "` qsos + WHERE qsos.station_id IN (".$ids.") + ORDER BY COL_MODE, COL_SUBMODE"; + + $data = $this->db->query($sql); + + $results = []; + foreach ($data->result() as $row) { + $results[] = [ + 'mode' => $row->COL_MODE, + 'submode' => $row->COL_SUBMODE + ]; + } + return $results; + } + + /* + * @param array $searchCriteria + * @return array + */ + public function searchQsos($searchCriteria) : array { + $conditions = []; + $binding = [$searchCriteria['user_id']]; + + if ($searchCriteria['dateFrom'] !== '') { + $from = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateFrom']); + $from = $from->format('Y-m-d'); + $conditions[] = "date(COL_TIME_ON) >= ?"; + $binding[] = $from; + } + if ($searchCriteria['dateTo'] !== '') { + $to = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateTo']); + $to = $to->format('Y-m-d'); + $conditions[] = "date(COL_TIME_ON) <= ?"; + $binding[] = $to; + } + if ($searchCriteria['de'] !== '') { + $conditions[] = "COL_STATION_CALLSIGN = ?"; + $binding[] = trim($searchCriteria['de']); + } + if ($searchCriteria['dx'] !== '') { + $conditions[] = "COL_CALL LIKE ?"; + $binding[] = '%' . trim($searchCriteria['dx']) . '%'; + } + if ($searchCriteria['mode'] !== '') { + list ($mode, $subMode) = explode("|", trim($searchCriteria['mode'])); + $mode = trim($mode); + $subMode = trim($subMode); + $conditions[] = "COL_MODE = ?"; + $binding[] = $mode; + if ($subMode !== '') { + $conditions[] = "COL_SUBMODE = ?"; + $binding[] = $subMode; + } + } + if ($searchCriteria['band'] !== '') { + $conditions[] = "COL_BAND = ?"; + $binding[] = trim($searchCriteria['band']); + } + if ($searchCriteria['qslSent'] !== '') { + $conditions[] = "COL_QSL_SENT = ?"; + $binding[] = $searchCriteria['qslSent']; + } + if ($searchCriteria['qslReceived'] !== '') { + $conditions[] = "COL_QSL_RCVD = ?"; + $binding[] = $searchCriteria['qslReceived']; + } + + if ($searchCriteria['iota'] !== '') { + $conditions[] = "COL_IOTA = ?"; + $binding[] = $searchCriteria['iota']; + } + + if ($searchCriteria['dxcc'] !== '') { + $conditions[] = "COL_DXCC = ?"; + $binding[] = $searchCriteria['dxcc']; + } + + if ($searchCriteria['state'] !== '') { + $conditions[] = "COL_STATE = ?"; + $binding[] = $searchCriteria['state']; + } + + if ($searchCriteria['gridsquare'] !== '') { + $conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)"; + $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; + $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; + } + + if ($searchCriteria['propmode'] !== '') { + $conditions[] = "COL_PROP_MODE = ?"; + $binding[] = $searchCriteria['propmode']; + } + + $where = trim(implode(" AND ", $conditions)); + if ($where != "") { + $where = "AND $where"; + } + + if ($where === '') { + $limit = 250; + } else { + $limit = 1000; + } + + $sql = " + SELECT * + FROM " . $this->config->item('table_name') . " qsos + INNER JOIN station_profile ON qsos.station_id=station_profile.station_id + WHERE station_profile.user_id = ? + $where + ORDER BY qsos.COL_TIME_ON desc + LIMIT $limit + "; + + $data = $this->db->query($sql, $binding); + + $results = $data->result('array'); + + $qsos = []; + foreach ($results as $data) { + $qsos[] = new QSO($data); + } + + return $qsos; + } + + public function getQsosForAdif($ids, $user_id) : object { + $binding = [$user_id]; + $conditions[] = "COL_PRIMARY_KEY in ?"; + $binding[] = json_decode($ids, true); + + $where = trim(implode(" AND ", $conditions)); + if ($where != "") { + $where = "AND $where"; + } + + $sql = " + SELECT * + FROM " . $this->config->item('table_name') . " qsos + INNER JOIN station_profile ON qsos.station_id = station_profile.station_id + WHERE station_profile.user_id = ? + $where + ORDER BY qsos.COL_TIME_ON desc + "; + + return $this->db->query($sql, $binding); + } + + public function updateQsl($ids, $user_id, $method, $sent) { + $this->load->model('user_model'); + + if(!$this->user_model->authorize(2)) { + return array('message' => 'Error'); + } else { + $data = array( + 'COL_QSLSDATE' => date('Y-m-d H:i:s'), + 'COL_QSL_SENT' => $sent, + 'COL_QSL_SENT_VIA' => $method + ); + $this->db->where_in('COL_PRIMARY_KEY', json_decode($ids, true)); + $this->db->update($this->config->item('table_name'), $data); + + return array('message' => 'OK'); + } + } +} \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 66e919e2..30042f80 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -3187,5 +3187,14 @@ function deleteQsl(id) { + + + diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 0918e572..7900ea91 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -36,7 +36,7 @@ - uri->segment(1) == "adif") { ?> + uri->segment(1) == "adif" || (isset($hasDatePicker) && $hasDatePicker)) { ?> @@ -58,7 +58,7 @@
  • - Logbook + Logbook config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php new file mode 100644 index 00000000..118cf7d9 --- /dev/null +++ b/application/views/logbookadvanced/index.php @@ -0,0 +1,193 @@ +
    + session->flashdata('message')) { ?> + +
    +

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

    +
    + + +
    " method="post"> +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    +
    +
    + With selected : + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    		Date/TimeDeDxModeRST (S)RST (R)BandMy RefsRefsNameQSL ViaQSL SentQSL ReceivedQSL Msg
    + + +
    diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js new file mode 100644 index 00000000..ba898802 --- /dev/null +++ b/assets/js/sections/logbookadvanced.js @@ -0,0 +1,345 @@ +var callBookProcessingDialog = null; +var inCallbookProcessing = false; +var inCallbookItemProcessing = false; + +function updateRow(qso) { + let row = $('#qsoID-' + qso.qsoID); + let cells = row.find('td'); + let c = 1; + cells.eq(c++).text(qso.qsoDateTime); + cells.eq(c++).text(qso.de); + cells.eq(c++).text(qso.dx); + cells.eq(c++).text(qso.mode); + cells.eq(c++).text(qso.rstS); + cells.eq(c++).text(qso.rstR); + cells.eq(c++).text(qso.band); + cells.eq(c++).text(qso.deRefs); + cells.eq(c++).text(qso.dxRefs); + cells.eq(c++).text(qso.name); + cells.eq(c++).text(qso.qslVia); + cells.eq(c++).text(qso.qslSent); + cells.eq(c++).text(qso.qslReceived); + cells.eq(c++).text(qso.qslMessage); + return row; +} + +function loadQSOTable(rows) { + var uninitialized = $('#qsoList').filter(function() { + return !$.fn.DataTable.fnIsDataTable(this); + }); + + uninitialized.each(function() { + $(this).DataTable({ + searching: false, + responsive: false, + ordering: true, + "scrollY": window.innerHeight - 280, + "scrollCollapse": true, + "paging": false, + "scrollX": true, + "order": [ 0, 'asc' ], + }); + }); + + var table = $('#qsoList').DataTable(); + + table.clear(); + + for (i = 0; i < rows.length; i++) { + let qso = rows[i]; + + var data = [ + '
    ', + qso.qsoDateTime, + qso.de, + qso.dx, + qso.mode, + qso.rstS, + qso.rstR, + qso.band, + qso.deRefs, + qso.dxRefs, + qso.name, + qso.qslVia, + qso.qslSent, + qso.qslReceived, + qso.qslMessage, + ]; + + let createdRow = table.row.add(data).index(); + table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID); + table.row(createdRow).node().id = 'qsoID-' + qso.qsoID; + } + table.draw(); +} + +function processNextCallbookItem() { + if (!inCallbookProcessing) return; + + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + if (nElements == 0) { + inCallbookProcessing = false; + callBookProcessingDialog.close(); + return; + } + + callBookProcessingDialog.setMessage("Retrieving callbook data : " + nElements + " remaining"); + + unselectQsoID(elements.first().closest('tr').data('qsoID')); + + $.ajax({ + url: site_url + '/logbookadvanced/updateFromCallbook', + type: 'post', + data: { + qsoID: elements.first().closest('tr').data('qsoID') + }, + dataType: 'json', + success: function (data) { + if (data !== []) { + updateRow(data); + } + setTimeout("processNextCallbookItem()", 50); + }, + error: function (data) { + setTimeout("processNextCallbookItem()", 50); + }, + }); +} + +function selectQsoID(qsoID) { + var element = $("#qsoID-" + qsoID); + element.find("input[type=checkbox]").prop("checked", true); + element.addClass('alert-success') +} + + +function unselectQsoID(qsoID) { + var element = $("#qsoID-" + qsoID); + element.find("input[type=checkbox]").prop("checked", false); + element.removeClass('alert-success') +} + +$(document).ready(function () { + $('#dateFrom').datetimepicker({ + format: 'DD/MM/YYYY', + }); + $('#dateTo').datetimepicker({ + format: 'DD/MM/YYYY', + }); + + $('#searchForm').submit(function (e) { + $('#searchButton').prop("disabled", true); + + $.ajax({ + url: this.action, + type: 'post', + data: { + dateFrom: this.dateFrom.value, + dateTo: this.dateTo.value, + de: this.de.value, + dx: this.dx.value, + mode: this.mode.value, + band: this.band.value, + qslSent: this.qslSent.value, + qslReceived: this.qslReceived.value, + iota: this.iota.value, + dxcc: this.dxcc.value, + propmode: this.selectPropagation.value, + gridsquare: this.gridsquare.value, + state: this.state.value, + }, + dataType: 'json', + success: function (data) { + $('#searchButton').prop("disabled", false); + loadQSOTable(data); + }, + error: function (data) { + $('#searchButton').prop("disabled", false); + BootstrapDialog.alert({ + title: 'ERROR', + message: 'An error ocurred while making the request', + type: BootstrapDialog.TYPE_DANGER, + closable: false, + draggable: false, + callback: function (result) { + } + }); + }, + }); + return false; + }); + + $('#qsoList').on('click', 'input[type="checkbox"]', function() { + if ($(this).is(":checked")) { + $(this).closest('tr').addClass('alert-success'); + } else { + $(this).closest('tr').removeClass('alert-success'); + } + }); + + $('#btnUpdateFromCallbook').click(function (event) { + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + if (nElements == 0) { + return; + } + inCallbookProcessing = true; + + callBookProcessingDialog = BootstrapDialog.show({ + title: "Retrieving callbook data for " + nElements + " QSOs", + message: "Retrieving callbook data for " + nElements + " QSOs", + type: BootstrapDialog.TYPE_DANGER, + closable: false, + draggable: false, + buttons: [{ + label: 'Cancel', + action: function(dialog) { + inCallbookProcessing = false; + dialog.close(); + } + }] + }); + processNextCallbookItem(); + }); + + $('#deleteQsos').click(function (event) { + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + if (nElements == 0) { + return; + } + + $('#deleteQsos').prop("disabled", true); + + var table = $('#qsoList').DataTable(); + + BootstrapDialog.confirm({ + title: 'DANGER', + message: 'Warning! Are you sure you want to delete the marked QSO(s)?' , + type: BootstrapDialog.TYPE_DANGER, + closable: true, + draggable: true, + btnOKClass: 'btn-danger', + callback: function(result) { + if(result) { + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + $.ajax({ + url: base_url + 'index.php/qso/delete_ajax', + type: 'post', + data: {'id': id + }, + success: function(data) { + var row = $("#qsoID-" + id); + table.row(row).remove().draw(false); + } + }); + $('#deleteQsos').prop("disabled", false); + }) + } + } + }); + }); + + $('#exportAdif').click(function (event) { + $('#exportAdif').prop("disabled", true); + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + if (nElements == 0) { + return; + } + var id_list=[]; + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + id_list.push(id); + unselectQsoID(id); + }); + xhttp = new XMLHttpRequest(); + xhttp.onreadystatechange = function() { + var a; + if (xhttp.readyState === 4 && xhttp.status === 200) { + // Trick for making downloadable link + a = document.createElement('a'); + a.href = window.URL.createObjectURL(xhttp.response); + // Give filename you wish to download + a.download = "logbook_export.adi"; + a.style.display = 'none'; + document.body.appendChild(a); + a.click(); + } + }; + // Post data to URL which handles post request + xhttp.open("POST", site_url+'/logbookadvanced/export_to_adif', true); + xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + // You should set responseType as blob for binary responses + xhttp.responseType = 'blob'; + xhttp.send("id=" + JSON.stringify(id_list, null, 2)); + $('#exportAdif').prop("disabled", false); + }); + + $('#queueBureau').click(function (event) { + handleQsl('Q','B', 'queueBureau'); + }); + + $('#queueDirect').click(function (event) { + handleQsl('Q','D', 'queueDirect'); + }); + + $('#sentBureau').click(function (event) { + handleQsl('Y','B', 'sentBureau'); + }); + + $('#sentDirect').click(function (event) { + handleQsl('Y','D', 'sentDirect'); + }); + + $('#dontSend').click(function (event) { + handleQsl('N','', 'dontSend'); + }); + + function handleQsl(sent, method, tag) { + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + if (nElements == 0) { + return; + } + $('#'+tag).prop("disabled", true); + var id_list=[]; + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + id_list.push(id); + }); + $.ajax({ + url: base_url + 'index.php/logbookadvanced/update_qsl', + type: 'post', + data: {'id': JSON.stringify(id_list, null, 2), + 'sent' : sent, + 'method' : method + }, + success: function(data) { + if (data !== []) { + $.each(data, function(k, v) { + updateRow(this); + unselectQsoID(this.qsoID); + }); + } + $('#'+tag).prop("disabled", false); + } + }); + } + + $('#checkBoxAll').change(function (event) { + if (this.checked) { + $('#qsoList tbody tr').each(function (i) { + selectQsoID($(this).data('qsoID')) + }); + }else{ + $('#qsoList tbody tr').each(function (i) { + unselectQsoID($(this).data('qsoID')) + }); + } + }); + + $('#searchForm').submit(); +}); \ No newline at end of file diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php new file mode 100644 index 00000000..9c88f237 --- /dev/null +++ b/src/QSLManager/QSO.php @@ -0,0 +1,652 @@ +qsoID = $data['COL_PRIMARY_KEY']; + + $this->qsoDateTime = DateTime::createFromFormat("Y-m-d H:i:s", $data['COL_TIME_ON'], new DateTimeZone("UTC")); + + $this->de = $data['COL_STATION_CALLSIGN']; + $this->dx = $data['COL_CALL']; + + $this->mode = $data['COL_MODE'] ?? ''; + $this->submode = $data['COL_SUBMODE'] ?? ''; + $this->band = $data['COL_BAND']; + $this->bandRX = $data['COL_BAND_RX'] ?? ''; + $this->rstR = $data['COL_RST_RCVD']; + $this->rstS = $data['COL_RST_SENT']; + $this->propagationMode = $data['COL_PROP_MODE'] ?? ''; + $this->satelliteMode = $data['COL_SAT_MODE'] ?? ''; + $this->satelliteName = $data['COL_SAT_NAME'] ?? ''; + + $this->name = $data['COL_NAME'] ?? ''; + $this->email = $data['COL_EMAIL'] ?? ''; + $this->address = $data['COL_ADDRESS'] ?? ''; + + $this->deGridsquare = $data['COL_MY_GRIDSQUARE'] ?? ''; + $this->deIOTA = $data['COL_MY_IOTA'] ?? ''; + $this->deSig = $data['COL_MY_SIG'] ?? ''; + $this->deSigInfo = $data['COL_MY_SIG_INFO'] ?? ''; + $this->deIOTAIslandID = $data['COL_MY_IOTA_ISLAND_ID'] ?? ''; + $this->deSOTAReference = $data['COL_MY_SOTA_REF'] ?? ''; + + $this->deVUCCGridsquares = ($data['COL_MY_VUCC_GRIDS'] === null) ? [] : explode(",", $data['COL_MY_VUCC_GRIDS'] ?? ''); + + $this->dxGridsquare = $data['COL_GRIDSQUARE'] ?? ''; + $this->dxIOTA = $data['COL_IOTA'] ?? ''; + $this->dxSig = $data['COL_SIG'] ?? ''; + $this->dxSigInfo = $data['COL_SIG_INFO'] ?? ''; + $this->dxDARCDOK = $data['COL_DARC_DOK'] ?? ''; + + $this->dxSOTAReference = $data['COL_SOTA_REF'] ?? ''; + + $this->dxVUCCGridsquares = ($data['COL_VUCC_GRIDS'] === null) ? [] : explode(",", $data['COL_VUCC_GRIDS'] ?? ''); + + $this->QSLMsg = $data['COL_QSLMSG'] ?? ''; + + $this->QSLReceivedDate = ($data['COL_QSLRDATE'] === null) ? null : DateTime::createFromFormat("Y-m-d H:i:s", $data['COL_QSLRDATE'], new DateTimeZone('UTC')); + $this->QSLReceived = ($data['COL_QSL_RCVD'] === null) ? '' : $data['COL_QSL_RCVD']; + $this->QSLReceivedVia = ($data['COL_QSL_RCVD_VIA'] === null) ? '' : $data['COL_QSL_RCVD_VIA']; + $this->QSLSentDate = ($data['COL_QSLSDATE'] === null) ? null : DateTime::createFromFormat("Y-m-d H:i:s", $data['COL_QSLSDATE'], new DateTimeZone('UTC')); + $this->QSLSent = ($data['COL_QSL_SENT'] === null) ? '' : $data['COL_QSL_SENT']; + $this->QSLSentVia = ($data['COL_QSL_SENT_VIA'] === null) ? '' : $data['COL_QSL_SENT_VIA']; + $this->QSLVia = ($data['COL_QSL_VIA'] === null) ? '' : $data['COL_QSL_VIA']; + } + + /** + * @return string + */ + public function getQsoID(): string + { + return $this->qsoID; + } + + /** + * @return DateTime + */ + public function getQsoDateTime(): DateTime + { + return $this->qsoDateTime; + } + + /** + * @return string + */ + public function getDe(): string + { + return $this->de; + } + + /** + * @return string + */ + public function getDx(): string + { + return $this->dx; + } + + /** + * @return string + */ + public function getMode(): string + { + return $this->mode; + } + + /** + * @return string + */ + public function getSubmode(): string + { + return $this->submode; + } + + /** + * @return string + */ + public function getBand(): string + { + return $this->band; + } + + /** + * @return string + */ + public function getBandRX(): string + { + return $this->bandRX; + } + + /** + * @return string + */ + public function getRstR(): string + { + return $this->rstR; + } + + /** + * @return string + */ + public function getRstS(): string + { + return $this->rstS; + } + + /** + * @return string + */ + public function getPropagationMode(): string + { + return $this->propagationMode; + } + + /** + * @return string + */ + public function getSatelliteMode(): string + { + return $this->satelliteMode; + } + + /** + * @return string + */ + public function getSatelliteName(): string + { + return $this->satelliteName; + } + + /** + * @return string + */ + public function getName(): string + { + return $this->name; + } + + /** + * @return string + */ + public function getEmail(): string + { + return $this->email; + } + + /** + * @return string + */ + public function getAddress(): string + { + return $this->address; + } + + /** + * @return string + */ + public function getDeGridsquare(): string + { + return $this->deGridsquare; + } + + /** + * @return string + */ + public function getDeIOTA(): string + { + return $this->deIOTA; + } + + /** + * @return string + */ + public function getDeSig(): string + { + return $this->deSig; + } + + /** + * @return string + */ + public function getDeSigInfo(): string + { + return $this->deSigInfo; + } + + /** + * @return string + */ + public function getDeIOTAIslandID(): string + { + return $this->deIOTAIslandID; + } + + /** + * @return string + */ + public function getDeSOTAReference(): string + { + return $this->deSOTAReference; + } + + /** + * @return string[] + */ + public function getDeVUCCGridsquares(): array + { + return $this->deVUCCGridsquares; + } + + /** + * @return string + */ + public function getDxGridsquare(): string + { + return $this->dxGridsquare; + } + + /** + * @return string + */ + public function getDxIOTA(): string + { + return $this->dxIOTA; + } + + /** + * @return string + */ + public function getDxSig(): string + { + return $this->dxSig; + } + + /** + * @return string + */ + public function getDxSigInfo(): string + { + return $this->dxSigInfo; + } + + /** + * @return string + */ + public function getDxDARCDOK(): string + { + return $this->dxDARCDOK; + } + + /** + * @return string + */ + public function getDxSOTAReference(): string + { + return $this->dxSOTAReference; + } + + /** + * @return string[] + */ + public function getDxVUCCGridsquares(): array + { + return $this->dxVUCCGridsquares; + } + + /** + * @return string + */ + public function getQSLMsg(): string + { + return $this->QSLMsg; + } + + /** + * @return ?DateTime + */ + public function getQSLReceivedDate(): ?DateTime + { + return $this->QSLReceivedDate; + } + + /** + * @return string + */ + public function getQSLReceived(): string + { + return $this->QSLReceived; + } + + /** + * @return string + */ + public function getQSLReceivedVia(): string + { + return $this->QSLReceivedVia; + } + + /** + * @return ?DateTime + */ + public function getQSLSentDate(): ?DateTime + { + return $this->QSLSentDate; + } + + /** + * @return string + */ + public function getQSLSent(): string + { + return $this->QSLSent; + } + + /** + * @return string + */ + public function getQSLSentVia(): string + { + return $this->QSLSentVia; + } + + /** + * @return string + */ + public function getQSLVia(): string + { + return $this->QSLVia; + } + + public function toArray(): array + { + return [ + 'qsoID' => $this->qsoID, + 'qsoDateTime' => $this->qsoDateTime->format("Y-m-d H:i"), + 'de' => $this->de, + 'dx' => $this->dx, + 'mode' => $this->getFormattedMode(), + 'rstS' => $this->rstS, + 'rstR' => $this->rstR, + 'band' => $this->getFormattedBand(), + 'deRefs' => $this->getFormattedDeRefs(), + 'dxRefs' => $this->getFormattedDxRefs(), + 'qslVia' => $this->QSLVia, + 'qslSent' => $this->getFormattedQSLSent(), + 'qslReceived' => $this->getFormattedQSLReceived(), + 'qslMessage' => $this->getQSLMsg(), + 'name' => $this->getName(), + ]; + } + + private function getFormattedMode(): string + { + if ($this->submode !== '') { + return $this->submode; + } else { + return $this->mode; + } + } + + private function getFormattedBand(): string + { + $label = ""; + if ($this->propagationMode !== '') { + $label .= $this->propagationMode; + if ($this->satelliteName !== '') { + $label .= " " . $this->satelliteName; + if ($this->satelliteMode !== '') { + $label .= " " . $this->satelliteMode; + } + } + } + $label .= " " . $this->band; + if ($this->bandRX !== '' && $this->band !== '') { + $label .= "/" . $this->bandRX; + } + return trim($label); + } + + private function getFormattedDeRefs(): string + { + $refs = []; + if ($this->deVUCCGridsquares !== []) { + $refs[] = implode(",", $this->deVUCCGridsquares); + } else { + if ($this->deGridsquare !== '') { + $refs[] = $this->deGridsquare; + } + } + if ($this->deIOTA !== '') { + if ($this->deIOTAIslandID !== '') { + $refs[] = "IOTA:" . $this->deIOTA . "(" . $this->deIOTAIslandID . ")"; + } else { + $refs[] = "IOTA:" . $this->deIOTA; + } + } + if ($this->deSOTAReference !== '') { + $refs[] = "SOTA:" . $this->deSOTAReference; + } + if ($this->deSig !== '') { + $refs[] = $this->deSig . ":" . $this->deSigInfo; + } + return trim(implode(" ", $refs)); + } + + private function getFormattedDxRefs(): string + { + $refs = []; + if ($this->dxVUCCGridsquares !== []) { + $refs[] = implode(",", $this->dxVUCCGridsquares); + } else if ($this->dxGridsquare !== '') { + $refs[] = $this->dxGridsquare; + } + if ($this->dxIOTA !== '') { + $refs[] = "IOTA:" . $this->dxIOTA; + } + if ($this->dxSOTAReference !== '') { + $refs[] = "SOTA:" . $this->dxSOTAReference; + } + if ($this->dxSig !== '') { + $refs[] = $this->dxSig . ":" . $this->dxSigInfo; + } + if ($this->dxDARCDOK !== '') { + $refs[] = "DOK:" . $this->dxDARCDOK; + } + return implode(" ", $refs); + } + + private function getFormattedQSLSent(): string + { + $showVia = false; + $label = []; + if ($this->QSLSent === "Y") { + if ($this->QSLSentDate !== null) { + $label[] = $this->QSLSentDate->format("Y-m-d"); + } else { + $label[] = "Yes"; + } + $showVia = true; + } else if ($this->QSLSent === "N") { + $label[] = "No"; + } else if ($this->QSLSent === "Q") { + $label[] = "Queued"; + if ($this->QSLSentDate !== null) { + $label[] = $this->QSLSentDate->format("Y-m-d"); + } + $showVia = true; + } else if ($this->QSLSent === "R") { + $label[] = "Requested"; + if ($this->QSLSentDate !== null) { + $label[] = $this->QSLSentDate->format("Y-m-d"); + } + $showVia = true; + } + + if ($showVia && $this->QSLSentVia !== '') { + switch ($this->QSLSentVia) { + case 'B': + $label[] = "Bureau"; + break; + case 'D': + $label[] = "Direct"; + break; + case 'E': + $label[] = "Electronic"; + break; + case 'M': + $label[] = "Manager"; + break; + } + } + + return trim(implode(" ", $label)); + } + + private function getFormattedQSLReceived(): string + { + $showVia = false; + $label = []; + if ($this->QSLReceived === "Y") { + if ($this->QSLReceivedDate !== null) { + $label[] = $this->QSLReceivedDate->format("Y-m-d"); + } else { + $label[] = "Yes"; + } + $showVia = true; + } else if ($this->QSLReceived === "N") { + $label[] = "No"; + } else if ($this->QSLReceived === "Q") { + $label[] = "Queued"; + if ($this->QSLReceivedDate !== null) { + $label[] = $this->QSLReceivedDate->format("Y-m-d"); + } + $showVia = true; + } else if ($this->QSLReceived === "R") { + $label[] = "Requested"; + if ($this->QSLReceivedDate !== null) { + $label[] = $this->QSLReceivedDate->format("Y-m-d"); + } + $showVia = true; + } + + if ($showVia && $this->QSLReceivedVia !== '') { + switch ($this->QSLReceivedVia) { + case 'B': + $label[] = "Bureau"; + break; + case 'D': + $label[] = "Direct"; + break; + case 'E': + $label[] = "Electronic"; + break; + case 'M': + $label[] = "Manager"; + break; + } + } + + return trim(implode(" ", $label)); + } +} From 6cd742bea361a89fb53160ec590ea667761ffa18 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 18 Dec 2022 19:50:54 +0100 Subject: [PATCH 09/24] [Logbookadvanced] Added a few more columns --- application/views/logbookadvanced/index.php | 4 ++ assets/js/sections/logbookadvanced.js | 8 ++++ src/QSLManager/QSO.php | 43 +++++++++++++++++++-- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 118cf7d9..5e8f4066 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -183,6 +183,10 @@ QSL Sent QSL Received QSL Msg + DXCC + State + CQ Zone + IOTA diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index ba898802..d51da1b8 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -20,6 +20,10 @@ function updateRow(qso) { cells.eq(c++).text(qso.qslSent); cells.eq(c++).text(qso.qslReceived); cells.eq(c++).text(qso.qslMessage); + cells.eq(c++).text(qso.dxcc); + cells.eq(c++).text(qso.state); + cells.eq(c++).text(qso.cqzone); + cells.eq(c++).text(qso.iota); return row; } @@ -64,6 +68,10 @@ function loadQSOTable(rows) { qso.qslSent, qso.qslReceived, qso.qslMessage, + qso.dxcc, + qso.state, + qso.cqzone, + qso.iota, ]; let createdRow = table.row.add(data).index(); diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 9c88f237..196241fb 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -31,6 +31,11 @@ class QSO private string $deSigInfo; private string $deIOTAIslandID; private string $deSOTAReference; + /** Awards */ + private string $cqzone; + private string $state; + private string $dxcc; + private string $iota; /** @var string[] */ private array $deVUCCGridsquares; private string $dxGridsquare; @@ -93,7 +98,11 @@ class QSO 'COL_MY_VUCC_GRIDS', 'COL_SOTA_REF', 'COL_SUBMODE', - 'COL_VUCC_GRIDS' + 'COL_VUCC_GRIDS', + 'COL_CQZ', + 'COL_STATE', + 'COL_COUNTRY', + 'COL_IOTA', ]; @@ -152,6 +161,11 @@ class QSO $this->QSLSent = ($data['COL_QSL_SENT'] === null) ? '' : $data['COL_QSL_SENT']; $this->QSLSentVia = ($data['COL_QSL_SENT_VIA'] === null) ? '' : $data['COL_QSL_SENT_VIA']; $this->QSLVia = ($data['COL_QSL_VIA'] === null) ? '' : $data['COL_QSL_VIA']; + + $this->cqzone = $data['COL_CQZ']; + $this->state = $data['COL_STATE']; + $this->dxcc = $data['COL_COUNTRY']; + $this->iota = $data['COL_IOTA']; } /** @@ -458,6 +472,26 @@ class QSO return $this->QSLVia; } + public function getDXCC(): string + { + return $this->dxcc; + } + + public function getCqzone(): string + { + return $this->cqzone; + } + + public function getState(): string + { + return $this->state; + } + + public function getIOTA(): string + { + return $this->iota; + } + public function toArray(): array { return [ @@ -476,6 +510,10 @@ class QSO 'qslReceived' => $this->getFormattedQSLReceived(), 'qslMessage' => $this->getQSLMsg(), 'name' => $this->getName(), + 'dxcc' => $this->getDXCC(), + 'state' => $this->getState(), + 'cqzone' => $this->getCqzone(), + 'iota' => $this->getIOTA(), ]; } @@ -541,9 +579,6 @@ class QSO } else if ($this->dxGridsquare !== '') { $refs[] = $this->dxGridsquare; } - if ($this->dxIOTA !== '') { - $refs[] = "IOTA:" . $this->dxIOTA; - } if ($this->dxSOTAReference !== '') { $refs[] = "SOTA:" . $this->dxSOTAReference; } From 067196e4f517ed371748bac069d515572e76863a Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 18 Dec 2022 19:55:23 +0100 Subject: [PATCH 10/24] [Logbookadvanced] Reset now resets form and does initial search. --- assets/js/sections/logbookadvanced.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index d51da1b8..f80d638f 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -306,6 +306,12 @@ $(document).ready(function () { handleQsl('N','', 'dontSend'); }); + $('#searchForm').on('reset', function(e) { + setTimeout(function() { + $('#searchForm').submit(); + }); + }); + function handleQsl(sent, method, tag) { var elements = $('#qsoList tbody input:checked'); var nElements = elements.length; From 2cf7e87d757faaf8050bf850165192dde73e785f Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 18 Dec 2022 20:28:41 +0100 Subject: [PATCH 11/24] Fixed frequency tag in logbook. --- application/views/view_log/partial/log_ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 666e970d..69b42565 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -12,7 +12,7 @@ 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 'Frequency': echo ''.$ctx->lang->line('gen_hamradio_frequency').''; break; case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').''; break; } } From 044b0df782c02de8df6bc19aa6225783c2223e60 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 18 Dec 2022 21:16:06 +0100 Subject: [PATCH 12/24] Convert Hz to MHz on public pages --- application/views/visitor/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index 1915f86c..b2b4ec6f 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -16,6 +16,7 @@ function echo_table_header_col($ctx, $name) { } 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; @@ -27,7 +28,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_FREQ != null) { echo $row->COL_FREQ; } else { echo strtolower($row->COL_BAND); } echo ''; break; + case 'Frequency': echo ''; 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; } From f5bd6df41930ae399ed0922549eebe3c9601bbe5 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 19 Dec 2022 10:32:34 +0100 Subject: [PATCH 13/24] [Advanced search] Fixed correct tag in table head --- .../views/search/search_result_ajax.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 2ec79336..3f9282b8 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -2,13 +2,13 @@ - + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + '; + echo ''; if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> - + session->userdata('user_eqsl_name') != "") { ?> - + session->userdata('user_lotw_name') != "") { ?> - + - + + From 04e996073485a1edd2796e5c41356db16e69f785 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 19 Dec 2022 11:44:46 +0100 Subject: [PATCH 14/24] [Advanced search] Fixed frequency column --- application/views/search/search_result_ajax.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 3f9282b8..6af48d37 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -8,6 +8,7 @@ '; switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; @@ -93,7 +94,7 @@ - config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -135,6 +136,7 @@ case 'Band': 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 ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { @@ -150,6 +152,7 @@ case 'Band': 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 ''; @@ -166,6 +169,7 @@ case 'Band': 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 ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { @@ -181,6 +185,7 @@ case 'Band': 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 ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { @@ -196,6 +201,7 @@ case 'Band': 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(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> From 26cc67a55b5104e107720ebda6be9c03fe73f78f Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:20:55 +0100 Subject: [PATCH 15/24] [Logbookadvanced] Added dropdown to choose number of results returned --- application/controllers/Logbookadvanced.php | 1 + application/models/Logbookadvanced_model.php | 6 +----- application/views/logbookadvanced/index.php | 11 ++++++++++- assets/js/sections/logbookadvanced.js | 1 + src/QSLManager/QSO.php | 8 ++++---- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 1a0c8226..ee300a5d 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -94,6 +94,7 @@ class Logbookadvanced extends CI_Controller { 'propmode' => xss_clean($this->input->post('propmode')), 'gridsquare' => xss_clean($this->input->post('gridsquare')), 'state' => xss_clean($this->input->post('state')), + 'qsoresults' => xss_clean($this->input->post('qsoresults')), ); $qsos = []; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 232b38d2..004f298f 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -114,11 +114,7 @@ class Logbookadvanced_model extends CI_Model { $where = "AND $where"; } - if ($where === '') { - $limit = 250; - } else { - $limit = 1000; - } + $limit = $searchCriteria['qsoresults']; $sql = " SELECT * diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 5e8f4066..dec78643 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -101,7 +101,7 @@
    - +
    +
    + + +

    diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index f80d638f..1598225c 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -156,6 +156,7 @@ $(document).ready(function () { propmode: this.selectPropagation.value, gridsquare: this.gridsquare.value, state: this.state.value, + qsoresults: this.qsoResults.value }, dataType: 'json', success: function (data) { diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 196241fb..4d08859c 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -162,10 +162,10 @@ class QSO $this->QSLSentVia = ($data['COL_QSL_SENT_VIA'] === null) ? '' : $data['COL_QSL_SENT_VIA']; $this->QSLVia = ($data['COL_QSL_VIA'] === null) ? '' : $data['COL_QSL_VIA']; - $this->cqzone = $data['COL_CQZ']; - $this->state = $data['COL_STATE']; - $this->dxcc = $data['COL_COUNTRY']; - $this->iota = $data['COL_IOTA']; + $this->cqzone = ($data['COL_CQZ'] === null) ? '' : $data['COL_CQZ']; + $this->state = ($data['COL_STATE'] === null) ? '' :$data['COL_STATE']; + $this->dxcc = ($data['COL_COUNTRY'] === null) ? '' :$data['COL_COUNTRY']; + $this->iota = ($data['COL_IOTA'] === null) ? '' :$data['COL_IOTA']; } /** From 6ca8bb117f1b50a75c74fd3b567d54a312d8e604 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:33:48 +0100 Subject: [PATCH 16/24] [Logbookadvanced] Improved layout on different resolutions --- application/views/logbookadvanced/index.php | 33 +++++++++++---------- assets/js/sections/logbookadvanced.js | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index dec78643..92aef78e 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -5,10 +5,10 @@

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

    - +
    " method="post">
    -
    +
    @@ -17,7 +17,7 @@
    -
    +
    @@ -26,7 +26,7 @@
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +

    @@ -174,6 +174,7 @@
    +
    lang->line('general_word_date'); ?>lang->line('general_word_date'); ?> lang->line('general_word_time'); ?>lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?>lang->line('gen_hamradio_call'); ?> '; switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; @@ -22,8 +22,8 @@ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } - echo ''; - echo ''; + echo ''; + echo ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; @@ -37,8 +37,8 @@ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } - echo ''; - echo ''; + echo ''; + echo ''; switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; @@ -52,8 +52,8 @@ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } - echo ''; - echo ''; + echo ''; + echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; @@ -67,8 +67,8 @@ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } - echo ''; - echo ''; + echo ''; + echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; @@ -82,20 +82,20 @@ case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } - echo ''; + echo 'QSLQSL eQSLeQSL LoTWLoTW lang->line('gen_hamradio_station'); ?>lang->line('gen_hamradio_station'); ?> config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> -
    lang->line('gen_hamradio_call'); ?> LoTW lang->line('gen_hamradio_station'); ?> + lang->line('gen_hamradio_station'); ?> '; 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; + case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } 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; + case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } 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; + case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } 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; + case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } 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; + case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo '
    diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 1598225c..22121674 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -37,7 +37,7 @@ function loadQSOTable(rows) { searching: false, responsive: false, ordering: true, - "scrollY": window.innerHeight - 280, + "scrollY": window.innerHeight - $('#searchForm').innerHeight() - 250, "scrollCollapse": true, "paging": false, "scrollX": true, From 52401647f94059ec15eb34701074841b15078d9c Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:23:22 +0100 Subject: [PATCH 17/24] [Logbookadvanced] Saves callsign callbook info in database --- application/controllers/Logbookadvanced.php | 6 ++- application/models/Logbookadvanced_model.php | 43 ++++++++++++++++++++ assets/js/sections/logbookadvanced.js | 2 +- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index ee300a5d..7b459814 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -108,6 +108,7 @@ class Logbookadvanced extends CI_Controller { public function updateFromCallbook() { $this->load->model('logbook_model'); + $this->load->model('logbookadvanced_model'); $qsoID = xss_clean($this->input->post('qsoID')); $qso = $this->logbook_model->qso_info($qsoID)->row_array(); @@ -120,8 +121,11 @@ class Logbookadvanced extends CI_Controller { $callbook = $this->logbook_model->loadCallBook($qso['COL_CALL'], $this->config->item('use_fullname')); if ($callbook['callsign'] !== "") { + $this->logbookadvanced_model->updateQsoWithCallbookInfo($qsoID, $qso, $callbook); $qso['COL_NAME'] = trim($callbook['name']); - $qso['COL_QSL_VIA'] = trim($callbook['qslmgr']); + if (isset($callbook['qslmgr'])) { + $qso['COL_QSL_VIA'] = trim($callbook['qslmgr']); + } } $qsoObj = new QSO($qso); diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 004f298f..3f39b075 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -177,4 +177,47 @@ class Logbookadvanced_model extends CI_Model { return array('message' => 'OK'); } } + + public function updateQsoWithCallbookInfo($qsoID, $qso, $callbook) { + $updatedData = array(); + if (!empty($callbook['name']) && empty($qso['COL_NAME'])) { + $updatedData['COL_NAME'] = $callbook['name']; + } + if (!empty($callbook['gridsquare']) && empty($qso['COL_GRIDSQUARE']) && empty($qso['COL_VUCC_GRIDS'] )) { + if (strpos(trim($callbook['gridsquare']), ',') === false) { + $updatedData['COL_GRIDSQUARE'] = strtoupper(trim($callbook['gridsquare'])); + } else { + $updatedData['COL_VUCC_GRIDS'] = strtoupper(trim($callbook['gridsquare'])); + } + } + if (!empty($callbook['city']) && empty($qso['COL_QTH'])) { + $updatedData['COL_QTH'] = $callbook['city']; + } + if (!empty($callbook['lat']) && empty($qso['COL_LAT'])) { + $updatedData['COL_LAT'] = $callbook['lat']; + } + if (!empty($callbook['long']) && empty($qso['COL_LON'])) { + $updatedData['COL_LON'] = $callbook['long']; + } + if (!empty($callbook['iota']) && empty($qso['COL_IOTA'])) { + $updatedData['COL_IOTA'] = $callbook['iota']; + } + if (!empty($callbook['state']) && empty($qso['COL_STATE'])) { + $updatedData['COL_STATE'] = $callbook['state']; + } + if (!empty($callbook['us_county']) && empty($qso['COL_USACA_COUNTIES'])) { + $updatedData['COL_USACA_COUNTIES'] = $callbook['us_county']; + } + if (!empty($callbook['qslmgr']) && empty($qso['COL_QSL_VIA'])) { + $updatedData['COL_QSL_VIA'] = $callbook['qslmgr']; + } + + if (count($updatedData) > 0) { + $this->db->where('COL_PRIMARY_KEY', $qsoID); + $this->db->update($this->config->item('table_name'), $updatedData); + return true; + } + + return false; + } } \ No newline at end of file diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 22121674..87e0ebff 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -56,7 +56,7 @@ function loadQSOTable(rows) { '
    ', qso.qsoDateTime, qso.de, - qso.dx, + ''+qso.dx+'', qso.mode, qso.rstS, qso.rstR, From 1b57e55dbe3b83c7ff08c75384ef5d1efc042e5c Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:33:43 +0100 Subject: [PATCH 18/24] [Logbookadvanced] Fixed so that master checkbox is also unchecked after executing batch job --- assets/js/sections/logbookadvanced.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 87e0ebff..4b28896d 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -118,14 +118,14 @@ function processNextCallbookItem() { function selectQsoID(qsoID) { var element = $("#qsoID-" + qsoID); element.find("input[type=checkbox]").prop("checked", true); - element.addClass('alert-success') + element.addClass('alert-success'); } - function unselectQsoID(qsoID) { var element = $("#qsoID-" + qsoID); element.find("input[type=checkbox]").prop("checked", false); - element.removeClass('alert-success') + element.removeClass('alert-success'); + $('#checkBoxAll').prop("checked", false); } $(document).ready(function () { @@ -349,7 +349,7 @@ $(document).ready(function () { $('#qsoList tbody tr').each(function (i) { selectQsoID($(this).data('qsoID')) }); - }else{ + } else { $('#qsoList tbody tr').each(function (i) { unselectQsoID($(this).data('qsoID')) }); From d10a10569e1133e820a4309c64e86f0bc999296b Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 21 Dec 2022 07:54:05 +0100 Subject: [PATCH 19/24] [Logbookadvanced] Fixed callsign link when updating row --- assets/js/sections/logbookadvanced.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 4b28896d..083260e0 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -8,7 +8,7 @@ function updateRow(qso) { let c = 1; cells.eq(c++).text(qso.qsoDateTime); cells.eq(c++).text(qso.de); - cells.eq(c++).text(qso.dx); + cells.eq(c++).html(''+qso.dx+''); cells.eq(c++).text(qso.mode); cells.eq(c++).text(qso.rstS); cells.eq(c++).text(qso.rstR); From be871d384e70263020401dccb83968564024c7f3 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 21 Dec 2022 10:49:23 +0100 Subject: [PATCH 20/24] [Logbookadvanced] Search fix for SAT --- application/models/Logbookadvanced_model.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 3f39b075..58dccd1f 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -71,8 +71,12 @@ class Logbookadvanced_model extends CI_Model { } } if ($searchCriteria['band'] !== '') { - $conditions[] = "COL_BAND = ?"; - $binding[] = trim($searchCriteria['band']); + if($searchCriteria['band'] != "SAT") { + $conditions[] = "COL_BAND = ? and COL_PROP_MODE != 'SAT'"; + $binding[] = trim($searchCriteria['band']); + } else { + $conditions[] = "COL_PROP_MODE = 'SAT'"; + } } if ($searchCriteria['qslSent'] !== '') { $conditions[] = "COL_QSL_SENT = ?"; From 07617e65ff585ca1c051d29f742406c1ada7a02f Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 21 Dec 2022 14:14:01 +0100 Subject: [PATCH 21/24] Check eQSL/LotW dates for NULL before using them --- application/views/view_log/partial/log_ajax.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index aac617c1..2f2dd0b0 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -184,8 +184,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { session->userdata('user_eqsl_name') != ""){ ?> From a8987d1c111494e4020c414cdbba869f156799f5 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 21 Dec 2022 14:37:10 +0100 Subject: [PATCH 22/24] Have two separate items for logbook and advanced --- application/views/interface_assets/header.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7900ea91..b63c3e68 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -58,7 +58,14 @@
    • - Logbook +
    • + +
      + Overview +
      + Advanced +
      +
      • config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> From 08f08d2e9a8d95e55597cefd6eba85f2a281b804 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 21 Dec 2022 21:24:35 +0100 Subject: [PATCH 23/24] Reupload IO-117 and FO-118 QSOs to LotW --- application/config/migration.php | 2 +- .../111_reupload_io117_and_fo118.php | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 application/migrations/111_reupload_io117_and_fo118.php diff --git a/application/config/migration.php b/application/config/migration.php index fc8056f6..8b65b299 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 110; +$config['migration_version'] = 111; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/111_reupload_io117_and_fo118.php b/application/migrations/111_reupload_io117_and_fo118.php new file mode 100644 index 00000000..9e5d5145 --- /dev/null +++ b/application/migrations/111_reupload_io117_and_fo118.php @@ -0,0 +1,21 @@ +db->set('COL_LOTW_QSL_SENT', 'N'); + $this->db->where('COL_SAT_NAME', 'IO-117'); + $this->db->update($this->config->item('table_name')); + + $this->db->set('COL_LOTW_QSL_SENT', 'N'); + $this->db->where('COL_SAT_NAME', 'FO-118'); + $this->db->update($this->config->item('table_name')); + } + + public function down() + { + // Not Possible + } +} From 309732c739183223a24be32d844ddfab56e79d94 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 21 Dec 2022 21:27:36 +0100 Subject: [PATCH 24/24] Fix typo --- application/migrations/111_reupload_io117_and_fo118.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/111_reupload_io117_and_fo118.php b/application/migrations/111_reupload_io117_and_fo118.php index 9e5d5145..6e6506b7 100644 --- a/application/migrations/111_reupload_io117_and_fo118.php +++ b/application/migrations/111_reupload_io117_and_fo118.php @@ -1,7 +1,7 @@
    - COL_EQSL_QSL_SENT == "Y") { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲ - COL_EQSL_QSL_RCVD == "Y") { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> + COL_EQSL_QSL_SENT == "Y") { echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲ + COL_EQSL_QSL_RCVD == "Y") { echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> COL_EQSL_QSL_RCVD =='Y') { ?> COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼ @@ -197,8 +197,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { session->userdata('user_lotw_name') != "") { ?> - COL_LOTW_QSL_SENT == "Y") { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">▲ - COL_LOTW_QSL_RCVD == "Y") { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">▼ + COL_LOTW_QSL_SENT == "Y") { echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">▲ + COL_LOTW_QSL_RCVD == "Y") { echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">▼