diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index e6d816f0..4165c4df 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -36,43 +36,43 @@ class Logbook_model extends CI_Model { 'COL_MODE' => $this->input->post('mode'), 'COL_RST_RCVD' => $this->input->post('rst_recv'), 'COL_RST_SENT' => $this->input->post('rst_sent'), - 'COL_NAME' => $this->input->post('name'), + 'COL_NAME' => $this->input->post('name'), 'COL_COMMENT' => $this->input->post('comment'), 'COL_SAT_NAME' => $this->input->post('sat_name'), 'COL_SAT_MODE' => $this->input->post('sat_mode'), - 'COL_GRIDSQUARE' => $this->input->post('locator'), + 'COL_GRIDSQUARE' => trim($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'), - 'COL_OPERATOR' => $this->session->userdata('user_callsign'), - 'COL_QTH' => $this->input->post('qth'), - 'COL_PROP_MODE' => $prop_mode, - 'COL_IOTA' => $this->input->post('iota_ref'), - 'COL_MY_GRIDSQUARE' => $locator, - 'COL_DISTANCE' => "0", - 'COL_FREQ_RX' => 0, - 'COL_BAND_RX' => null, - 'COL_ANT_AZ' => null, - 'COL_ANT_EL' => null, - 'COL_A_INDEX' => null, - 'COL_AGE' => null, - 'COL_TEN_TEN' => null, - 'COL_TX_PWR' => null, - 'COL_STX' => null, - 'COL_SRX' => null, - 'COL_NR_BURSTS' => null, - 'COL_NR_PINGS' => null, - 'COL_MAX_BURSTS' => null, - 'COL_K_INDEX' => null, - 'COL_SFI' => null, - 'COL_RX_PWR' => null, - 'COL_LAT' => null, - 'COL_LON' => null, + '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'), + 'COL_OPERATOR' => $this->session->userdata('user_callsign'), + 'COL_QTH' => $this->input->post('qth'), + 'COL_PROP_MODE' => $prop_mode, + 'COL_IOTA' => $this->input->post('iota_ref'), + 'COL_MY_GRIDSQUARE' => $locator, + 'COL_DISTANCE' => "0", + 'COL_FREQ_RX' => 0, + 'COL_BAND_RX' => null, + 'COL_ANT_AZ' => null, + 'COL_ANT_EL' => null, + 'COL_A_INDEX' => null, + 'COL_AGE' => null, + 'COL_TEN_TEN' => null, + 'COL_TX_PWR' => null, + 'COL_STX' => null, + 'COL_SRX' => null, + 'COL_NR_BURSTS' => null, + 'COL_NR_PINGS' => null, + 'COL_MAX_BURSTS' => null, + 'COL_K_INDEX' => null, + 'COL_SFI' => null, + 'COL_RX_PWR' => null, + 'COL_LAT' => null, + 'COL_LON' => null, ); $this->add_qso($data); diff --git a/application/views/layout/header.php b/application/views/layout/header.php index 866aca60..0e74da5d 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -7,6 +7,9 @@ + + + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 163b619a..5cde9b8f 100644 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -116,7 +116,7 @@ QTH - + @@ -245,13 +245,10 @@ - - -