kopia lustrzana https://github.com/magicbug/Cloudlog
[QSO Entry] Changed worked_grid_before in Logbooks.php to use All station locations
rodzic
7651517e74
commit
f765a1c169
|
@ -226,9 +226,8 @@ class Logbook extends CI_Controller {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
$CI =& get_instance();
|
$CI =& get_instance();
|
||||||
$CI->load->model('Stations');
|
$CI->load->model('logbooks_model');
|
||||||
$station_id = $CI->Stations->find_active();
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
|
||||||
if($type == "SAT") {
|
if($type == "SAT") {
|
||||||
$this->db->where('COL_PROP_MODE', 'SAT');
|
$this->db->where('COL_PROP_MODE', 'SAT');
|
||||||
|
@ -238,7 +237,7 @@ class Logbook extends CI_Controller {
|
||||||
$this->db->where('COL_PROP_MODE !=','SAT');
|
$this->db->where('COL_PROP_MODE !=','SAT');
|
||||||
|
|
||||||
}
|
}
|
||||||
$this->db->where('station_id', $station_id);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4));
|
$this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4));
|
||||||
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
|
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
|
||||||
$this->db->limit(1);
|
$this->db->limit(1);
|
||||||
|
|
Ładowanie…
Reference in New Issue