Final code commits for MY fields for tQSL

This commit is contained in:
Peter Goodhall
2020-04-08 15:00:48 +01:00
parent 8858fd1806
commit d9ec5ec514
2 changed files with 24 additions and 15 deletions

View File

@@ -35,28 +35,37 @@ class adif_data extends CI_Model {
$this->load->model('stations');
$active_station_id = $this->stations->find_active();
$this->db->where('station_id', $active_station_id);
$this->db->where('COL_PROP_MODE', 'SAT');
$this->db->order_by("COL_TIME_ON", "ASC");
$query = $this->db->get($this->config->item('table_name'));
return $query;
$this->db->select(''.$this->config->item('table_name').'.*, station_profile.*');
$this->db->from($this->config->item('table_name'));
$this->db->where($this->config->item('table_name').'.station_id', $active_station_id);
$this->db->where($this->config->item('table_name').'.COL_PROP_MODE', 'SAT');
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "ASC");
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
return $this->db->get();
}
function satellte_lotw() {
$this->load->model('stations');
$active_station_id = $this->stations->find_active();
$this->db->where('station_id', $active_station_id);
$this->db->where('COL_PROP_MODE', 'SAT');
$this->db->select(''.$this->config->item('table_name').'.*, station_profile.*');
$this->db->from($this->config->item('table_name'));
$this->db->where($this->config->item('table_name').'.station_id', $active_station_id);
$this->db->where($this->config->item('table_name').'.COL_PROP_MODE', 'SAT');
$where = "COL_LOTW_QSLRDATE != ''";
$where = $this->config->item('table_name').".COL_LOTW_QSLRDATE != ''";
$this->db->where($where);
$this->db->order_by("COL_TIME_ON", "ASC");
$query = $this->db->get($this->config->item('table_name'));
return $query;
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "ASC");
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->limit(15);
return $this->db->get();
}
function export_custom($from, $to) {