Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2147 from AndreasK79/lba_callbook_fix_if_call_not_found

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-07-13 20:37:48 +02:00
committed by GitHub
parent 2de53c8310 8e16f7b425
commit cf060f1dcc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/controllers/Logbookadvanced.php
View File

@@ -196,17 +196,16 @@ class Logbookadvanced extends CI_Controller {
$station_profile = $this->stations->profile($active_station_id)->row_array();
$this->logbookadvanced_model->updateQsoWithCallbookInfo($qso['COL_PRIMARY_KEY'], $qso, $callbook, $station_profile['station_gridsquare']);
$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'] = '';
}
$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");

5
assets/js/sections/logbookadvanced.js
View File

@@ -426,13 +426,14 @@ function processNextCallbookItem() {
},
dataType: 'json',
success: function (data) {
if (data != []) {
if (data && data.dx) {
updateRow(data);
unselectQsoID(id);
}
unselectQsoID(id);
setTimeout("processNextCallbookItem()", 50);
},
error: function (data) {
unselectQsoID(id);
setTimeout("processNextCallbookItem()", 50);
},
});