From e8a992f8b5caaeb53bfe8a5b69f9e8fa2dbef85f Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 9 Nov 2024 09:10:07 +0100 Subject: [PATCH] Add badge metadata for QSO view --- application/controllers/Logbook.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index ef0885fd2..1170f15c4 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -843,6 +843,8 @@ class Logbook extends CI_Controller { $this->load->model('logbook_model'); $entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); $callsign['callsign']['dxcc_name'] = $entity['name']; + $callsign['dxcc_worked'] = $this->logbook_model->check_if_dxcc_worked_in_logbook($callsign['callsign']['dxcc'], null, $this->session->userdata('user_default_band')); + $callsign['dxcc_confirmed'] = $this->logbook_model->check_if_dxcc_cnfmd_in_logbook($callsign['callsign']['dxcc'], null, $this->session->userdata('user_default_band')); } } else if ($this->config->item('callbook') == "hamqth" && $this->config->item('hamqth_username') != null && $this->config->item('hamqth_password') != null) { // Load the HamQTH library @@ -863,12 +865,14 @@ class Logbook extends CI_Controller { } if (isset($data['callsign']['gridsquare'])) { $this->load->model('logbook_model'); - $callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'))->num_rows(); + $callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), null, $this->session->userdata('user_default_band'))->num_rows(); } if (isset($callsign['callsign']['dxcc'])) { $this->load->model('logbook_model'); $entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); $callsign['callsign']['dxcc_name'] = $entity['name']; + $callsign['dxcc_worked'] = $this->logbook_model->check_if_dxcc_worked_in_logbook($callsign['callsign']['dxcc'], null, $this->session->userdata('user_default_band')); + $callsign['dxcc_confirmed'] = $this->logbook_model->check_if_dxcc_cnfmd_in_logbook($callsign['callsign']['dxcc'], null, $this->session->userdata('user_default_band')); } if (isset($callsign['callsign']['error'])) { $callsign['error'] = $callsign['callsign']['error']; @@ -887,7 +891,7 @@ class Logbook extends CI_Controller { if (isset($callsign['callsign']['gridsquare'])) { $this->load->model('logbook_model'); - $callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsign['callsign']['gridsquare'],0,4)), 0, $band)->num_rows(); + $callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsign['callsign']['gridsquare'],0,4)), null, $band)->num_rows(); } if (isset($callsign['callsign']['error'])) { $callsign['error'] = $callsign['callsign']['error'];