mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix for DXCC count on qsl/eqsl/lotw on dashboard.

pull/662/head
Andreas 2020-10-16 20:11:45 +02:00
rodzic 68c8b3889c
commit a58c913449
3 zmienionych plików z 21 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
application/models/Logbook_model.php
Wyświetl plik

@ -1265,7 +1265,12 @@ class Logbook_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_QSL_RCVD =\'Y\'');
$sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').'
WHERE COL_COUNTRY != "Invalid"
AND COL_DXCC > 0
AND station_id = '.$station_id.' AND COL_QSL_RCVD =\'Y\'';
$query = $this->db->query($sql);
return $query->num_rows();
}
@ -1276,7 +1281,12 @@ class Logbook_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_EQSL_QSL_RCVD =\'Y\'');
$sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').'
WHERE COL_COUNTRY != "Invalid"
AND COL_DXCC > 0
AND station_id = '.$station_id.' AND COL_EQSL_QSL_RCVD =\'Y\'';
$query = $this->db->query($sql);
return $query->num_rows();
}
@ -1287,7 +1297,13 @@ class Logbook_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_LOTW_QSL_RCVD =\'Y\'');
$sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').'
WHERE COL_COUNTRY != "Invalid"
AND COL_DXCC > 0
AND station_id = '.$station_id.'
AND COL_LOTW_QSL_RCVD =\'Y\'';
$query = $this->db->query($sql);
return $query->num_rows();
}

2
application/views/view_log/partial/log.php
Wyświetl plik

@ -1,5 +1,5 @@
<div class="table-responsive">
<table class="table table-striped table-hover">
<table class="table table-sm table-striped table-hover">
<tr class="titles">
<td>Date</td>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>

2
application/views/view_log/partial/log_ajax.php
Wyświetl plik

@ -1,5 +1,5 @@
<div class="table-responsive">
<table class="table table-striped table-hover">
<table class="table table-sm table-striped table-hover">
<tr class="titles">
<td>Date</td>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>