diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 30c9a0c19..6d14b98d7 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -954,4 +954,26 @@ class Logbookadvanced extends CI_Controller { print json_encode($data); } + function getQsos() { + if(!clubaccess_check(9)) return; + + $qsoID[] = $this->input->post('id', true); + + $this->load->model('logbookadvanced_model'); + $qso = $this->logbookadvanced_model->getQsosForAdif(json_encode($qsoID), $this->session->userdata('user_id'))->row_array(); + + $qsoObj = new QSO($qso); // Redirection via Object to clean/convert QSO (get rid of cols) + $cleaned_qso = $qsoObj->toArray(); // And back to Array for the JSON + + $flag = $this->dxccflag->get($qsoObj->getDXCCId()); + if ($flag != null) { + $cleaned_qso['flag'] = ' ' . $flag; + } else { + $cleaned_qso['flag'] = ''; + } + + header("Content-Type: application/json"); + echo json_encode($cleaned_qso); + } + } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c187cab35..55dd50010 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2154,13 +2154,17 @@ $('#sats').change(function(){ diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 8945c3da5..3c4a3c10c 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -643,8 +643,8 @@ function qso_edit(id) { } function qso_save() { - var myform = $("#qsoform")[0]; - var fd = new FormData(myform); + let myform = $("#qsoform")[0]; + let fd = new FormData(myform); $.ajax({ url: base_url + 'index.php/qso/qso_save_ajax', data: fd, @@ -659,6 +659,10 @@ function qso_save() { if (reload_after_qso_safe == true) { location.reload(); } + if (reload_qso_line == true) { + let qsoId = document.querySelector('input[name="id"]').value; + getQsos(qsoId); + } } else { $("#error-messages-qso-edit").html(''); $(".modal-body").animate({ scrollTop: 0 }, 'fast'); diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 020e3c622..b8d79878a 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -3206,3 +3206,16 @@ function saveOptions() { window.map.setView([30, 0], 1.5); } } + + function getQsos(id) { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/getQsos', + type: 'post', + data: { + id: id + }, + success: function (data) { + updateRow(data); + } + }); + }