From b5db88028fe60b6d3463368a02a9404257bfab5c Mon Sep 17 00:00:00 2001 From: int2001 Date: Mon, 5 Feb 2024 13:10:45 +0000 Subject: [PATCH 1/2] Make consequent use of SIG-References from station_profile --- application/controllers/Logbook.php | 20 ++++++++++---------- application/models/Logbook_model.php | 16 ++++++++++++---- application/views/view_log/qso.php | 16 ++++++++-------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 28a966fc5..82a1e44cf 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -613,17 +613,17 @@ class Logbook extends CI_Controller { $data['query'] = $this->logbook_model->get_qso($id); $data['dxccFlag'] = $this->dxccflag->get($data['query']->result()[0]->COL_DXCC); - if ($this->session->userdata('user_measurement_base') == NULL) { - $data['measurement_base'] = $this->config->item('measurement_base'); - } - else { - $data['measurement_base'] = $this->session->userdata('user_measurement_base'); - } + if ($this->session->userdata('user_measurement_base') == NULL) { + $data['measurement_base'] = $this->config->item('measurement_base'); + } + else { + $data['measurement_base'] = $this->session->userdata('user_measurement_base'); + } - $this->load->model('Qsl_model'); - $data['qslimages'] = $this->Qsl_model->getQslForQsoId($id); - $data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC); - $data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC); + $this->load->model('Qsl_model'); + $data['qslimages'] = $this->Qsl_model->getQslForQsoId($id); + $data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC); + $data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC); $data['max_upload'] = ini_get('upload_max_filesize'); $this->load->view('interface_assets/mini_header', $data); $this->load->view('view_log/qso'); diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index a9636cde7..25dc7d930 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1044,6 +1044,10 @@ class Logbook_model extends CI_Model { $station_profile=$this->stations->profile_clean($stationId); $stationCallsign=$station_profile->station_callsign; + $iotaRef = $station_profile->station_iota ?? ''; + $sotaRef = $station_profile->station_sota ?? ''; + $wwffRef = $station_profile->station_wwff ?? ''; + $potaRef = $station_profile->station_pota ?? ''; $mode = $this->get_main_mode_if_submode($this->input->post('mode')); if ($mode == null) { @@ -1222,7 +1226,11 @@ class Logbook_model extends CI_Model { 'COL_STATION_CALLSIGN' => $stationCallsign, 'COL_OPERATOR' => $this->input->post('operator_callsign'), 'COL_STATE' =>$this->input->post('usa_state'), - 'COL_CNTY' => $uscounty + 'COL_CNTY' => $uscounty, + 'COL_MY_IOTA' => $iotaRef, + 'COL_MY_SOTA_REF' => $sotaRef, + 'COL_MY_WWFF_REF' => $wwffRef, + 'COL_MY_POTA_REF' => $potaRef, ); if ($this->exists_hrdlog_credentials($data['station_id'])) { @@ -3778,9 +3786,9 @@ function lotw_last_qsl_date($user_id) { } $data['COL_MY_CITY'] = trim($row['station_city']); - $data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota'])); - $data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota'])); - $data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff'])); + $data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota'] ?? '')); + $data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota'] ?? '')); + $data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff'] ?? '')); $data['COL_MY_POTA_REF'] = $row['station_pota'] == null ? '' : strtoupper(trim($row['station_pota'])); $data['COL_STATION_CALLSIGN'] = strtoupper(trim($row['station_callsign'])); diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 7912eb6aa..f6d3a31e5 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -504,31 +504,31 @@ - COL_MY_IOTA) { ?> + station_iota) { ?> - COL_MY_IOTA; ?> + station_iota; ?> - COL_MY_SOTA_REF) { ?> + station_sota) { ?> - COL_MY_SOTA_REF; ?> + station_sota; ?> - COL_MY_WWFF_REF) { ?> + station_wwff) { ?> - COL_MY_WWFF_REF; ?> + station_wwff; ?> - COL_MY_POTA_REF) { ?> + station_pota) { ?> - COL_MY_POTA_REF; ?> + station_pota; ?> From 4c51b3dd5edcb56b548f30ff1d79e6bc7490ea12 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 6 Feb 2024 12:42:32 +0100 Subject: [PATCH 2/2] Also include SIG and SIG_INFO --- application/models/Logbook_model.php | 8 +++++++- application/views/view_log/qso.php | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 25dc7d930..beb7c8197 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1048,6 +1048,8 @@ class Logbook_model extends CI_Model { $sotaRef = $station_profile->station_sota ?? ''; $wwffRef = $station_profile->station_wwff ?? ''; $potaRef = $station_profile->station_pota ?? ''; + $sig = $station_profile->station_sig ?? ''; + $sigInfo = $station_profile->station_sig_info ?? ''; $mode = $this->get_main_mode_if_submode($this->input->post('mode')); if ($mode == null) { @@ -1231,6 +1233,8 @@ class Logbook_model extends CI_Model { 'COL_MY_SOTA_REF' => $sotaRef, 'COL_MY_WWFF_REF' => $wwffRef, 'COL_MY_POTA_REF' => $potaRef, + 'COL_MY_SIG' => $sig, + 'COL_MY_SIG_INFO' => $sigInfo ); if ($this->exists_hrdlog_credentials($data['station_id'])) { @@ -3789,7 +3793,9 @@ function lotw_last_qsl_date($user_id) { $data['COL_MY_IOTA'] = strtoupper(trim($row['station_iota'] ?? '')); $data['COL_MY_SOTA_REF'] = strtoupper(trim($row['station_sota'] ?? '')); $data['COL_MY_WWFF_REF'] = strtoupper(trim($row['station_wwff'] ?? '')); - $data['COL_MY_POTA_REF'] = $row['station_pota'] == null ? '' : strtoupper(trim($row['station_pota'])); + $data['COL_MY_POTA_REF'] = strtoupper(trim($row['station_pota'] ?? '')); + $data['COL_MY_SIG'] = strtoupper(trim($row['station_sig'] ?? '')); + $data['COL_MY_SIG_INFO'] = strtoupper(trim($row['station_sig_info'] ?? '')); $data['COL_STATION_CALLSIGN'] = strtoupper(trim($row['station_callsign'])); $data['COL_MY_DXCC'] = strtoupper(trim($row['station_dxcc'])); diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index f6d3a31e5..9642033c1 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -531,6 +531,18 @@ station_pota; ?> + + station_sig) { ?> + + + station_sig; ?> + + + + + station_sig_info; ?> + +