From 99b406121792906e04a43f22ddd07905a930ae83 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 1 Nov 2023 21:08:21 +0100 Subject: [PATCH 01/12] prepared sample data --- application/language/bulgarian/qso_lang.php | 2 ++ .../language/chinese_simplified/qso_lang.php | 2 ++ application/language/czech/qso_lang.php | 2 ++ application/language/dutch/qso_lang.php | 2 ++ application/language/english/qso_lang.php | 2 ++ application/language/finnish/qso_lang.php | 2 ++ application/language/french/qso_lang.php | 2 ++ application/language/german/qso_lang.php | 2 ++ application/language/greek/qso_lang.php | 2 ++ application/language/italian/qso_lang.php | 2 ++ application/language/polish/qso_lang.php | 2 ++ application/language/russian/qso_lang.php | 2 ++ application/language/spanish/qso_lang.php | 2 ++ application/language/swedish/qso_lang.php | 2 ++ application/language/turkish/qso_lang.php | 2 ++ application/views/simplefle/index.php | 3 ++ assets/js/sections/simplefle.js | 32 +++++++++---------- 17 files changed, 48 insertions(+), 17 deletions(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index f7acf26d..81e0e55c 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 1f6af442..29b3d0ca 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index b0b1a64e..1a1ba863 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 1ef1f502..39b6b7f3 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index d800cfe1..00774e2d 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 1ef7188a..b67045df 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 822ef5ef..c1750db3 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index cc553da9..2be3cc8b 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "z.B. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Stationsstandort"; $lang['qso_simplefle_station_call_location_hint'] = "Falls du von einem neuen Standort oder mit einem neuen Rufzeichen gefunkt hast, erstelle erst einen neuen Stationsstandort"; $lang['qso_simplefle_enter_the_data'] = "Gibt hier die Daten ein"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel Daten"; +$lang['qso_simplefle_sample_data'] = "Lade Beispiel Daten"; $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; $lang['qso_simplefle_save'] = "Speichere in Cloudlog"; $lang['qso_simplefle_clear'] = "Lösche QSO Daten"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 4bce9503..6c53c52f 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index cda18464..e3b361b7 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 296a8810..afbb73da 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 98efa973..75e014eb 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 336acbb5..be74eb5a 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 36bed414..64677f19 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 118f7239..4b421740 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -53,6 +53,8 @@ $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 544b0d97..7cddcedd 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -14,6 +14,8 @@ var lang_qso_simplefle_info_ln4 = ""; var lang_qso_simplefle_syntax_help = ""; var lang_qso_simplefle_syntax_help_title = ""; + var lang_qso_simplefle_syntax_help_close_w_sample = ""; + var lang_admin_close = ""; var lang_qso_simplefle_error_band = ""; var lang_qso_simplefle_error_mode = ""; var lang_qso_simplefle_error_time = ""; @@ -27,6 +29,7 @@ var lang_qso_simplefle_confirm_save_to_log = ""; var lang_qso_simplefle_success_save_to_log_header = ""; var lang_qso_simplefle_success_save_to_log = ""; + var lang_qso_simplefle_sample_data = "";

diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index d68257ef..002e7d23 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -30,11 +30,24 @@ $('#js-syntax').click(function (event) { url: base_url + 'index.php/simplefle/displaySyntax', type: 'post', success: function (html) { - BootstrapDialog.alert({ + BootstrapDialog.show({ title: "

"+lang_qso_simplefle_syntax_help_title+"

", - size: BootstrapDialog.SIZE_WIDE, + type: BootstrapDialog.TYPE_INFO, + size: BootstrapDialog.SIZE_WIDE, nl2br: false, message: html, + buttons: [{ + label: lang_qso_simplefle_syntax_help_close_w_sample, + action: function(){ + alert('Hi Orange!'); + } + }, { + label: lang_admin_close, + cssClass: 'btn-primary', + action: function(dialogItself){ + dialogItself.close(); + } + }] }); } }); @@ -481,21 +494,6 @@ function isWWFF(value) { return false; } -function download(filename, text) { - var element = document.createElement("a"); - element.setAttribute( - "href", - "data:text/plain;charset=utf-8," + encodeURIComponent(text) - ); - element.setAttribute("download", filename); - - element.style.display = "none"; - document.body.appendChild(element); - - element.click(); - - document.body.removeChild(element); -} $(document).ready(function () { var tabledata = localStorage.getItem(`user_${user_id}_tabledata`); From 291b511764cf71daa5890568a00dc87271c17b41 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 1 Nov 2023 21:41:29 +0100 Subject: [PATCH 02/12] removed unnessesary translation --- application/language/bulgarian/qso_lang.php | 1 - application/language/chinese_simplified/qso_lang.php | 1 - application/language/czech/qso_lang.php | 1 - application/language/dutch/qso_lang.php | 1 - application/language/english/qso_lang.php | 1 - application/language/finnish/qso_lang.php | 1 - application/language/french/qso_lang.php | 1 - application/language/german/qso_lang.php | 1 - application/language/greek/qso_lang.php | 1 - application/language/italian/qso_lang.php | 1 - application/language/polish/qso_lang.php | 1 - application/language/russian/qso_lang.php | 1 - application/language/spanish/qso_lang.php | 1 - application/language/swedish/qso_lang.php | 1 - application/language/turkish/qso_lang.php | 1 - 15 files changed, 15 deletions(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 81e0e55c..3905b0ee 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 29b3d0ca..3fc5bcc7 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 1a1ba863..a8514621 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 39b6b7f3..c53af861 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 00774e2d..8463906f 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index b67045df..2e726889 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index c1750db3..613ee3cc 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 2be3cc8b..d24d8000 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Stationsstandort"; $lang['qso_simplefle_station_call_location_hint'] = "Falls du von einem neuen Standort oder mit einem neuen Rufzeichen gefunkt hast, erstelle erst einen neuen Stationsstandort"; $lang['qso_simplefle_enter_the_data'] = "Gibt hier die Daten ein"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel Daten"; -$lang['qso_simplefle_sample_data'] = "Lade Beispiel Daten"; $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; $lang['qso_simplefle_save'] = "Speichere in Cloudlog"; $lang['qso_simplefle_clear'] = "Lösche QSO Daten"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 6c53c52f..f10027f8 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index e3b361b7..35fe5d0b 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index afbb73da..b7d4aebd 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 75e014eb..3543064d 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index be74eb5a..cfe17a9c 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 64677f19..0a04e841 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 4b421740..65dceb09 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -54,7 +54,6 @@ $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; -$lang['qso_simplefle_sample_data'] = "Load sample data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; From df4c24f9a216ae7a80d4ba45e5a9ff05f99a30ee Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 1 Nov 2023 21:43:06 +0100 Subject: [PATCH 03/12] sample data --- assets/js/sections/simplefle.js | 74 +++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 002e7d23..d6bb7ac6 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -27,30 +27,60 @@ $('#simpleFleInfoButton').click(function (event) { $('#js-syntax').click(function (event) { $('#js-syntax').prop("disabled", false); $.ajax({ - url: base_url + 'index.php/simplefle/displaySyntax', - type: 'post', - success: function (html) { - BootstrapDialog.show({ - title: "

"+lang_qso_simplefle_syntax_help_title+"

", + url: base_url + "index.php/simplefle/displaySyntax", + type: "post", + success: function (html) { + BootstrapDialog.show({ + title: "

" + lang_qso_simplefle_syntax_help_title + "

", type: BootstrapDialog.TYPE_INFO, size: BootstrapDialog.SIZE_WIDE, - nl2br: false, - message: html, - buttons: [{ - label: lang_qso_simplefle_syntax_help_close_w_sample, - action: function(){ - alert('Hi Orange!'); - } - }, { - label: lang_admin_close, - cssClass: 'btn-primary', - action: function(dialogItself){ - dialogItself.close(); - } - }] - }); - } - }); + nl2br: false, + message: html, + buttons: [ + { + label: lang_qso_simplefle_syntax_help_close_w_sample, + action: function () { + BootstrapDialog.confirm({ + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_reset, + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, + btnOKClass: "btn-warning", + callback: function (result) { + if (result) { + clearSession(); + + const logData = ` +80m cw +1212 m0abc okff-1234 +3 hb9hil +4 ok1tn +20 dl6kva 7 8 +5 dl5cw +ssb +32 ok7wa ol/zl-071 5 8 +33 ok1xxx 4 3 + `; + + $textarea.val(logData.trim()); + handleInput(); + } + }, + }); + }, + }, + { + label: lang_admin_close, + cssClass: "btn-primary", + action: function (dialogItself) { + dialogItself.close(); + }, + }, + ], + }); + }, + }); }); function handleInput() { From 0f1f619e50e3b8a67473a2576ab4f95806f92e39 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 1 Nov 2023 21:56:33 +0100 Subject: [PATCH 04/12] Added scrollable QSO table --- application/views/simplefle/index.php | 2 +- assets/css/general.css | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7cddcedd..dada123f 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -116,7 +116,7 @@
- +
diff --git a/assets/css/general.css b/assets/css/general.css index 5e101bb5..35c83820 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -554,4 +554,25 @@ div#station_logbooks_linked_table_paginate { input:invalid { border-color: red; - } +} + +.sfletable{ + height: 440px; + } + +.sfletable table { + width: 100%; +} + +.sfletable thead, tbody tr { + display: block; + width: 100%; + table-layout: fixed; + display: inline-table; +} + +.sfletable tbody { + overflow-y: scroll; + max-height: 380px; + position: absolute; +} From 6026297649c8825db87dfb0b6ecfd8b413d21cf3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 08:22:01 +0100 Subject: [PATCH 05/12] Example Data --- application/language/bulgarian/qso_lang.php | 1 + .../language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 1 + application/language/turkish/qso_lang.php | 1 + application/views/simplefle/index.php | 1 + assets/js/sections/simplefle.js | 24 +++++++++++++++++++ 17 files changed, 40 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 3905b0ee..3ba30483 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 3fc5bcc7..033254fe 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index a8514621..d6debacd 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index c53af861..46ed75fb 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 8463906f..8451d306 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 2e726889..c30242cc 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 613ee3cc..3b2d1da6 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index d24d8000..ff6111a1 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Stationsstandort nicht ausgewählt"; $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer"; $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!"; +$lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!"; $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!"; $lang['qso_simplefle_success_save_to_log'] = "Die QSO wurden erfolgreich im Logbuch gespeichert!"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index f10027f8..536685ae 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 35fe5d0b..92adc172 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index b7d4aebd..efb5301f 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 3543064d..ed76f8e5 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index cfe17a9c..95fee666 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 0a04e841..aceb756e 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 65dceb09..a034e5e3 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index dada123f..7d12f13e 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -26,6 +26,7 @@ var lang_qso_simplefle_error_operator = ""; var lang_qso_simplefle_warning_reset = ""; var lang_qso_simplefle_warning_missing_band_mode = ""; + var lang_qso_simplefle_warning_example_data = ""; var lang_qso_simplefle_confirm_save_to_log = ""; var lang_qso_simplefle_success_save_to_log_header = ""; var lang_qso_simplefle_success_save_to_log = ""; diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index d6bb7ac6..815bd51c 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -52,6 +52,7 @@ $('#js-syntax').click(function (event) { clearSession(); const logData = ` +*example-data* 80m cw 1212 m0abc okff-1234 3 hb9hil @@ -65,6 +66,7 @@ ssb $textarea.val(logData.trim()); handleInput(); + BootstrapDialog.closeAll(); } }, }); @@ -461,6 +463,16 @@ function isBandModeEntered() { return isBandModeOK; } +function isExampleDataEntered() { + let isExampleData = false; + if (textarea.value.startsWith("*example-data*")) { + isExampleData = true; + + }; + return isExampleData; + +} + function getAdifTag(tagName, value) { return "<" + tagName + ":" + value.length + ">" + value + " "; } @@ -575,6 +587,7 @@ $(".js-save-to-log").click(function () { setTimeout(function() { $('#textarea').css('border', ''); }, 2000); + return false; } if (false === isBandModeEntered()) { BootstrapDialog.alert({ @@ -587,6 +600,17 @@ $(".js-save-to-log").click(function () { }); return false; } + if (true === isExampleDataEntered()) { + BootstrapDialog.alert({ + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_example_data, + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, + btnOKClass: "btn-warning", + }); + return false; + } else { handleInput(); BootstrapDialog.confirm({ From bae9ec664588a3cf5a9ca6c405ba9e32f32dc641 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 2 Nov 2023 08:31:08 +0100 Subject: [PATCH 06/12] Fixed targeted CSS for table --- assets/css/general.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index 35c83820..732c23c3 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -560,18 +560,18 @@ input:invalid { height: 440px; } -.sfletable table { +.sfletable.table { width: 100%; } -.sfletable thead, tbody tr { +.sfletable.table thead, .sfletable.table tbody tr { display: block; width: 100%; table-layout: fixed; display: inline-table; } -.sfletable tbody { +.sfletable.table tbody { overflow-y: scroll; max-height: 380px; position: absolute; From dbdccdd36613d02dc7b6257fdee2fa49944def40 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 08:44:47 +0100 Subject: [PATCH 07/12] fixed old typo --- assets/js/sections/simplefle.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 815bd51c..dc1f2ce8 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -103,7 +103,7 @@ function handleInput() { var mode = ""; var freq = ""; var callsign = ""; - var sotaWff = ""; + var sotaWwff = ""; qsoList = []; $("#qsoTable tbody").empty(); @@ -158,7 +158,7 @@ function handleInput() { /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i ) ) { - sotaWff = item.toUpperCase(); + sotaWwff = item.toUpperCase(); } else if ( item.match( /([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/ @@ -213,7 +213,7 @@ function handleInput() { mode, rst_s, rst_r, - sotaWff, + sotaWwff, ]); const tableRow = $(` @@ -225,7 +225,7 @@ function handleInput() { - + `); $("#qsoTable > tbody:last-child").append(tableRow); @@ -240,7 +240,7 @@ function handleInput() { localStorage.setItem(`user_${user_id}_my-grid`, $("#my-grid").val()); callsign = ""; - sotaWff = ""; + sotaWwff = ""; } showErrors(); From df9c813fd62a936984c5a3e2377b324018874964 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:40:38 +0100 Subject: [PATCH 08/12] Changed REF text header --- application/views/simplefle/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7d12f13e..2e49fa58 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -117,6 +117,7 @@
+
* The refs can be either SOTA, IOTA, POTA or WWFF
${rst_s} ${rst_r} ${operator}${sotaWff}${sotaWwff}
@@ -128,7 +129,7 @@ - + From f4cbbb7eba182c4b553599bbe8e3f93847f80c22 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 14:50:00 +0100 Subject: [PATCH 09/12] added translation for Refs hint --- application/language/bulgarian/qso_lang.php | 1 + .../language/chinese_simplified/qso_lang.php | 1 + application/language/czech/qso_lang.php | 1 + application/language/dutch/qso_lang.php | 1 + application/language/english/qso_lang.php | 1 + application/language/finnish/qso_lang.php | 1 + application/language/french/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/language/greek/qso_lang.php | 1 + application/language/italian/qso_lang.php | 1 + application/language/polish/qso_lang.php | 1 + application/language/russian/qso_lang.php | 1 + application/language/spanish/qso_lang.php | 1 + application/language/swedish/qso_lang.php | 31 ++++++++++--------- application/language/turkish/qso_lang.php | 1 + 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 3ba30483..fb3614f1 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 033254fe..a850aab3 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index d6debacd..7449fe05 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 46ed75fb..769f42b3 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 8451d306..307429aa 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index c30242cc..b4d43a9b 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 3b2d1da6..e104cfc4 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index ff6111a1..04e8c77f 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; $lang['qso_simplefle_save'] = "Speichere in Cloudlog"; $lang['qso_simplefle_clear'] = "Lösche QSO Daten"; +$lang['qso_simplefle_refs_hint'] = "Die Ref. kann entweder SOTA, IOTA, POTA oder WWFF sein."; $lang['qso_simplefle_error_band'] = "Band fehlt!"; $lang['qso_simplefle_error_mode'] = "Mode fehlt!"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 536685ae..ab465310 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 92adc172..cfa31cd2 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index efb5301f..3033ccb6 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index ed76f8e5..3042576e 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 95fee666..9e6640d3 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index aceb756e..16f10eca 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -46,30 +46,31 @@ $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offer $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; $lang['qso_simplefle_qso_list'] = "QSO List"; -$lang['qso_simplefle_qso_list_total'] = "Total"; +$lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; -$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; - -$lang['qso_simplefle_error_band'] = "Band is missing!"; -$lang['qso_simplefle_error_mode'] = "Mode is missing!"; -$lang['qso_simplefle_error_time'] = "Time is not set!"; -$lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; -$lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; -$lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; -$lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; -$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; -$lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; -$lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; -$lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; -$lang['qso_simplefle_error_date'] = "Invalid date"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; + +$lang['qso_simplefle_error_band'] = "Band is missing!"; +$lang['qso_simplefle_error_mode'] = "Mode is missing!"; +$lang['qso_simplefle_error_time'] = "Time is not set!"; +$lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; +$lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; +$lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; +$lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; +$lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; +$lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; +$lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; +$lang['qso_simplefle_error_date'] = "Invalid date"; $lang['qso_simplefle_syntax_help_button'] = "Syntax Help"; $lang['qso_simplefle_syntax_help_title'] = "Syntax for FLE"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index a034e5e3..6f6c44ec 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -57,6 +57,7 @@ $lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data" $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; From 0867edc0f3f88d44325e96788e7f6cd8cc557103 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 14:50:21 +0100 Subject: [PATCH 10/12] replaced refs hint --- application/views/simplefle/index.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 2e49fa58..5753ac24 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -117,7 +117,6 @@
-
* The refs can be either SOTA, IOTA, POTA or WWFF
SOTA | IOTA | POTA | WWFFRefs*
@@ -129,7 +128,8 @@ - + + @@ -137,7 +137,14 @@
Refs**
- +
+
+ +
+
+ +
+
@@ -155,4 +162,4 @@
- + \ No newline at end of file From 2429ee9fd97c2d22ce0cd9a289254804736f8b2f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 14:50:34 +0100 Subject: [PATCH 11/12] adjusted table size --- assets/css/general.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/general.css b/assets/css/general.css index 732c23c3..672c0d6a 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -572,7 +572,8 @@ input:invalid { } .sfletable.table tbody { + width: 95%; overflow-y: scroll; - max-height: 380px; + max-height: 410px; position: absolute; } From 9a832c4fa250399bc8b31531b60ffbcf147933ab Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 15:07:57 +0100 Subject: [PATCH 12/12] added Initials of SOTA, POTA... aso --- assets/js/sections/simplefle.js | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index dc1f2ce8..565b9c09 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -216,17 +216,29 @@ function handleInput() { sotaWwff, ]); + let sotaWwffText = ""; + + if (isSOTA(sotaWwff)) { + sotaWwffText = `S: ${sotaWwff}`; + } else if (isPOTA(sotaWwff)) { + sotaWwffText = `P: ${sotaWwff}`; + } else if (isIOTA(sotaWwff)) { + sotaWwffText = `I: ${sotaWwff}`; + } else if (isWWFF(sotaWwff)) { + sotaWwffText = `W: ${sotaWwff}`; + } + const tableRow = $(` - ${extraQsoDate} - ${qsotime} - ${callsign} - ${band} - ${mode} - ${rst_s} - ${rst_r} - ${operator} - ${sotaWwff} - `); + ${extraQsoDate} + ${qsotime} + ${callsign} + ${band} + ${mode} + ${rst_s} + ${rst_r} + ${operator} + ${sotaWwffText} + `); $("#qsoTable > tbody:last-child").append(tableRow);