Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine Country-Breakdown

Browse Source
This commit is contained in:
int2001
2026-02-04 07:09:26 +00:00
parent 6fbcf4aefa
commit 7df15b054e
3 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/controllers/Dashboard.php
View File

@@ -111,13 +111,14 @@ class Dashboard extends CI_Controller {
$data['current_streak']=0;
}
// Load Countries Breakdown data into array
$CountriesBreakdown = $this->logbook_model->total_countries_confirmed($logbooks_locations_array);
// Load Countries Breakdown data into array (combined query)
$CountriesBreakdown = $this->logbook_model->total_countries_breakdown_batch($logbooks_locations_array);
$data['total_countries'] = $CountriesBreakdown['Countries_Worked'];
$data['total_countries_confirmed_paper'] = $CountriesBreakdown['Countries_Worked_QSL'];
$data['total_countries_confirmed_eqsl'] = $CountriesBreakdown['Countries_Worked_EQSL'];
$data['total_countries_confirmed_lotw'] = $CountriesBreakdown['Countries_Worked_LOTW'];
$current = $CountriesBreakdown['Countries_Current'];
$QSLStatsBreakdownArray = $this->logbook_model->get_QSLStats($logbooks_locations_array);
@@ -157,8 +158,6 @@ class Dashboard extends CI_Controller {
$this->load->model('dxcc');
$dxcc = $this->dxcc->list_current();
$current = $this->logbook_model->total_countries_current($logbooks_locations_array);
$footerData['scripts'] = [
'assets/js/sections/dashboard.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/dashboard.js")),
];

6
application/controllers/Visitor.php
View File

@@ -105,16 +105,16 @@ class Visitor extends CI_Controller {
$data['user_map_custom'] = $this->optionslib->get_map_custom(true,$public_slug);
// Load Countries Breakdown data into array
$CountriesBreakdown = $this->logbook_model->total_countries_confirmed($logbooks_locations_array);
// Load Countries Breakdown data into array (combined query)
$CountriesBreakdown = $this->logbook_model->total_countries_breakdown_batch($logbooks_locations_array);
$data['total_countries'] = $CountriesBreakdown['Countries_Worked'];
$data['total_countries_confirmed_paper'] = $CountriesBreakdown['Countries_Worked_QSL'];
$data['total_countries_confirmed_eqsl'] = $CountriesBreakdown['Countries_Worked_EQSL'];
$data['total_countries_confirmed_lotw'] = $CountriesBreakdown['Countries_Worked_LOTW'];
$current = $CountriesBreakdown['Countries_Current'];
$dxcc = $this->dxcc->list_current();
$current = $this->logbook_model->total_countries_current($logbooks_locations_array);
$data['total_countries_needed'] = count($dxcc->result()) - $current;
$QSLStatsBreakdownArray =$this->logbook_model->get_QSLStats($logbooks_locations_array);

45
application/models/Logbook_model.php
View File

@@ -4357,6 +4357,51 @@ class Logbook_model extends CI_Model {
}
}
/* Return combined countries breakdown: worked, confirmed (QSL/eQSL/LOTW), and current */
function total_countries_breakdown_batch($StationLocationsArray = null) {
if ($StationLocationsArray == null) {
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
} else {
$logbooks_locations_array = $StationLocationsArray;
}
if (!empty($logbooks_locations_array)) {
$sql = "SELECT
COUNT(DISTINCT t.COL_DXCC) as Countries_Worked,
COUNT(DISTINCT IF(t.COL_QSL_RCVD = 'Y', t.COL_DXCC, NULL)) as Countries_Worked_QSL,
COUNT(DISTINCT IF(t.COL_EQSL_QSL_RCVD = 'Y', t.COL_DXCC, NULL)) as Countries_Worked_EQSL,
COUNT(DISTINCT IF(t.COL_LOTW_QSL_RCVD = 'Y', t.COL_DXCC, NULL)) as Countries_Worked_LOTW,
COUNT(DISTINCT IF(d.end IS NULL AND d.adif != 0, t.COL_DXCC, NULL)) as Countries_Current
FROM " . $this->config->item('table_name') . " t
LEFT JOIN dxcc_entities d ON d.adif = t.col_dxcc
WHERE t.station_id IN (" . str_repeat('?,', count($logbooks_locations_array) - 1) . "?)
AND t.COL_COUNTRY != 'Invalid'
AND t.COL_DXCC > 0";
$query = $this->db->query($sql, $logbooks_locations_array);
if ($query->num_rows() > 0) {
$row = $query->row();
return [
'Countries_Worked' => $row->Countries_Worked,
'Countries_Worked_QSL' => $row->Countries_Worked_QSL,
'Countries_Worked_EQSL' => $row->Countries_Worked_EQSL,
'Countries_Worked_LOTW' => $row->Countries_Worked_LOTW,
'Countries_Current' => $row->Countries_Current
];
}
}
return [
'Countries_Worked' => 0,
'Countries_Worked_QSL' => 0,
'Countries_Worked_EQSL' => 0,
'Countries_Worked_LOTW' => 0,
'Countries_Current' => 0
];
}
/* Return total number of countries confirmed with paper QSL */
function total_countries_confirmed_paper() {
$this->load->model('logbooks_model');