kopia lustrzana https://github.com/magicbug/Cloudlog
commit
7dc7559165
|
@ -12,7 +12,7 @@ class Dxatlas extends CI_Controller {
|
||||||
$this->load->model('stations');
|
$this->load->model('stations');
|
||||||
$this->load->model('bands');
|
$this->load->model('bands');
|
||||||
|
|
||||||
$data['station_profile'] = $this->stations->all(); // Used in the view for station location select
|
$data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select
|
||||||
$data['worked_bands'] = $this->bands->get_worked_bands(); // Used in the view for band select
|
$data['worked_bands'] = $this->bands->get_worked_bands(); // Used in the view for band select
|
||||||
$data['modes'] = $this->modes->active(); // Used in the view for mode select
|
$data['modes'] = $this->modes->active(); // Used in the view for mode select
|
||||||
$data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select
|
$data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select
|
||||||
|
|
|
@ -98,17 +98,19 @@ class Dxatlas_model extends CI_Model
|
||||||
|
|
||||||
if ($column == 'single') {
|
if ($column == 'single') {
|
||||||
$sql .= "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
|
$sql .= "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
|
||||||
from " . $this->config->item('table_name') .
|
from " . $this->config->item('table_name') .
|
||||||
|
' join station_profile on station_profile.station_id = ' . $this->config->item('table_name').'.station_id' .
|
||||||
" where col_gridsquare <> ''";
|
" where col_gridsquare <> ''";
|
||||||
}
|
}
|
||||||
else if ($column == 'multi') {
|
else if ($column == 'multi') {
|
||||||
$sql .= "select col_vucc_grids
|
$sql .= "select col_vucc_grids
|
||||||
from " . $this->config->item('table_name') .
|
from " . $this->config->item('table_name') .
|
||||||
|
' join station_profile on station_profile.station_id = ' . $this->config->item('table_name').'.station_id' .
|
||||||
" where col_vucc_grids <> '' ";
|
" where col_vucc_grids <> '' ";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($station_id != "All") {
|
if ($station_id != "All") {
|
||||||
$sql .= ' and station_id = ' . $station_id;
|
$sql .= ' and ' . $this->config->item('table_name'). '.station_id = ' . $station_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($confirmationMethod == 'both') {
|
if ($confirmationMethod == 'both') {
|
||||||
|
@ -158,6 +160,8 @@ class Dxatlas_model extends CI_Model
|
||||||
$sql .= " and date(COL_TIME_ON) <='" . $to . "'";
|
$sql .= " and date(COL_TIME_ON) <='" . $to . "'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$sql .= ' and station_profile.user_id = ' . $this->session->userdata('user_id');
|
||||||
|
|
||||||
$query = $this->db->query($sql);
|
$query = $this->db->query($sql);
|
||||||
|
|
||||||
return $query->result_array();
|
return $query->result_array();
|
||||||
|
|
Ładowanie…
Reference in New Issue