From 99b406121792906e04a43f22ddd07905a930ae83 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 1 Nov 2023 21:08:21 +0100 Subject: [PATCH 01/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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/25] 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); From 671ae9f4cec40c5f1ac544ca4b390340c75e60f4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 2 Nov 2023 21:24:18 +0100 Subject: [PATCH 13/25] added translation for user edited success banner --- application/controllers/User.php | 4 ++-- application/language/bulgarian/account_lang.php | 2 ++ application/language/chinese_simplified/account_lang.php | 2 ++ application/language/czech/account_lang.php | 2 ++ application/language/dutch/account_lang.php | 2 ++ application/language/english/account_lang.php | 2 ++ application/language/finnish/account_lang.php | 2 ++ application/language/french/account_lang.php | 2 ++ application/language/german/account_lang.php | 2 ++ application/language/greek/account_lang.php | 2 ++ application/language/italian/account_lang.php | 2 ++ application/language/polish/account_lang.php | 2 ++ application/language/russian/account_lang.php | 2 ++ application/language/spanish/account_lang.php | 2 ++ application/language/swedish/account_lang.php | 2 ++ application/language/turkish/account_lang.php | 2 ++ 16 files changed, 32 insertions(+), 2 deletions(-) diff --git a/application/controllers/User.php b/application/controllers/User.php index 8d6769a2..7bb77a03 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -500,10 +500,10 @@ class User extends CI_Controller { $this->input->set_cookie($cookie); } if($this->session->userdata('user_id') == $this->input->post('id', true)) { - $this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited'); + $this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited')); redirect('user/edit/'.$this->uri->segment(3)); } else { - $this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited'); + $this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited')); redirect('user'); } return; diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 7a6b97e4..71f8718b 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 3ca0c89c..069c0a14 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = '创建用户账户i'; $lang['account_edit_account'] = '编辑账户'; $lang['account_account_information'] = '账户信息'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = '用户名'; $lang['account_email_address'] = '电子邮件'; $lang['account_password'] = '密码'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index 9992b46b..c295f5d1 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Vytvořit uživatelský účet'; $lang['account_edit_account'] = 'Upravit účet'; $lang['account_account_information'] = 'Informace o účtu'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Uživatelské jméno'; $lang['account_email_address'] = 'Emailová adresa'; $lang['account_password'] = 'Heslo'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 8206f834..32280eb6 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 8f4f7be2..753a3165 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index 9337afa1..c680f524 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Luo käyttäjätili'; $lang['account_edit_account'] = 'Muokkaa käyttäjätiliä'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'käyttäjänimi'; $lang['account_email_address'] = 'Email'; $lang['account_password'] = 'Salasana'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index e5819c11..db4d2c02 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Creer un compte'; $lang['account_edit_account'] = 'Editer un compte'; $lang['account_account_information'] = 'Informations du compte'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Utilisateur'; $lang['account_email_address'] = 'Email'; $lang['account_password'] = 'Mot de passe'; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index b7cc58f0..10e65ccf 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Benutzerkonto anlegen'; $lang['account_edit_account'] = 'Benutzerkonto editieren'; $lang['account_account_information'] = 'Bnutzerkonto Informationen'; +$lang['account_user'] = "Benutzer"; +$lang['account_word_edited'] = "bearbeitet"; $lang['account_username'] = 'Benutzername'; $lang['account_email_address'] = 'Emailadresse'; $lang['account_password'] = 'Passwort'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a030ad78..a4f5d22b 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 70930ce1..65cad6b6 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index e5b6a2b5..873da71e 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 73c6140c..51497241 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = ' Создать аккаунт поль $lang['account_edit_account'] = 'Редактировать аккаунт'; $lang['account_account_information'] = 'Информация об аккаунте'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Имя пользователя'; $lang['account_email_address'] = 'Адрес электронной почты'; $lang['account_password'] = 'Пароль'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index 2187231a..f5d04adf 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index 344de1cd..b9e40395 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Skapa användarkonto'; $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 6a66ff6e..8dbffce2 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; From a65112d37d3afe82661c2d1e2c4211fa7bd12565 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:59:25 +0100 Subject: [PATCH 14/25] Updated contributors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76900284..ff83c790 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ When submitting PRs please make sure code is commented and includes one feature ## Credits -Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET) and Joerg (DJ7NT) for contributing code or help to Cloudlog. +Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET), Joerg (DJ7NT) and Fabian (HB9HIL) for contributing code or help to Cloudlog. ## Patreons & Donors From 6a75a4ed94feafdcecc29952d6a0ea6b68c36c6e Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 3 Nov 2023 12:42:56 +0000 Subject: [PATCH 15/25] [Migration] Tag Cloudlog as 2.5.0 --- application/config/migration.php | 2 +- application/migrations/150_tag_2_5_0.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 application/migrations/150_tag_2_5_0.php diff --git a/application/config/migration.php b/application/config/migration.php index e53b120a..7756a324 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 149; +$config['migration_version'] = 150; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/150_tag_2_5_0.php b/application/migrations/150_tag_2_5_0.php new file mode 100644 index 00000000..2adab425 --- /dev/null +++ b/application/migrations/150_tag_2_5_0.php @@ -0,0 +1,24 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.5.0')); + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.11')); + } +} \ No newline at end of file From 01341b107f1eec761bcb13d1d3bd505ed6db9ecc Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 3 Nov 2023 21:54:49 +0100 Subject: [PATCH 16/25] Add German translation for warnings --- application/language/german/general_words_lang.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 09911984..a5d64700 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -194,3 +194,8 @@ $lang['southamerica'] = 'Südamerika'; $lang['gen_band_selection'] = 'Bandauswahl'; $lang['general_word_today'] = 'Heute'; + +$lang['dashboard_php_version_warning'] = 'Die PHP Version is zu alt. Benötigt wird mindestens die Version 7.4. Die installierte Version ist'; +$lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; +$lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; +$lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; From 2fdcdaa201172872f559e7983f92ba84bdb40d11 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:07 +0100 Subject: [PATCH 17/25] added time function to js --- assets/js/sections/simplefle.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 565b9c09..a29284ba 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -85,6 +85,13 @@ ssb }); }); +function updateUTCTime() { + const utcTimeElement = document.getElementById("utc-time"); + const now = new Date(); + const utcTimeString = now.toISOString().split("T")[1].split(".")[0]; + utcTimeElement.textContent = utcTimeString; +} + function handleInput() { var qsodate = ""; if ($("#qsodate").val()) { @@ -550,6 +557,8 @@ function isWWFF(value) { $(document).ready(function () { + setInterval(updateUTCTime, 1000); + updateUTCTime(); var tabledata = localStorage.getItem(`user_${user_id}_tabledata`); var mycall = localStorage.getItem(`user_${user_id}_my-call`); var operator = localStorage.getItem(`user_${user_id}_operator`); From c357e0f90c4cbb9959f46fa4d0c48edcff7a6aab Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:23 +0100 Subject: [PATCH 18/25] added utc time to view --- application/views/simplefle/index.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 5753ac24..db176dde 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -70,12 +70,9 @@ -
-
- - - -
+
+ +

@@ -98,6 +95,13 @@
+
+
+ + + +
+
From 5984f3799c05b4aff8d1de2dce3a4750326a5475 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:45:44 +0100 Subject: [PATCH 19/25] added utc time translations --- 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 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index fb3614f1..a5e47ff4 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index a850aab3..ac9fac2e 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 7449fe05..38114fce 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 769f42b3..c038a3cf 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 307429aa..e47d17cb 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index b4d43a9b..bd501e2e 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index e104cfc4..568a5836 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 04e8c77f..9f9eb053 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -52,6 +52,7 @@ $lang['qso_simplefle_operator'] = "Operator"; $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_utc_time'] = "Aktuelle UTC Zeit"; $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_reload'] = "Aktualisiere QSO Liste"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index ab465310..0484b4d4 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index cfa31cd2..bcc442dc 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 3033ccb6..93863baa 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 3042576e..87525f7a 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 9e6640d3..a36a5553 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 16f10eca..83a0804b 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 6f6c44ec..228ee601 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -52,6 +52,7 @@ $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_utc_time'] = "Current UTC Time"; $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_reload'] = "Reload QSO List"; From a071a4b8d95c88bb5a6eaa123ce339122b3be35d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:33 +0100 Subject: [PATCH 20/25] added QSO Date hint --- application/views/simplefle/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index db176dde..8975a3f4 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -68,6 +68,7 @@
+
From 70fbafb8441708fb1c3dbca78f9e45c4f073ab03 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:55:47 +0100 Subject: [PATCH 21/25] added Translations for QSO Date hint --- 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 insertions(+) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index a5e47ff4..2b407ba0 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index ac9fac2e..a5efba4d 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index 38114fce..10778550 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index c038a3cf..0eb9e3d5 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index e47d17cb..ccec36be 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index bd501e2e..b84dcf8b 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 568a5836..1519c7d2 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 9f9eb053..9e86c42b 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry' oder einfach 'FLE' ist ein S $lang['qso_simplefle_info_ln3'] = "FLE wurde ursprünglich von DF3CB geschrieben. Auf seiner Website bietet er ein Programm für Windows an. Simple FLE wurde von OK2CQR auf Basis des FLE von DF3CB geschrieben und bietet eine Webapplikation zum Erfassen von QSOs."; $lang['qso_simplefle_info_ln4'] = "Ein üblicher Anwendungsfall ist, wenn Sie Ihre Papier-Logbücher von einer Outdoor-Aktion erfassen müssen und SimpleFLE nun auch in Cloudlog verfügbar. Informationen über die allgemeine Syntax und Handhabung gibt es hier."; $lang['qso_simplefle_qso_data'] = "QSO Daten"; +$lang['qso_simplefle_qso_date_hint'] = "Wenn du kein Datum auswählst, wird das heutige Datum verwendet."; $lang['qso_simplefle_qso_list'] = "QSO Liste"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Datum"; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 0484b4d4..31d11350 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index bcc442dc..4d28e9ee 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 93863baa..f56812d6 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 87525f7a..0d5acd81 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index a36a5553..091150cd 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 83a0804b..a8ba6b0d 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 228ee601..b0d8bdd8 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $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_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; From b6668227a896c48e36e648a45d27d957f36457d3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 4 Nov 2023 12:56:03 +0100 Subject: [PATCH 22/25] made table a bit higher to match with the new hint --- assets/css/general.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/general.css b/assets/css/general.css index 672c0d6a..2d75a9d5 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -557,7 +557,7 @@ input:invalid { } .sfletable{ - height: 440px; + height: 470px; } .sfletable.table { @@ -574,6 +574,6 @@ input:invalid { .sfletable.table tbody { width: 95%; overflow-y: scroll; - max-height: 410px; + max-height: 440px; position: absolute; } From be7632ef58e842e84af85501d9417f187f5ab58b Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 14:19:56 +0100 Subject: [PATCH 23/25] Add reset buttons for times to reset on click --- application/views/interface_assets/footer.php | 13 +++++++++++++ application/views/qso/index.php | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c7143344..8b12884a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1005,6 +1005,19 @@ $(document).on('keypress',function(e) { var utc = localTime + (now.getTimezoneOffset() * 60000); $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); }); + $('#reset_start_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); + $('#reset_end_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); }); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cc97f357..679cab72 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -59,12 +59,20 @@
- + + + + + + required pattern="[0-2][0-9]:[0-5][0-9]">
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 26a1f8531f16adc3e9a23ac19da447621c008ad8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 4 Nov 2023 15:31:44 +0100 Subject: [PATCH 24/25] Also handle logging of start time only --- application/views/qso/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 679cab72..3222af4b 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -92,6 +92,9 @@
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
From 39bb190fd255af7dfa4148f95ce634d30a1dc6bd Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 4 Nov 2023 18:31:39 +0100 Subject: [PATCH 25/25] Fix county format in ADIF export --- application/libraries/AdifHelper.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index a639896c..d167077a 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -198,7 +198,13 @@ class AdifHelper { $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); - $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty); + if($qso->state) { + $county = trim($qso->state) . "," . trim($qso->station_cnty); + } else { + $county = trim($qso->station_cnty); + } + + $line .= $this->getAdifFieldLine("MY_CNTY", $county); $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig);