diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 982d612dc..7adad7c88 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -540,11 +540,13 @@ class Logbookadvanced extends CI_Controller { $this->load->model('bands'); $this->load->model('modes'); $this->load->model('logbookadvanced_model'); + $this->load->model('contesting_model'); $data['stateDxcc'] = $this->logbookadvanced_model->getPrimarySubdivisonsDxccs(); $data['modes'] = $this->modes->active(); $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); + $data['contests'] = $this->contesting_model->getActivecontests(); $this->load->view('logbookadvanced/edit', $data); } diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php index 2b01c47bf..2eb143cbd 100644 --- a/application/views/logbookadvanced/edit.php +++ b/application/views/logbookadvanced/edit.php @@ -18,7 +18,7 @@ - +
 
@@ -118,4 +118,11 @@ + diff --git a/assets/js/sections/logbookadvanced_edit.js b/assets/js/sections/logbookadvanced_edit.js index f942c1457..07961b1cd 100644 --- a/assets/js/sections/logbookadvanced_edit.js +++ b/assets/js/sections/logbookadvanced_edit.js @@ -168,6 +168,9 @@ function saveBatchEditQsos(id_list) { value = $("#editSatellite").val(); value2 = $("#editSatelliteMode").val(); } + if (column == 'contest') { + value = $("#editContest").val(); + } if (column == 'sota' || column == 'pota' || column == 'wwff' || column == 'gridsquare' || column == 'comment' || column == 'operator' || column == 'qslvia' || column == 'contest') { value = $("#editTextInput").val(); } @@ -212,6 +215,7 @@ function changeEditType(type) { $('#editDxccState').hide(); $('#editDxccStateList').hide(); $('#editDxccStateListLabel').hide(); + $('#editContest').hide(); editDxccStateListLabel if (type == "dxcc") { $('#editDxcc').show(); @@ -241,6 +245,8 @@ function changeEditType(type) { $('#editSatellite').show(); $('#editSatelliteMode').show(); $('#editSatelliteModeLabel').show(); + } else if (type == "contest") { + $('#editContest').show(); } else if (type == "gridsquare" || type == "sota" || type == "wwff" || type == "operator" || type == "pota" || type == "comment" || type == "qslvia" || type == "contest") { $('#editTextInput').show(); }