diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 836a3a86..bc6410dc 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -30,6 +30,12 @@ class Logbook_model extends CI_Model { 'COL_GRIDSQUARE' => $this->input->post('locator'), 'COL_COUNTRY' => $this->input->post('country'), 'COL_MY_RIG' => $this->input->post('equipment'), + 'COL_QSLSDATE' => date('Y-m-d'), + 'COL_QSLRDATE' => date('Y-m-d'), + 'COL_QSL_SENT' => $this->input->post('qsl_sent'), + 'COL_QSL_RCVD' => $this->input->post('qsl_recv'), + 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), + 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), ); // Add QSO to database @@ -52,6 +58,12 @@ class Logbook_model extends CI_Model { 'COL_NAME' => $this->input->post('name'), 'COL_SAT_NAME' => $this->input->post('sat_name'), 'COL_SAT_MODE' => $this->input->post('sat_mode'), + 'COL_QSLSDATE' => date('Y-m-d'), + 'COL_QSLRDATE' => date('Y-m-d'), + 'COL_QSL_SENT' => $this->input->post('qsl_sent'), + 'COL_QSL_RCVD' => $this->input->post('qsl_recv'), + 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), + 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), ); $this->db->where('COL_PRIMARY_KEY', $this->input->post('id')); diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php index 9d3331ac..05645cb6 100644 --- a/application/views/qso/edit.php +++ b/application/views/qso/edit.php @@ -1,5 +1,5 @@

Add QSO

-
+
@@ -67,6 +67,43 @@ + +

QSLing

+ + + + + + + + + + + + + + + + + +
SentRecv
+
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index c1db9803..bd288916 100644 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -114,11 +114,13 @@ function settime () { + + + + + + Recv + + + + + + + + + + +
+
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 33e8c220..e6a180f4 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -8,10 +8,16 @@ h2 { font-weight: bold; font-size: 18px; margin-top: 5px; margin-bottom: 10px; } + h3 { font-weight: bold; font-size: 14px; margin-top: 10px; margin-bottom: 10px; } + .clear { clear: both } #info { float: left; width: 50%; } #stat { float: right; width: 50%; } td { padding: 5px; } + p { +line-height: 1.7; +margin: 10px 0; +} @@ -120,6 +126,23 @@ + COL_QSL_SENT == "Y" || $row->COL_QSL_RCVD == "Y") { ?> +

QSL Info

+ + COL_QSL_SENT == "Y" && $row->COL_QSL_SENT_VIA == "B") { ?> +

QSL Card has been sent via the bureau

+ + COL_QSL_SENT == "Y" && $row->COL_QSL_SENT_VIA == "D") { ?> +

QSL Card has been sent direct

+ + + COL_QSL_RCVD == "Y" && $row->COL_QSL_RCVD_VIA == "B") { ?> +

QSL Card has been received via the bureau

+ + COL_QSL_RCVD == "Y" && $row->COL_QSL_RCVD_VIA == "D") { ?> +

QSL Card has been received direct

+ +