diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 8e2f0b90..21707d12 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -75,7 +75,7 @@ class Logbook_model extends CI_Model { /* Return last 10 QSOs */ function last_ten() { - $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY'); + $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME'); $this->db->order_by("COL_TIME_ON", "desc"); $this->db->limit(10); @@ -139,14 +139,14 @@ class Logbook_model extends CI_Model { function get_qsos($num, $offset) { - $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY'); + $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME'); $this->db->order_by("COL_TIME_ON", "desc"); $query = $this->db->get($this->config->item('table_name'), $num, $offset); return $query; } function get_last_qsos($num) { - $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY'); + $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME'); $this->db->order_by("COL_TIME_ON", "desc"); $this->db->limit($num); $query = $this->db->get($this->config->item('table_name')); diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 08dde741..df4bbb41 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -97,7 +97,6 @@ result() as $row) { ?> - '; ?> COL_TIME_ON); echo date('d/m/y', $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 32a0b0c1..a45463f7 100644 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -70,7 +70,11 @@ function settime () { COL_MODE; ?> COL_RST_SENT; ?> COL_RST_RCVD; ?> + COL_SAT_NAME != null) { ?> + COL_SAT_NAME; ?> + COL_BAND; ?> + diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index 3c416c38..f7f5f307 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -52,7 +52,11 @@ COL_MODE; ?> COL_RST_SENT; ?> COL_RST_RCVD; ?> + COL_SAT_NAME != null) { ?> + COL_SAT_NAME; ?> + COL_BAND; ?> + COL_COUNTRY; ?> config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>Edit