From 8135d07c4571c7049d330a9b5368eec4410b459b Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Jan 2023 08:54:35 +0100 Subject: [PATCH 01/11] [QSO Entry] Added dxcc summary to spawn when dxcc is identified --- application/views/qso/index.php | 2 +- assets/js/sections/common.js | 17 +++++++++++++++++ assets/js/sections/qso.js | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 1e504714..f86aab8c 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -1,6 +1,6 @@
-
+
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 76508f5f..c0c84491 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -430,4 +430,21 @@ function getLookupResult() { $(".ld-ext-right").prop('disabled', false); } }); +} + +// This function executes the call to the backend for fetching dxcc summary and inserted table below qso entry +function getDxccResult(dxcc) { + $.ajax({ + url: base_url + 'index.php/lookup/search', + type: 'post', + data: { + type: 'dxcc', + dxcc: dxcc, + }, + success: function (html) { + $('.dxccsummary').remove(); + $('.qsopane').append('

DXCC Summary
'); + $('.dxccsummarybody').append(html); + } + }); } \ No newline at end of file diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 7091aaf7..74d08c8c 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -406,6 +406,7 @@ $("#callsign").focusout(function() { if(result.dxcc.entity != undefined) { $('#country').val(convert_case(result.dxcc.entity)); $('#callsign_info').text(convert_case(result.dxcc.entity)); + getDxccResult(convert_case(result.dxcc.adif)); if($("#sat_name" ).val() != "") { //logbook/jsonlookupgrid/io77/SAT/0/0 From 79800f73bc78f19f77f929f40469b3fa7b6a8baa Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Jan 2023 09:02:44 +0100 Subject: [PATCH 02/11] [QSO Entry] Bugfix for dxcc none. --- assets/js/sections/qso.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 74d08c8c..c5da4ada 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -406,7 +406,7 @@ $("#callsign").focusout(function() { if(result.dxcc.entity != undefined) { $('#country').val(convert_case(result.dxcc.entity)); $('#callsign_info').text(convert_case(result.dxcc.entity)); - getDxccResult(convert_case(result.dxcc.adif)); + getDxccResult(result.dxcc.adif); if($("#sat_name" ).val() != "") { //logbook/jsonlookupgrid/io77/SAT/0/0 From 7dd9ef13d74605eb3e14f68949e352907768f475 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Jan 2023 09:10:56 +0100 Subject: [PATCH 03/11] [QSO Entry] Added removing of summary when resetting --- assets/js/sections/qso.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index c5da4ada..f3f7b8c0 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -368,6 +368,7 @@ function reset_fields() { mymap.setView(pos, 12); mymap.removeLayer(markers); $('.callsign-suggest').hide(); + $('.dxccsummary').remove(); } $("#callsign").focusout(function() { @@ -788,4 +789,5 @@ function resetDefaultQSOFields() { $('#input_usa_state').val(""); $('#callsign-image').attr('style', 'display: none;'); $('#callsign-image-content').text(""); + $('.dxccsummary').remove(); } From 8ea9c04141539ba374af4662c48bd0ba3c6e82a2 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Jan 2023 09:20:45 +0100 Subject: [PATCH 04/11] [QSO Entry] Added dxcc name to card header --- assets/js/sections/common.js | 4 ++-- assets/js/sections/qso.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index c0c84491..2edb942f 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -433,7 +433,7 @@ function getLookupResult() { } // This function executes the call to the backend for fetching dxcc summary and inserted table below qso entry -function getDxccResult(dxcc) { +function getDxccResult(dxcc, name) { $.ajax({ url: base_url + 'index.php/lookup/search', type: 'post', @@ -443,7 +443,7 @@ function getDxccResult(dxcc) { }, success: function (html) { $('.dxccsummary').remove(); - $('.qsopane').append('

DXCC Summary
'); + $('.qsopane').append('

DXCC Summary for '+name+'
'); $('.dxccsummarybody').append(html); } }); diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index f3f7b8c0..d0f0b706 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -407,7 +407,7 @@ $("#callsign").focusout(function() { if(result.dxcc.entity != undefined) { $('#country').val(convert_case(result.dxcc.entity)); $('#callsign_info').text(convert_case(result.dxcc.entity)); - getDxccResult(result.dxcc.adif); + getDxccResult(result.dxcc.adif, convert_case(result.dxcc.entity)); if($("#sat_name" ).val() != "") { //logbook/jsonlookupgrid/io77/SAT/0/0 From 3dde2cb22152ee6e5feab3fa49249b2ec2b4d2b5 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 27 Jan 2023 09:23:42 +0100 Subject: [PATCH 05/11] [QSO Entry] Added collapse on dxcc summary card --- assets/js/sections/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 2edb942f..b0cbdc26 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -443,7 +443,7 @@ function getDxccResult(dxcc, name) { }, success: function (html) { $('.dxccsummary').remove(); - $('.qsopane').append('

DXCC Summary for '+name+'
'); + $('.qsopane').append('

DXCC Summary for '+name+'
'); $('.dxccsummarybody').append(html); } }); From c56c21b6110dd07e7470dccd38432090d5673522 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 30 Jan 2023 15:54:57 +0100 Subject: [PATCH 06/11] Add some Cloudlog info to debug page (hopefully useful for future debugging) --- application/views/debug/main.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/application/views/debug/main.php b/application/views/debug/main.php index 3aecd461..087fe004 100644 --- a/application/views/debug/main.php +++ b/application/views/debug/main.php @@ -5,6 +5,26 @@
+
+
Cloudlog Information
+
+ + + + + + + + + + + + + +
Versionconfig->item('app_version')."\n"; ?>
Languageconfig->item('language')."\n"; ?>
Base URLconfig->item('base_url')."\n"; ?>
+
+
+
Server Information
@@ -188,4 +208,4 @@
-
\ No newline at end of file +
From b9b0d0e4832e6cf5d9e2695b34ebdeec6aa745bc Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 31 Jan 2023 13:00:23 +0100 Subject: [PATCH 07/11] Make base URL copyable --- application/views/debug/main.php | 4 ++-- application/views/interface_assets/footer.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/application/views/debug/main.php b/application/views/debug/main.php index 087fe004..bfffc7dc 100644 --- a/application/views/debug/main.php +++ b/application/views/debug/main.php @@ -15,11 +15,11 @@ Language - config->item('language')."\n"; ?> + config->item('language'))."\n"; ?> Base URL - config->item('base_url')."\n"; ?> + config->item('base_url'); ?> ")'>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 8b5b716a..68b731e5 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -122,6 +122,24 @@ function load_was_map() { +uri->segment(1) == "debug") { ?> + + + uri->segment(1) == "api" && $this->uri->segment(2) == "help") { ?>