diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 1df36bae..395c8a67 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -78,6 +78,7 @@ class QSO extends CI_Controller { 'prop_mode' => $this->input->post('prop_mode'), 'radio' => $this->input->post('radio'), 'station_profile_id' => $this->input->post('station_profile'), + 'operator_callsign' => $this->input->post('operator_callsign'), 'transmit_power' => $this->input->post('transmit_power') ); // ]; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index c8acea22..b386c683 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -33,3 +33,4 @@ $lang['qso_btn_edit_qso'] = 'Edit QSO'; $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Add Band/Mode to Favs'; +$lang['qso_operator_callsign'] = 'Operator Callsign'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index d7dfd357..229d2bc2 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -34,3 +34,4 @@ $lang['qso_btn_edit_qso'] = 'Editiere QSO'; $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Band/Mode zu Favoriten hinzufügen'; +$lang['qso_operator_callsign']='Operator Rufzeichen'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f0e54c2e..4bd20027 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -195,7 +195,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'), 'COL_QSL_VIA' => $this->input->post('qsl_via'), 'COL_QSLMSG' => $this->input->post('qslmsg'), - 'COL_OPERATOR' => $this->session->userdata('user_callsign'), + 'COL_OPERATOR' => $this->input->post('operator_callsign') ?? $this->session->userdata('operator_callsign'), 'COL_QTH' => $this->input->post('qth'), 'COL_PROP_MODE' => $prop_mode, 'COL_IOTA' => $this->input->post('iota_ref') == null ? '' : trim($this->input->post('iota_ref')), diff --git a/application/models/User_model.php b/application/models/User_model.php index f2ca673b..293d1458 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -316,6 +316,7 @@ class User_Model extends CI_Model { 'user_name' => $u->row()->user_name, 'user_type' => $u->row()->user_type, 'user_callsign' => $u->row()->user_callsign, + 'operator_callsign' => $u->row()->user_callsign, 'user_locator' => $u->row()->user_locator, 'user_lotw_name' => $u->row()->user_lotw_name, 'user_eqsl_name' => $u->row()->user_eqsl_name, diff --git a/application/views/qso/index.php b/application/views/qso/index.php index a977cc9b..5c257555 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -221,7 +221,13 @@ - + +
+ + +
+ +