diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 346a90bf..6801cbfe 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -196,7 +196,7 @@ 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, COL_SAT_NAME, COL_GRIDSQUARE'); + $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, COL_GRIDSQUARE, COL_QSL_RCVD, COL_QSL_SENT'); $this->db->order_by("COL_TIME_ON", "desc"); $query = $this->db->get($this->config->item('table_name'), $num, $offset); return $query; diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index ac5f0e03..12fdfac2 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -91,7 +91,10 @@ Recv Band Country + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> + + result() as $row) { ?> @@ -108,8 +111,26 @@ COL_BAND; ?> COL_COUNTRY; ?> - config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>Edit - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> + + COL_QSL_RCVD == "Y" && $row->COL_QSL_SENT == "Y") + { + ?> + QSL Cards Both sent and received + COL_QSL_RCVD == "Y") { + ?> + QSL Cards received + COL_QSL_SENT == "Y") { + ?> + QSL Cards sent + + + Edit + + diff --git a/images/icons/qslcard_in.png b/images/icons/qslcard_in.png new file mode 100644 index 00000000..b0ba4bde Binary files /dev/null and b/images/icons/qslcard_in.png differ diff --git a/images/icons/qslcard_sent.png b/images/icons/qslcard_sent.png new file mode 100644 index 00000000..32b7f0f0 Binary files /dev/null and b/images/icons/qslcard_sent.png differ