Fix for DXCC count on qsl/eqsl/lotw on dashboard.
这个提交包含在:
		
							父节点
							
								
									68c8b3889c
								
							
						
					
					
						当前提交
						a58c913449
					
				
					共有  3 个文件被更改,包括 21 次插入 和 5 次删除
				
			
		|  | @ -1265,7 +1265,12 @@ class Logbook_model extends CI_Model { | ||||||
|       $CI->load->model('Stations'); |       $CI->load->model('Stations'); | ||||||
|       $station_id = $CI->Stations->find_active(); |       $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(); |         return $query->num_rows(); | ||||||
|     } |     } | ||||||
|  | @ -1276,7 +1281,12 @@ class Logbook_model extends CI_Model { | ||||||
|       $CI->load->model('Stations'); |       $CI->load->model('Stations'); | ||||||
|       $station_id = $CI->Stations->find_active(); |       $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(); |         return $query->num_rows(); | ||||||
|     } |     } | ||||||
|  | @ -1287,7 +1297,13 @@ class Logbook_model extends CI_Model { | ||||||
|       $CI->load->model('Stations'); |       $CI->load->model('Stations'); | ||||||
|       $station_id = $CI->Stations->find_active(); |       $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(); |         return $query->num_rows(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| <div class="table-responsive"> | <div class="table-responsive"> | ||||||
| 	<table class="table table-striped table-hover"> | 	<table class="table table-sm table-striped table-hover"> | ||||||
| 		<tr class="titles"> | 		<tr class="titles"> | ||||||
| 			<td>Date</td> | 			<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'))) { ?>
 | 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
 | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| <div class="table-responsive"> | <div class="table-responsive"> | ||||||
|     <table class="table table-striped table-hover"> |     <table class="table table-sm table-striped table-hover"> | ||||||
|         <tr class="titles"> |         <tr class="titles"> | ||||||
|             <td>Date</td> |             <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'))) { ?>
 |             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
 | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用