diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index af1c8a1cf..d11f7b861 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -221,7 +221,6 @@ class Awards extends CI_Controller { $mode = str_replace('"', "", $this->security->xss_clean($this->input->post("Mode"))); $type = $this->security->xss_clean($this->input->post('Type')); $qsl = $this->input->post('QSL') == null ? '' : $this->security->xss_clean($this->input->post('QSL')); - $data['results'] = $this->logbook_model->qso_details($searchphrase, $band, $mode, $type, $qsl); // This is done because we have two different ways to get dxcc info in Cloudlog. Once is using the name (in awards), and the other one is using the ADIF DXCC. diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index e9686263b..8c5ae2460 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -217,6 +217,6 @@ class Dashboard extends CI_Controller { echo "}"; } - + } diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 3d454e7d9..b7328d54f 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -337,37 +337,55 @@ class Logbook_model extends CI_Model { $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); switch ($type) { - case 'DXCC': - $this->db->where('COL_COUNTRY', $searchphrase); - break; - case 'DXCC2': - $this->db->where('COL_DXCC', $searchphrase); - break; - case 'IOTA': - $this->db->where('COL_IOTA', $searchphrase); - break; - case 'VUCC': - $this->db->where("(COL_GRIDSQUARE like '%" . $searchphrase . "%' OR COL_VUCC_GRIDS like'%" . $searchphrase ."%')"); - break; - case 'CQZone': - $this->db->where('COL_CQZ', $searchphrase); - break; - case 'WAS': - $this->db->where('COL_STATE', $searchphrase); - $this->db->where_in('COL_DXCC', ['291', '6', '110']); - break; - case 'SOTA': - $this->db->where('COL_SOTA_REF', $searchphrase); - break; - case 'WWFF': - $this->db->where('COL_WWFF_REF', $searchphrase); - break; - case 'POTA': - $this->db->where('COL_POTA_REF', $searchphrase); - break; - case 'DOK': - $this->db->where('COL_DARC_DOK', $searchphrase); - break; + case 'DXCC': + $this->db->where('COL_COUNTRY', $searchphrase); + break; + case 'DXCC2': + $this->db->where('COL_DXCC', $searchphrase); + break; + case 'IOTA': + $this->db->where('COL_IOTA', $searchphrase); + break; + case 'VUCC': + $this->db->where("(COL_GRIDSQUARE like '%" . $searchphrase . "%' OR COL_VUCC_GRIDS like'%" . $searchphrase ."%')"); + break; + case 'CQZone': + $this->db->where('COL_CQZ', $searchphrase); + break; + case 'WAS': + $this->db->where('COL_STATE', $searchphrase); + $this->db->where_in('COL_DXCC', ['291', '6', '110']); + break; + case 'SOTA': + $this->db->where('COL_SOTA_REF', $searchphrase); + break; + case 'WWFF': + $this->db->where('COL_WWFF_REF', $searchphrase); + break; + case 'POTA': + $this->db->where('COL_POTA_REF', $searchphrase); + break; + case 'DOK': + $this->db->where('COL_DARC_DOK', $searchphrase); + break; + case 'QSLRDATE': + $this->db->where('date(COL_QSLRDATE)=date(SYSDATE())'); + break; + case 'QSLSDATE': + $this->db->where('date(COL_QSLSDATE)=date(SYSDATE())'); + break; + case 'EQSLRDATE': + $this->db->where('date(COL_EQSL_QSLRDATE)=date(SYSDATE())'); + break; + case 'EQSLSDATE': + $this->db->where('date(COL_EQSL_QSLSDATE)=date(SYSDATE())'); + break; + case 'LOTWRDATE': + $this->db->where('date(COL_LOTW_QSLRDATE)=date(SYSDATE())'); + break; + case 'LOTWSDATE': + $this->db->where('date(COL_LOTW_QSLSDATE)=date(SYSDATE())'); + break; } $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array); diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index b086b4aa1..162432361 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -222,13 +222,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - + @@ -249,13 +249,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - + @@ -270,13 +270,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - +