From be37112819d06c0116ce9a30898d68704854deb1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 22:53:45 +0200 Subject: [PATCH 01/45] Created controller for Simple FLE --- application/controllers/SimpleFLE.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 application/controllers/SimpleFLE.php diff --git a/application/controllers/SimpleFLE.php b/application/controllers/SimpleFLE.php new file mode 100644 index 00000000..e759b8a9 --- /dev/null +++ b/application/controllers/SimpleFLE.php @@ -0,0 +1,24 @@ +load->model('user_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + + $this->load->model('modes'); + $this->load->model('logbook_model'); + $this->load->model('stations'); + $this->load->model('bands'); + + $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select + + $data['page_title'] = "Simple Fast Log Entry"; + + $this->load->view('interface_assets/header', $data); + $this->load->view('simplefastlogentry/index'); + $this->load->view('interface_assets/footer'); + + + } +} \ No newline at end of file From 31063992f7b3063c8cc9cd6ed3280ff78e64323c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 22:54:06 +0200 Subject: [PATCH 02/45] added simplefle menu title --- application/language/bulgarian/menu_lang.php | 1 + application/language/chinese_simplified/menu_lang.php | 1 + application/language/czech/menu_lang.php | 1 + application/language/dutch/menu_lang.php | 1 + application/language/english/menu_lang.php | 1 + application/language/finnish/menu_lang.php | 1 + application/language/french/menu_lang.php | 1 + application/language/german/menu_lang.php | 1 + application/language/greek/menu_lang.php | 1 + application/language/italian/menu_lang.php | 1 + application/language/polish/menu_lang.php | 1 + application/language/russian/menu_lang.php | 1 + application/language/spanish/menu_lang.php | 1 + application/language/swedish/menu_lang.php | 1 + application/language/turkish/menu_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index 742066b2..e7c8a468 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 2265a037..24c7b816 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = '详细信息'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = '添加QSO(从电台获取信息)'; $lang['menu_post_qso'] = '添加QSO(手动输入信息)'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = '比赛日志(从电台获取信息)'; $lang['menu_post_contest_logging'] = '比赛日志(手动输入信息)'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index cf7671f0..0281ab9d 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Pokročilé zobrazení'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Živé QSO'; $lang['menu_post_qso'] = 'Uložit QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Živé závodní logování'; $lang['menu_post_contest_logging'] = 'Uložit závodní log'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index 5a6b0826..b2abb354 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index 37920641..56561034 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index c78371f6..2cf11dcc 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandikartta'; diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index 37920641..56561034 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 7d91eaf0..6697747d 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Erweitert'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Zeitversetztes QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Zeitversetztes Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index 42a0865d..ef9418a1 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index 42a0865d..ef9418a1 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index 42a0865d..ef9418a1 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index b224617f..f812cc5e 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Расширенный вид'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'добавить QSO'; $lang['menu_post_qso'] = 'добавить прошедшее QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Журнал соревнований'; $lang['menu_post_contest_logging'] = 'Журнал прошедших соревнований'; $lang['menu_bandmap'] = 'План диапазонов'; diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index 42a0865d..ef9418a1 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 7b924b22..786d8e1a 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Avancerad'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Tävlingsloggning'; $lang['menu_post_contest_logging'] = 'Post Tävlingsloggning'; $lang['menu_bandmap'] = 'Bandkarta'; diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index 42a0865d..ef9418a1 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -11,6 +11,7 @@ $lang['menu_advanced'] = 'Advanced'; $lang['menu_qso'] = 'QSO'; $lang['menu_live_qso'] = 'Live QSO'; $lang['menu_post_qso'] = 'Post QSO'; +$lang['menu_fast_log_entry'] = "Simple Fast Log Entry"; $lang['menu_live_contest_logging'] = 'Live Contest Logging'; $lang['menu_post_contest_logging'] = 'Post Contest Logging'; $lang['menu_bandmap'] = 'Bandmap'; From 9017e42bd0fe55c0b763cdb3762b1f4d6b7e8158 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 22:54:17 +0200 Subject: [PATCH 03/45] added menu entry --- application/views/interface_assets/header.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7f64add8..33c16ad2 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -91,6 +91,8 @@ + + From 75df99ced0b07751a6e9aa5089afba988d1b65d0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 22:54:35 +0200 Subject: [PATCH 04/45] created simple fle view --- application/views/simplefastlogentry/index.php | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 application/views/simplefastlogentry/index.php diff --git a/application/views/simplefastlogentry/index.php b/application/views/simplefastlogentry/index.php new file mode 100644 index 00000000..f56a9b64 --- /dev/null +++ b/application/views/simplefastlogentry/index.php @@ -0,0 +1,3 @@ +
+

Simple FLE

+
\ No newline at end of file From bb9827d0cf5c5140cf4c2bd7f2021340eebf0d7f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 24 Oct 2023 23:45:51 +0200 Subject: [PATCH 05/45] Simple FLE Controller --- application/controllers/SimpleFLE.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/SimpleFLE.php b/application/controllers/SimpleFLE.php index e759b8a9..0048c2fa 100644 --- a/application/controllers/SimpleFLE.php +++ b/application/controllers/SimpleFLE.php @@ -1,6 +1,6 @@ load->model('user_model'); From 4176d9322abca2508f270067c964fafda7484721 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 07:45:01 +0200 Subject: [PATCH 06/45] renamed simplefle controller --- application/controllers/{SimpleFLE.php => SimpleFastLogEntry.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename application/controllers/{SimpleFLE.php => SimpleFastLogEntry.php} (100%) diff --git a/application/controllers/SimpleFLE.php b/application/controllers/SimpleFastLogEntry.php similarity index 100% rename from application/controllers/SimpleFLE.php rename to application/controllers/SimpleFastLogEntry.php From 9e6686dc530fcb12e44293a097edf67855c2efc1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 07:48:51 +0200 Subject: [PATCH 07/45] renamed stuff --- .../controllers/{SimpleFastLogEntry.php => Simplefle.php} | 4 ++-- application/views/{simplefastlogentry => simplefle}/index.php | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename application/controllers/{SimpleFastLogEntry.php => Simplefle.php} (87%) rename application/views/{simplefastlogentry => simplefle}/index.php (100%) diff --git a/application/controllers/SimpleFastLogEntry.php b/application/controllers/Simplefle.php similarity index 87% rename from application/controllers/SimpleFastLogEntry.php rename to application/controllers/Simplefle.php index 0048c2fa..f79d93e1 100644 --- a/application/controllers/SimpleFastLogEntry.php +++ b/application/controllers/Simplefle.php @@ -1,6 +1,6 @@ load->model('user_model'); @@ -16,7 +16,7 @@ class SimpleFastLogEntry extends CI_Controller { $data['page_title'] = "Simple Fast Log Entry"; $this->load->view('interface_assets/header', $data); - $this->load->view('simplefastlogentry/index'); + $this->load->view('simplefle/index'); $this->load->view('interface_assets/footer'); diff --git a/application/views/simplefastlogentry/index.php b/application/views/simplefle/index.php similarity index 100% rename from application/views/simplefastlogentry/index.php rename to application/views/simplefle/index.php From 49143eec40103ebe2162d26f287e2076454ae070 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 08:05:30 +0200 Subject: [PATCH 08/45] renamed link --- application/views/interface_assets/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 33c16ad2..c4b35237 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -91,7 +91,7 @@ - + From 0364df723a6e5e6b4a1372cdcb7c0961202011f1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 09:29:16 +0200 Subject: [PATCH 09/45] working on sfle --- application/controllers/Simplefle.php | 7 - application/language/english/qso_lang.php | 8 + application/views/interface_assets/footer.php | 17 + application/views/simplefle/index.php | 308 +++++++++++++++++- assets/css/general.css | 7 + 5 files changed, 338 insertions(+), 9 deletions(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index f79d93e1..a9d9e6ed 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -6,13 +6,6 @@ class SimpleFLE extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $this->load->model('modes'); - $this->load->model('logbook_model'); - $this->load->model('stations'); - $this->load->model('bands'); - - $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select - $data['page_title'] = "Simple Fast Log Entry"; $this->load->view('interface_assets/header', $data); diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index f761b8ce..fc4dc99f 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -36,3 +36,11 @@ $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['simplefle_info'] = "What is that?"; +$lang['simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$lang['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['simplefle_info_ln4'] = "Now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index be31ee60..3866e810 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2405,6 +2405,23 @@ function viewEqsl(picture, callsign) { }); }); + +

+ + + + session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + +
+
+
+ +
+ +
+ + + +
+
+ +
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+

Enter the data

+ +
+
+
+
+ QSO list +
+ + + + + + + + + + + + + + + + + +
DateTimeCallsignBandModeRSRROp.SOTA/WFF
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ Status: +
+
+
+
+

+
+
+
+
+
+
+ General +
+
+
+
+
+
+ QSO +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ Bands +
+
+
+
+
+
+
+
+
+
+
+
+

+ Simple fast log entry written in HTML/Javascript by Petr, + OK2CQR. + Heavily inspired by FLE from Bernd, DF3CB. + Unfortunately, the FLE works only on Windows and Linux using Wine, but I needed something + working on macOS and/or + Android tablet. I didn't need all the features, just wanted to log QSO from my + WFF/SOTA/GMA activation. +

+ +

+ The SFLE (Simple fast log entry) is a tool created by GDD (Google Driven Development) using + Bootstrap 4 and jQuery (I'm a backend developer). Data is stored only in your browser. + The website does not collect any data about you. +

+ +

+ If you find any bug or have a suggestion on how to improve the website, please let me know + at petr@ok2cqr.com. + I get many emails every day, if you don't get a reply in a few days, don't hesitate to + send your email again. +

+

+ Source code is available on GitHub. +

+
+
+
+
+ Changelog: +
+
+
+
+
+

+ 2023-09-24 +

    +
  • fix: 70CM band was not recognized
  • +
+

+
+
+
+
+

+ 2023-08-05 +

    +
  • new: when you click the 'Load sample log' button, a question dialog will appear, asking if you want to replace the existing data
  • +
  • new: after attempting to download the ADIF file, if no band and/or mode is defined, a dialog window will appear displaying an error message
  • +
  • fix: getting freq from band and mode
  • +
+

+
+
+
+
+

+ 2023-04-25 +

    +
  • new: showing frequency after hovering the band column table
  • +
  • new: the website's look and feel have been significantly improved, thanks to the pull request submitted by Aleš Kounovský, who did an outstanding job
  • +
+

+
+
+
+

+ 2022-07-23 +

    +
  • new: Power and My grid fields added to + Settings values will be in the exported ADIF file if filled in.
  • +
+

+
+
+
+
+

+ 2022-02-16 +

    +
  • new: Custom report support - e.g. 5 7 + means 559 as RST sent and 579 as RST received on CW or 55/57 on SSB, click to Load sample log button to see real examples
  • +
+

+
+
+
+
+

+ 2022-02-03 +

    +
  • new: Showing QSO count below the table +
  • +
+

+
+
+
+
+

+ 2022-01-29 +

    +
  • new: dark mode (thanks to Andreas, + LA8AJA)
  • +
  • new: saving data to local storage + (thanks to Andreas, LA8AJA)
  • +
  • new: grid scrolls to last line after + adding a new qso (thanks to Andreas, LA8AJA)
  • +
  • new: website should be responsive
  • +
  • fix: some design fixes (thanks to + Andreas, LA8AJA)
  • +
  • fix: qso time loading
  • +
+

+
+
+
+
+

+ 2021-12-04 +

    +
  • new: area with QSO data has monospace + font
  • +
  • fix: callsign with slash was not + recognized
  • +
  • fix: loading qso date from date field +
  • +
+

+
+
+
+
+
\ No newline at end of file diff --git a/assets/css/general.css b/assets/css/general.css index 03f4cae7..3e3f7cec 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -543,4 +543,11 @@ div#station_logbooks_linked_table_paginate { } #awardInfoButton h2 { margin-right: 30px; +} +#simpleFleInfo { + display: flex; + align-items: center; +} +#simpleFleInfo h2 { + margin-right: 30px; } \ No newline at end of file From a63244a78a27974df0789291104bf24cfe97fe96 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 10:02:06 +0200 Subject: [PATCH 10/45] working on simplefle --- application/controllers/Simplefle.php | 11 +- application/language/english/qso_lang.php | 2 +- application/views/interface_assets/footer.php | 17 - application/views/simplefle/index.php | 2 +- assets/js/sections/simplefle.js | 674 ++++++++++++++++++ 5 files changed, 685 insertions(+), 21 deletions(-) create mode 100644 assets/js/sections/simplefle.js diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index a9d9e6ed..5dc0eda3 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -7,11 +7,18 @@ class SimpleFLE extends CI_Controller { if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } $data['page_title'] = "Simple Fast Log Entry"; + + $footerData = []; + $footerData['scripts'] = [ + 'assets/js/moment.min.js', + 'assets/js/tempusdominus-bootstrap-4.min.js', + 'assets/js/datetime-moment.js', + 'assets/js/sections/simplefle.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/simplefle.js")) + ]; $this->load->view('interface_assets/header', $data); $this->load->view('simplefle/index'); - $this->load->view('interface_assets/footer'); - + $this->load->view('interface_assets/footer', $footerData); } } \ No newline at end of file diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index fc4dc99f..5936d1a6 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -43,4 +43,4 @@ $lang['simplefle_info'] = "What is that?"; $lang['simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; $lang['simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; $lang['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['simplefle_info_ln4'] = "Now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; \ No newline at end of file +$lang['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."; \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 3866e810..be31ee60 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2405,23 +2405,6 @@ function viewEqsl(picture, callsign) { }); }); -

- + session->flashdata('message')) { ?> @@ -110,7 +115,7 @@
- +
@@ -196,112 +201,6 @@

-
-
- Changelog: -
-
-
-
-
-

- 2023-09-24 -

    -
  • fix: 70CM band was not recognized
  • -
-

-
-
-
-
-

- 2023-08-05 -

    -
  • new: when you click the 'Load sample log' button, a question dialog will appear, asking if you want to replace the existing data
  • -
  • new: after attempting to download the ADIF file, if no band and/or mode is defined, a dialog window will appear displaying an error message
  • -
  • fix: getting freq from band and mode
  • -
-

-
-
-
-
-

- 2023-04-25 -

    -
  • new: showing frequency after hovering the band column table
  • -
  • new: the website's look and feel have been significantly improved, thanks to the pull request submitted by Aleš Kounovský, who did an outstanding job
  • -
-

-
-
-
-

- 2022-07-23 -

    -
  • new: Power and My grid fields added to - Settings values will be in the exported ADIF file if filled in.
  • -
-

-
-
-
-
-

- 2022-02-16 -

    -
  • new: Custom report support - e.g. 5 7 - means 559 as RST sent and 579 as RST received on CW or 55/57 on SSB, click to Load sample log button to see real examples
  • -
-

-
-
-
-
-

- 2022-02-03 -

    -
  • new: Showing QSO count below the table -
  • -
-

-
-
-
-
-

- 2022-01-29 -

    -
  • new: dark mode (thanks to Andreas, - LA8AJA)
  • -
  • new: saving data to local storage - (thanks to Andreas, LA8AJA)
  • -
  • new: grid scrolls to last line after - adding a new qso (thanks to Andreas, LA8AJA)
  • -
  • new: website should be responsive
  • -
  • fix: some design fixes (thanks to - Andreas, LA8AJA)
  • -
  • fix: qso time loading
  • -
-

-
-
-
-
-

- 2021-12-04 -

    -
  • new: area with QSO data has monospace - font
  • -
  • fix: callsign with slash was not - recognized
  • -
  • fix: loading qso date from date field -
  • -
-

-
-
\ No newline at end of file diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 9c6d03cd..22d645cc 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -76,7 +76,7 @@ var callsign = ""; var errors = []; var qsoList = []; -$('#simpleFleInfo').click(function (event) { +$('#simpleFleInfoButton').click(function (event) { var awardInfoLines = [ lang_simplefle_info_ln2, lang_simplefle_info_ln3, @@ -92,6 +92,22 @@ $('#simpleFleInfo').click(function (event) { }); }); +$('#js-syntax').click(function (event) { + var awardInfoLines = [ + lang_simplefle_syntax_help_ln2, + lang_simplefle_syntax_help_ln3, + lang_simplefle_syntax_help_ln4 + ]; + var simpleFleSyntaxHelp = ""; + awardInfoLines.forEach(function (line) { + simpleFleSyntaxHelp += line + "

"; + }); + BootstrapDialog.alert({ + title: "

"+lang_simplefle_syntax_help_ln1+"

", + message: simpleFleSyntaxHelp, + }); +}); + function handleInput() { var qsodate = ""; if ($("#qsodate").val()) { @@ -334,42 +350,6 @@ $(".js-download-qso").click(function () { handleInput(); }); -$(".js-load-sample-log").click(function () { - if ($textarea.val()) { - if ( - false === - confirm( - "Do you really want to replace the entered data with the sample log?" - ) - ) { - return false; - } - } - const logData = ` - 80m cw - 1212 ok1uu okff-1234 - 3 ok1rr - 4 ok1tn - 20 dl6kva 7 8 - 5 dl5cw - ssb - 32 ok7wa ol/zl-071 5 8 - 33 ok1xxx 4 3 - `; - - $textarea.val(logData.trim()); - if ($("#my-call").val() === "") { - $("#my-call").val("OK2CQR/P"); - } - if ($("#operator").val() === "") { - $("#operator").val("OK2CQR"); - } - if ($("#my-sota-wwff").val() === "") { - $("#my-sota-wwff").val("OKFF-2068"); - } - - handleInput(); -}); function getBandFromFreq(freq) { if (freq > 1.7 && freq < 2) { From d2a8c7fc85638fc81e360a5e7a1dee7dc2c224b0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 10:59:18 +0200 Subject: [PATCH 12/45] working on simple fle --- application/language/english/qso_lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index d15b118e..12a802d9 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -47,7 +47,7 @@ $lang['simplefle_info_ln4'] = "A common use-case is if you have to import your p $lang['simplefle_syntax_help_button'] = "Syntax Help"; $lang['simplefle_syntax_help_ln1'] = "Syntax for FLE"; -$lang['simplefle_syntax_help_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; -$lang['simplefle_syntax_help_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['simplefle_syntax_help_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['simplefle_syntax_help_ln2'] = "..."; +$lang['simplefle_syntax_help_ln3'] = "..."; +$lang['simplefle_syntax_help_ln4'] = "pending"; From 503f67c16e681e1bbc14f5961a6ee4987000f417 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 15:14:53 +0200 Subject: [PATCH 13/45] working on simple fle --- application/controllers/Simplefle.php | 5 +++++ application/views/simplefle/index.php | 14 ++++++++++---- assets/js/sections/simplefle.js | 14 +++++++------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index 5dc0eda3..f99ea3c1 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -6,6 +6,11 @@ class SimpleFLE extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + + $this->load->model('stations'); + + $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select + $data['page_title'] = "Simple Fast Log Entry"; $footerData = []; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 65e8f758..e4a8b883 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -61,16 +61,22 @@
- - + + +
- +
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 22d645cc..03201936 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -118,7 +118,7 @@ function handleInput() { var operator = $("#operator").val(); operator = operator.toUpperCase(); - var ownCallsign = $("#my-call").val().toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); ownCallsign = ownCallsign.toUpperCase(); var extraQsoDate = qsodate; @@ -251,7 +251,7 @@ function handleInput() { $("#qsoTable > tbody:last-child").append(tableRow); localStorage.setItem("tabledata", $("#qsoTable").html()); - localStorage.setItem("my-call", $("#my-call").val()); + localStorage.setItem("my-call", $("#station-call").val()); localStorage.setItem("operator", $("#operator").val()); localStorage.setItem("my-sota-wwff", $("#my-sota-wwff").val()); localStorage.setItem("qso-area", $(".qso-area").val()); @@ -282,8 +282,8 @@ function handleInput() { } function checkMainFieldsErrors() { - if ($("#my-call").val() === "") { - addErrorMessage("'My call' field is empty!"); + if ($("#station-call").val() === '-') { + addErrorMessage("'Station Call' is not selected!"); } if ($("#operator").val() === "") { @@ -331,7 +331,7 @@ $(".js-empty-qso").click(function () { $("#qsodate").val(""); $("#qsoTable tbody").empty(); $("#my-sota-wwff").val(""); - $("#my-call").val(""); + $("#station-call").val(""); $("#operator").val(""); $(".qso-area").val(""); $("#my-grid").val(""); @@ -444,7 +444,7 @@ $(".js-band-settings").html(htmlSettings); $(".js-download-adif").click(function () { var operator = $("#operator").val(); operator = operator.toUpperCase(); - var ownCallsign = $("#my-call").val().toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); ownCallsign = ownCallsign.toUpperCase(); var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); @@ -620,7 +620,7 @@ $(document).ready(function () { var myGrid = localStorage.getItem("my-grid"); if (mycall != null) { - $("#my-call").val(mycall); + $("#station-call").val(mycall); } if (operator != null) { From 2dedfbf0e8f8bf8fc947588fdc0d1ee1f37a9e08 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 16:32:39 +0200 Subject: [PATCH 14/45] working on simplefle --- application/controllers/Simplefle.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index f99ea3c1..09b53699 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -8,6 +8,9 @@ class SimpleFLE extends CI_Controller { $this->load->model('stations'); + $this->load->model('logbook_model'); + $this->load->model('modes'); + $this->load->model('bands'); $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select From cc64fbc0e03c74efa8cd6c1f3a3a07ec06970e82 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 25 Oct 2023 16:52:46 +0200 Subject: [PATCH 15/45] merge changes --- assets/css/general.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/css/general.css b/assets/css/general.css index 3e3f7cec..a2ad3e2a 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -550,4 +550,8 @@ div#station_logbooks_linked_table_paginate { } #simpleFleInfo h2 { margin-right: 30px; -} \ No newline at end of file +} + +input:invalid { + border-color: red; + } \ No newline at end of file From 14e0fc9a81a718b1b578f2bb29d6bacc0b0e3ee0 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 10:46:15 +0200 Subject: [PATCH 16/45] working son simplefle --- application/views/simplefle/index.php | 32 --------------------------- 1 file changed, 32 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index e4a8b883..7ec1876f 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -176,37 +176,5 @@ -
-
-
-

- Simple fast log entry written in HTML/Javascript by Petr, - OK2CQR. - Heavily inspired by FLE from Bernd, DF3CB. - Unfortunately, the FLE works only on Windows and Linux using Wine, but I needed something - working on macOS and/or - Android tablet. I didn't need all the features, just wanted to log QSO from my - WFF/SOTA/GMA activation. -

- -

- The SFLE (Simple fast log entry) is a tool created by GDD (Google Driven Development) using - Bootstrap 4 and jQuery (I'm a backend developer). Data is stored only in your browser. - The website does not collect any data about you. -

- -

- If you find any bug or have a suggestion on how to improve the website, please let me know - at petr@ok2cqr.com. - I get many emails every day, if you don't get a reply in a few days, don't hesitate to - send your email again. -

-

- Source code is available on GitHub. -

-
-
-
\ No newline at end of file From 462e464f6e828219da03e5120af53a5354b25862 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 14:06:54 +0200 Subject: [PATCH 17/45] added syntaxhelp text --- application/controllers/Simplefle.php | 4 +++ application/views/simplefle/syntax_help.php | 28 +++++++++++++++++++++ assets/js/sections/simplefle.js | 24 +++++++++--------- 3 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 application/views/simplefle/syntax_help.php diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index 09b53699..dff43e23 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -29,4 +29,8 @@ class SimpleFLE extends CI_Controller { $this->load->view('interface_assets/footer', $footerData); } + + public function displaySyntax() { + $this->load->view('simplefle/syntax_help'); + } } \ No newline at end of file diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php new file mode 100644 index 00000000..dd0799f8 --- /dev/null +++ b/application/views/simplefle/syntax_help.php @@ -0,0 +1,28 @@ +
The basic syntax of FastLogEntry
+

Before start logging a qso to notice to basic rules:

+

- Every new QSO get its own new line

+

- At every new line only write data, which changed to the last qso

+
+

We start with the first data, you already filled the form on the left with the date, wwff/sota info, stationcall and operator call. The main data contains the band, mode and time. After time you provide the first qso (basically the callsign)

+
+    20m ssb
+    2134 2m0sql
+
+

So this QSO started at 21:34 (UTC!) with 2M0SQL on 20m SSB.

+

If you do not provide any RST Information the Syntax will use 59 (599 for data). Out next QSO wasn't 59 on both sides so we provide the information with the sent RST first. And it was 2 Minutes later then the first QSO.

+
+    20m ssb
+    2134 2m0sql
+    6 la8aja 47 46
+
+

The first QSO was at 21:34, the second one 2 Minutes later at 21:36 so we write down 6 because this is the only data which changed here. The information about band and mode didn't change. So this data is omitted.

+

For our next QSO at 21:40 we changed band to 40m, but still on SSB. If now RST information is given the syntax will use 59 for every new QSO.

+
+    20m ssb
+    2134 2m0sql
+    6 la8aja 47 46
+    40m 
+    40 dj7nt
+
+

For further information about the syntax please check the Website of DF3CB here.

+ diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 03201936..1372326d 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -93,18 +93,18 @@ $('#simpleFleInfoButton').click(function (event) { }); $('#js-syntax').click(function (event) { - var awardInfoLines = [ - lang_simplefle_syntax_help_ln2, - lang_simplefle_syntax_help_ln3, - lang_simplefle_syntax_help_ln4 - ]; - var simpleFleSyntaxHelp = ""; - awardInfoLines.forEach(function (line) { - simpleFleSyntaxHelp += line + "

"; - }); - BootstrapDialog.alert({ - title: "

"+lang_simplefle_syntax_help_ln1+"

", - message: simpleFleSyntaxHelp, + $('#js-syntax').prop("disabled", false); + $.ajax({ + url: base_url + 'index.php/simplefle/displaySyntax', + type: 'post', + success: function (html) { + BootstrapDialog.alert({ + title: "

"+lang_simplefle_syntax_help_ln1+"

", + // // size: BootstrapDialog.SIZE_NORMAL, + nl2br: false, + message: html, + }); + } }); }); From ee90bdee9c7923488d9c6772a0cad68f36042432 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 14:21:33 +0200 Subject: [PATCH 18/45] SyntaxHelp Text Dialog --- application/views/simplefle/syntax_help.php | 2 -- assets/js/sections/simplefle.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php index dd0799f8..fa956e6e 100644 --- a/application/views/simplefle/syntax_help.php +++ b/application/views/simplefle/syntax_help.php @@ -1,8 +1,6 @@ -
The basic syntax of FastLogEntry

Before start logging a qso to notice to basic rules:

- Every new QSO get its own new line

- At every new line only write data, which changed to the last qso

-

We start with the first data, you already filled the form on the left with the date, wwff/sota info, stationcall and operator call. The main data contains the band, mode and time. After time you provide the first qso (basically the callsign)

     20m ssb
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js
index 1372326d..c5836d63 100644
--- a/assets/js/sections/simplefle.js
+++ b/assets/js/sections/simplefle.js
@@ -100,7 +100,7 @@ $('#js-syntax').click(function (event) {
         success: function (html) {
             BootstrapDialog.alert({
                 title: "

"+lang_simplefle_syntax_help_ln1+"

", - // // size: BootstrapDialog.SIZE_NORMAL, + size: BootstrapDialog.SIZE_WIDE, nl2br: false, message: html, }); From 8632b05ccaca1173c53145e14e32e9d29a40c017 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 15:17:17 +0200 Subject: [PATCH 19/45] controller --- application/controllers/Simplefle.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index dff43e23..c626c1f1 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -13,6 +13,8 @@ class SimpleFLE extends CI_Controller { $this->load->model('bands'); $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select + $data['bands'] = $this->bands->get_all_bands_for_user(); // Fetching Bands for FLE + $data['page_title'] = "Simple Fast Log Entry"; @@ -25,7 +27,7 @@ class SimpleFLE extends CI_Controller { ]; $this->load->view('interface_assets/header', $data); - $this->load->view('simplefle/index'); + $this->load->view('simplefle/index', $data); $this->load->view('interface_assets/footer', $footerData); } From a6f51cf29acc523c4f7a316249ece610559da133 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:25:34 +0200 Subject: [PATCH 20/45] Tweaked regex for bands --- assets/js/sections/simplefle.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index c5836d63..b3a5f4a1 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -153,8 +153,8 @@ function handleInput() { } else if (item.match(/^CW$|^SSB$|^FM$|^AM$|^PSK$|^FT8$/i)) { mode = item.toUpperCase(); } else if ( - item.match(/^[1-9]?\d\d[Mm]$/) || - item.toUpperCase() === "70CM" + item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) || + item.match(/^(sat)$/) ) { band = item.toUpperCase(); freq = 0; @@ -417,7 +417,7 @@ for (const [key, value] of Object.entries(Bands)) { - +
@@ -425,7 +425,7 @@ for (const [key, value] of Object.entries(Bands)) { -
+
@@ -433,9 +433,9 @@ for (const [key, value] of Object.entries(Bands)) { -
+
- + `; } @@ -453,14 +453,14 @@ $(".js-download-adif").click(function () { const adifHeader = ` ADIF export from Simple fast log entry by Petr, OK2CQR - + Internet: https://sfle.ok2cqr.com - + 2.2.1 SFLE 0.0.1 - + `; if (false === isBandModeEntered()) { From a33a5ead0a7e51cc4a80f401123ff2f76c17a256 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 15:49:18 +0200 Subject: [PATCH 21/45] SimpleFLE Language --- application/language/english/qso_lang.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 12a802d9..87482b26 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -46,8 +46,5 @@ $lang['simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a $lang['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['simplefle_syntax_help_button'] = "Syntax Help"; -$lang['simplefle_syntax_help_ln1'] = "Syntax for FLE"; -$lang['simplefle_syntax_help_ln2'] = "..."; -$lang['simplefle_syntax_help_ln3'] = "..."; -$lang['simplefle_syntax_help_ln4'] = "pending"; +$lang['simplefle_syntax_help_title'] = "Syntax for FLE"; From 50551441a16320d35290669de392039aa6c3769b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 16:10:05 +0200 Subject: [PATCH 22/45] Prepoulate active Station Location --- application/controllers/Simplefle.php | 1 + application/views/simplefle/index.php | 14 +++++++------- assets/js/sections/simplefle.js | 25 ++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index c626c1f1..164ba714 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -14,6 +14,7 @@ class SimpleFLE extends CI_Controller { $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select $data['bands'] = $this->bands->get_all_bands_for_user(); // Fetching Bands for FLE + $data['active_station_profile'] = $this->stations->find_active(); // Prepopulate active Station in Station Location Selector $data['page_title'] = "Simple Fast Log Entry"; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 7ec1876f..b38679e1 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -9,10 +9,7 @@ var lang_simplefle_info_ln3 = ""; var lang_simplefle_info_ln4 = ""; var lang_simplefle_syntax_help = ""; - var lang_simplefle_syntax_help_ln1 = ""; - var lang_simplefle_syntax_help_ln2 = ""; - var lang_simplefle_syntax_help_ln3 = ""; - var lang_simplefle_syntax_help_ln4 = ""; + var lang_simplefle_syntax_help_title = "";

@@ -63,13 +60,16 @@
- + +
@@ -121,7 +121,7 @@
- +
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index b3a5f4a1..9c17ae98 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -99,7 +99,7 @@ $('#js-syntax').click(function (event) { type: 'post', success: function (html) { BootstrapDialog.alert({ - title: "

"+lang_simplefle_syntax_help_ln1+"

", + title: "

"+lang_simplefle_syntax_help_title+"

", size: BootstrapDialog.SIZE_WIDE, nl2br: false, message: html, @@ -441,6 +441,18 @@ for (const [key, value] of Object.entries(Bands)) { } $(".js-band-settings").html(htmlSettings); + + + + + + + + + + + + $(".js-download-adif").click(function () { var operator = $("#operator").val(); operator = operator.toUpperCase(); @@ -534,6 +546,17 @@ $(".js-download-adif").click(function () { download(filename, adif); }); + + + + + + + + + + + function isBandModeEntered() { let isBandModeOK = true; qsoList.forEach((item) => { From 587660383e3a48c8a141f8b85ab5507f76e2425c Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:59:02 +0200 Subject: [PATCH 23/45] [SimpleFLE] Replaced hardcoded bands with bands from db --- application/controllers/Simplefle.php | 8 ++-- application/models/Bands.php | 24 ++++++++-- assets/js/sections/simplefle.js | 68 --------------------------- 3 files changed, 23 insertions(+), 77 deletions(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index 164ba714..3c77ff2f 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -6,19 +6,19 @@ class SimpleFLE extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - + $this->load->model('stations'); $this->load->model('logbook_model'); $this->load->model('modes'); $this->load->model('bands'); $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select - $data['bands'] = $this->bands->get_all_bands_for_user(); // Fetching Bands for FLE + $data['bands'] = $this->bands->get_all_bands(); // Fetching Bands for FLE $data['active_station_profile'] = $this->stations->find_active(); // Prepopulate active Station in Station Location Selector $data['page_title'] = "Simple Fast Log Entry"; - + $footerData = []; $footerData['scripts'] = [ 'assets/js/moment.min.js', @@ -36,4 +36,4 @@ class SimpleFLE extends CI_Controller { public function displaySyntax() { $this->load->view('simplefle/syntax_help'); } -} \ No newline at end of file +} diff --git a/application/models/Bands.php b/application/models/Bands.php index 0af87e10..b8bbf594 100644 --- a/application/models/Bands.php +++ b/application/models/Bands.php @@ -37,7 +37,7 @@ class Bands extends CI_Model { if ($award != 'None') { $this->db->where('bandxuser.'.$award, 1); } - + $result = $this->db->get()->result(); $results = array(); @@ -49,6 +49,20 @@ class Bands extends CI_Model { return $results; } + function get_all_bands() { + $this->db->from('bands'); + + $result = $this->db->get()->result(); + + $results = array(); + + foreach($result as $band) { + $results['b'.strtoupper($band->band)] = array('cw' => $band->cw, 'ssb' => $band->ssb, 'digi' => $band->data); + } + + return $results; + } + function get_user_bands_for_qso_entry($includeall = false) { $this->db->from('bands'); $this->db->join('bandxuser', 'bandxuser.bandid = bands.id'); @@ -82,7 +96,7 @@ class Bands extends CI_Model { } function get_worked_bands($award = 'None') { - + $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -237,7 +251,7 @@ class Bands extends CI_Model { $clean_id = $this->security->xss_clean($id); // Delete Mode - $this->db->delete('bandxuser', array('id' => $clean_id)); + $this->db->delete('bandxuser', array('id' => $clean_id)); } function saveBand($id, $band) { @@ -287,12 +301,12 @@ class Bands extends CI_Model { $this->db->where('band', xss_clean($this->input->post('band', true))); $result = $this->db->get('bands'); - + if ($result->num_rows() == 0) { $this->db->insert('bands', $data); } - $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc) + $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc) select bands.id, " . $this->session->userdata('user_id') . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands where band ='".$data['band']."' and not exists (select 1 from bandxuser where userid = " . $this->session->userdata('user_id') . " and bandid = bands.id);"); } diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 9c17ae98..865c2142 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -1,71 +1,3 @@ -var Bands = { - b160M: { - cw: "1.825", - ssb: "1.890", - digi: "1.840", - }, - b80M: { - cw: "3.532", - ssb: "3.770", - digi: "3.573", - }, - b60M: { - cw: "5.353", - ssb: "5.450", - digi: "5.357", - }, - b40M: { - cw: "7.032", - ssb: "7.100", - digi: "7.074", - }, - b30M: { - cw: "10.110", - ssb: "10.120", - digi: "10.136", - }, - b20M: { - cw: "14.032", - ssb: "14.200", - digi: "14.074", - }, - b17M: { - cw: "18.070", - ssb: "18.120", - digi: "18.104", - }, - b15M: { - cw: "21.032", - ssb: "21.200", - digi: "21.074", - }, - b12M: { - cw: "24.895", - ssb: "24.910", - digi: "24.915", - }, - b10M: { - cw: "20.032", - ssb: "28.200", - digi: "28.074", - }, - b6M: { - cw: "50.090", - ssb: "50.350", - digi: "50.313", - }, - b2M: { - cw: "144.090", - ssb: "144.250", - digi: "144.174", - }, - b70CM: { - cw: "432.050", - ssb: "432.300", - digi: "432.065", - }, -}; - var $textarea = $("textarea"); var qsodate = ""; var qsotime = ""; From 8ab156297f5c60f33cd6f76be08138ad2ce41176 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Oct 2023 20:14:53 +0200 Subject: [PATCH 24/45] [SimpleFLE] Forgot the view --- application/views/simplefle/index.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index b38679e1..89442a83 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,5 +1,9 @@ + +
- +

-
+
session->flashdata('message')) { ?> @@ -26,13 +30,13 @@
- +
- - - + + +
@@ -177,4 +181,4 @@ - \ No newline at end of file + From 33fb946256e4d7ecfadc14132f25673e4f30d192 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 26 Oct 2023 20:46:13 +0200 Subject: [PATCH 25/45] [SimpleFLE] Saving QSO partially works --- application/views/simplefle/index.php | 2 +- assets/js/sections/simplefle.js | 54 +++++++++++++++++++++------ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 89442a83..ea714baa 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -119,7 +119,7 @@ var Bands = ;
- +
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 865c2142..c486b91d 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -478,17 +478,6 @@ $(".js-download-adif").click(function () { download(filename, adif); }); - - - - - - - - - - - function isBandModeEntered() { let isBandModeOK = true; qsoList.forEach((item) => { @@ -607,3 +596,46 @@ $(document).ready(function () { handleInput(); } }); + +$(".js-save-to-log").click(function () { + if (false === isBandModeEntered()) { + alert("Some QSO do not have band and/or mode defined!"); + + return false; + } + + var operator = $("#operator").val(); + operator = operator.toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); + ownCallsign = ownCallsign.toUpperCase(); + var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); + + var myPower = $("#my-power").val(); + var myGrid = $("#my-grid").val().toUpperCase(); + + qsoList.forEach((item) => { + var callsign = item[2]; + var rst_rcvd = item[7]; + var rst_sent = item[6]; + var start_date = (item[0].replace("-", "").replace("-", "")) + " " + (item[1].replace(":", "")); + var band = item[4]; + var mode = item[5]; + var freq_display = item[3]; + + $.ajax({ + url: base_url + 'index.php/qso/saveqso', + type: 'post', + data: { callsign: callsign, + rst_rcvd: rst_rcvd, + rst_sent: rst_sent, + start_date: start_date, + band: band, + mode: mode, + freq_display: freq_display, + }, + success: function (result) { + } + }); + }); + +}); From a3f4f1b564c89384a902d98073befd89cecfbcd9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 22:50:55 +0200 Subject: [PATCH 26/45] added several UX/UI features --- application/views/simplefle/index.php | 15 +-- assets/js/sections/simplefle.js | 182 +++++++++++++++++--------- 2 files changed, 124 insertions(+), 73 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index ea714baa..b7455026 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -73,7 +73,7 @@ var Bands = ; - +
@@ -81,13 +81,14 @@ var Bands = ; +

Enter the data

- +
@@ -130,16 +131,6 @@ var Bands = ; -
-
- Status: -
-
-
-
-

-
-
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index c486b91d..c9ec1f52 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -215,12 +215,30 @@ function handleInput() { function checkMainFieldsErrors() { if ($("#station-call").val() === '-') { - addErrorMessage("'Station Call' is not selected!"); - } + $('#warningStationCall').show(); + $('#station-call').css('border', '2px solid rgb(217, 83, 79)'); + $('#warningStationCall').text("Station Call is not selected"); + } else { + $('#station-call').css('border', ''); + $('#warningStationCall').hide(); + } if ($("#operator").val() === "") { - addErrorMessage("'Operator' field is empty!"); - } + $('#warningOperatorField').show(); + $('#operator').css('border', '2px solid rgb(217, 83, 79)'); + $('#warningOperatorField').text("'Operator' Field is empty"); + }else { + $('#operator').css('border', ''); + $('#warningOperatorField').hide(); + } + if ($("textarea").val() === "") { + $('#textarea').css('border', '2px solid rgb(217, 83, 79)'); + setTimeout(function() { + $('#textarea').css('border', ''); + }, 2000); + }else { + $('#textarea').css('border', ''); + } } $textarea.keydown(function (event) { @@ -251,27 +269,40 @@ $(".js-reload-qso").click(function () { }); $(".js-empty-qso").click(function () { - var result = confirm("Do you really want to reset everything?"); - if (result == true) { - localStorage.removeItem("tabledata"); - localStorage.removeItem("my-call"); - localStorage.removeItem("operator"); - localStorage.removeItem("my-sota-wwff"); - localStorage.removeItem("qso-area"); - localStorage.removeItem("qsodate"); - localStorage.removeItem("my-grid"); - $("#qsodate").val(""); - $("#qsoTable tbody").empty(); - $("#my-sota-wwff").val(""); - $("#station-call").val(""); - $("#operator").val(""); - $(".qso-area").val(""); - $("#my-grid").val(""); - qsoList = []; - $(".js-qso-count").html(""); - } + BootstrapDialog.confirm({ + title: "WARNING", + message: "Warning! Do you really want to reset everything?", + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: "Cancel", + btnOKLabel: "OK!", + btnOKClass: "btn-warning", + callback: function (result) { + if (result) { + clearSession(); + } + }, + }); }); +function clearSession() { + localStorage.removeItem("tabledata"); + localStorage.removeItem("my-call"); + localStorage.removeItem("operator"); + localStorage.removeItem("my-sota-wwff"); + localStorage.removeItem("qso-area"); + localStorage.removeItem("qsodate"); + localStorage.removeItem("my-grid"); + $("#qsodate").val(""); + $("#qsoTable tbody").empty(); + $("#my-sota-wwff").val(""); + // $("#station-call").val(""); Do not clear that? + // $("#operator").val(""); Do not clear that? + $(".qso-area").val(""); + $("#my-grid").val(""); + qsoList = []; + $(".js-qso-count").html(""); +} + function showErrors() { if (errors) { $(".js-status").html(errors.join("
")); @@ -598,44 +629,73 @@ $(document).ready(function () { }); $(".js-save-to-log").click(function () { - if (false === isBandModeEntered()) { - alert("Some QSO do not have band and/or mode defined!"); - - return false; - } - - var operator = $("#operator").val(); - operator = operator.toUpperCase(); - var ownCallsign = $("#station-call").val().toUpperCase(); - ownCallsign = ownCallsign.toUpperCase(); - var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); - - var myPower = $("#my-power").val(); - var myGrid = $("#my-grid").val().toUpperCase(); - - qsoList.forEach((item) => { - var callsign = item[2]; - var rst_rcvd = item[7]; - var rst_sent = item[6]; - var start_date = (item[0].replace("-", "").replace("-", "")) + " " + (item[1].replace(":", "")); - var band = item[4]; - var mode = item[5]; - var freq_display = item[3]; - - $.ajax({ - url: base_url + 'index.php/qso/saveqso', - type: 'post', - data: { callsign: callsign, - rst_rcvd: rst_rcvd, - rst_sent: rst_sent, - start_date: start_date, - band: band, - mode: mode, - freq_display: freq_display, - }, - success: function (result) { - } + if ($("textarea").val() === "") { + BootstrapDialog.alert({ + type: BootstrapDialog.TYPE_DANGER, + title: "QSO List empty!", + message: "You first have to enter some QSO!", }); - }); + } else { + handleInput(); + BootstrapDialog.confirm({ + title: "ATTENTION", + message: + "Are you sure that you want to add these QSO to the Log and clear the session?", + type: BootstrapDialog.TYPE_INFO, + btnCancelLabel: "Cancel", + btnOKLabel: "Log it!", + btnOKClass: "btn-info", + callback: function (result) { + if (result) { + if (false === isBandModeEntered()) { + alert("Some QSO do not have band and/or mode defined!"); + return false; + } + var operator = $("#operator").val(); + operator = operator.toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); + ownCallsign = ownCallsign.toUpperCase(); + var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); + + var myPower = $("#my-power").val(); + var myGrid = $("#my-grid").val().toUpperCase(); + + qsoList.forEach((item) => { + var callsign = item[2]; + var rst_rcvd = item[7]; + var rst_sent = item[6]; + var start_date = + item[0].replace("-", "").replace("-", "") + + " " + + item[1].replace(":", ""); + var band = item[4]; + var mode = item[5]; + var freq_display = item[3]; + + $.ajax({ + url: base_url + "index.php/qso/saveqso", + type: "post", + data: { + callsign: callsign, + rst_rcvd: rst_rcvd, + rst_sent: rst_sent, + start_date: start_date, + band: band, + mode: mode, + freq_display: freq_display, + }, + success: function (result) {}, + }); + }); + clearSession(); + BootstrapDialog.alert({ + title: "QSO logged", + message: + "The QSO were successfully logged in the logbook!", + }); + } + }, + }); + } }); From 9d5e0ccfe5c3cfd2005d452b2bd94046dad38e41 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 26 Oct 2023 23:01:48 +0200 Subject: [PATCH 27/45] less aggressive warning :) --- assets/js/sections/simplefle.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index c9ec1f52..de391a1a 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -630,12 +630,11 @@ $(document).ready(function () { $(".js-save-to-log").click(function () { if ($("textarea").val() === "") { - BootstrapDialog.alert({ - type: BootstrapDialog.TYPE_DANGER, - title: "QSO List empty!", - message: "You first have to enter some QSO!", - }); - } else { + $('#textarea').css('border', '2px solid rgb(217, 83, 79)'); + setTimeout(function() { + $('#textarea').css('border', ''); + }, 2000); + }else { handleInput(); BootstrapDialog.confirm({ title: "ATTENTION", From 02dd5cce31a6b727165828c9c59a2155d5231563 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 27 Oct 2023 09:04:21 +0200 Subject: [PATCH 28/45] removed empty lines --- assets/js/sections/simplefle.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index de391a1a..dfb7ba30 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -404,18 +404,6 @@ for (const [key, value] of Object.entries(Bands)) { } $(".js-band-settings").html(htmlSettings); - - - - - - - - - - - - $(".js-download-adif").click(function () { var operator = $("#operator").val(); operator = operator.toUpperCase(); From fe640da77761e7014d9e8498b0968b6ae2ca9208 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 27 Oct 2023 12:07:30 +0200 Subject: [PATCH 29/45] formatting time (not working properly) --- assets/js/sections/simplefle.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index dfb7ba30..aa720a20 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -652,14 +652,15 @@ $(".js-save-to-log").click(function () { var callsign = item[2]; var rst_rcvd = item[7]; var rst_sent = item[6]; - var start_date = - item[0].replace("-", "").replace("-", "") + - " " + - item[1].replace(":", ""); + var timeString = item[1]; // Example: "123000" + // Formatting time in "12:30:00" + var formattedTime = timeString.substring(0, 2) + ":" + timeString.substring(2, 4) + ":" + "00"; + + var start_date = item[0] + " " + formattedTime; var band = item[4]; var mode = item[5]; var freq_display = item[3]; - + $.ajax({ url: base_url + "index.php/qso/saveqso", type: "post", @@ -672,9 +673,20 @@ $(".js-save-to-log").click(function () { mode: mode, freq_display: freq_display, }, - success: function (result) {}, + success: function (debugCreateQSO) { + console.log("QSO Data:", { + callsign: callsign, + rst_rcvd: rst_rcvd, + rst_sent: rst_sent, + start_date: start_date, + band: band, + mode: mode, + freq_display: freq_display, + }); + } }); }); + clearSession(); BootstrapDialog.alert({ title: "QSO logged", From 5cb67b0ca99d82e820eead46f4e241b4bcc330f5 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:35:07 +0200 Subject: [PATCH 30/45] [SimpleFLE] Logging fix --- assets/js/sections/simplefle.js | 42 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index aa720a20..6863536b 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -655,26 +655,27 @@ $(".js-save-to-log").click(function () { var timeString = item[1]; // Example: "123000" // Formatting time in "12:30:00" var formattedTime = timeString.substring(0, 2) + ":" + timeString.substring(2, 4) + ":" + "00"; - + var start_date = item[0] + " " + formattedTime; var band = item[4]; var mode = item[5]; var freq_display = item[3]; - - $.ajax({ - url: base_url + "index.php/qso/saveqso", - type: "post", - data: { - callsign: callsign, - rst_rcvd: rst_rcvd, - rst_sent: rst_sent, - start_date: start_date, - band: band, - mode: mode, - freq_display: freq_display, - }, - success: function (debugCreateQSO) { - console.log("QSO Data:", { + + qsoList.forEach((item) => { + var callsign = item[2]; + var rst_rcvd = item[7]; + var rst_sent = item[6]; + var start_date = item[0]; + var start_time = item[1][0] +item[1][1] + ":" + item[1][2] + item[1][3]; + var band = item[4]; + var mode = item[5]; + var freq_display = item[3]; + var station_profile = $(".station_id").val(); + + $.ajax({ + url: base_url + "index.php/qso/saveqso", + type: "post", + data: { callsign: callsign, rst_rcvd: rst_rcvd, rst_sent: rst_sent, @@ -682,11 +683,14 @@ $(".js-save-to-log").click(function () { band: band, mode: mode, freq_display: freq_display, - }); - } + start_time: start_time, + station_profile: station_profile, + }, + success: function (result) {}, + }); }); }); - + clearSession(); BootstrapDialog.alert({ title: "QSO logged", From fe1817a628fabb8fd98fa42a106560f4c79904b2 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:40:34 +0200 Subject: [PATCH 31/45] Corrected qso save function --- assets/js/sections/simplefle.js | 50 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 6863536b..e34b7832 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -652,42 +652,28 @@ $(".js-save-to-log").click(function () { var callsign = item[2]; var rst_rcvd = item[7]; var rst_sent = item[6]; - var timeString = item[1]; // Example: "123000" - // Formatting time in "12:30:00" - var formattedTime = timeString.substring(0, 2) + ":" + timeString.substring(2, 4) + ":" + "00"; - - var start_date = item[0] + " " + formattedTime; + var start_date = item[0]; + var start_time = item[1][0] +item[1][1] + ":" + item[1][2] + item[1][3]; var band = item[4]; var mode = item[5]; var freq_display = item[3]; + var station_profile = $(".station_id").val(); - qsoList.forEach((item) => { - var callsign = item[2]; - var rst_rcvd = item[7]; - var rst_sent = item[6]; - var start_date = item[0]; - var start_time = item[1][0] +item[1][1] + ":" + item[1][2] + item[1][3]; - var band = item[4]; - var mode = item[5]; - var freq_display = item[3]; - var station_profile = $(".station_id").val(); - - $.ajax({ - url: base_url + "index.php/qso/saveqso", - type: "post", - data: { - callsign: callsign, - rst_rcvd: rst_rcvd, - rst_sent: rst_sent, - start_date: start_date, - band: band, - mode: mode, - freq_display: freq_display, - start_time: start_time, - station_profile: station_profile, - }, - success: function (result) {}, - }); + $.ajax({ + url: base_url + "index.php/qso/saveqso", + type: "post", + data: { + callsign: callsign, + rst_rcvd: rst_rcvd, + rst_sent: rst_sent, + start_date: start_date, + band: band, + mode: mode, + freq_display: freq_display, + start_time: start_time, + station_profile: station_profile, + }, + success: function (result) {}, }); }); From ed0b1fc730afdc576fcfc8c957ae1edc1edea1a1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 27 Oct 2023 15:57:17 +0200 Subject: [PATCH 32/45] changed bands to lowerCase to prevent search error --- assets/js/sections/simplefle.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index e34b7832..166cb80a 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -88,7 +88,7 @@ function handleInput() { item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) || item.match(/^(sat)$/) ) { - band = item.toUpperCase(); + band = item; freq = 0; } else if (item.match(/^\d+\.\d+$/)) { freq = item; @@ -316,31 +316,31 @@ $(".js-download-qso").click(function () { function getBandFromFreq(freq) { if (freq > 1.7 && freq < 2) { - return "160M"; + return "160m"; } else if (freq > 3.4 && freq < 4) { - return "80M"; + return "80m"; } else if (freq > 6.9 && freq < 7.3) { - return "40M"; + return "40m"; } else if (freq > 5 && freq < 6) { - return "60M"; + return "60m"; } else if (freq > 10 && freq < 11) { - return "30M"; + return "30m"; } else if (freq > 13 && freq < 15) { - return "20M"; + return "20m"; } else if (freq > 18 && freq < 19) { - return "17M"; + return "17m"; } else if (freq > 20 && freq < 22) { - return "15M"; + return "15m"; } else if (freq > 24 && freq < 25) { - return "12M"; + return "12m"; } else if (freq > 27 && freq < 30) { - return "10M"; + return "10m"; } else if (freq > 50 && freq < 55) { - return "6M"; + return "6m"; } else if (freq > 144 && freq < 149) { - return "2M"; + return "2m"; } else if (freq > 430 && freq < 460) { - return "70CM"; + return "70cm"; } return ""; @@ -348,7 +348,7 @@ function getBandFromFreq(freq) { function getFreqFromBand(band, mode) { const settingsMode = getSettingsMode(mode.toUpperCase()); - const id = "#" + band.toUpperCase() + settingsMode; + const id = "#" + band + settingsMode; if ($(id).length) { return $(id).val(); } From 0bcb76fdc6067a20a3e4046acc5b06ef02f440dc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 27 Oct 2023 19:32:21 +0200 Subject: [PATCH 33/45] warning if some qso have no band/mode --- assets/js/sections/simplefle.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 166cb80a..6ef3ff3a 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -622,7 +622,19 @@ $(".js-save-to-log").click(function () { setTimeout(function() { $('#textarea').css('border', ''); }, 2000); - }else { + } + if (false === isBandModeEntered()) { + BootstrapDialog.alert({ + title: "WARNING", + message: "Warning! You can't log the QSO list because some QSO do not have band and/or mode defined!?", + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: "Cancel", + btnOKLabel: "OK!", + btnOKClass: "btn-warning", + }); + return false; + } + else { handleInput(); BootstrapDialog.confirm({ title: "ATTENTION", @@ -634,11 +646,6 @@ $(".js-save-to-log").click(function () { btnOKClass: "btn-info", callback: function (result) { if (result) { - if (false === isBandModeEntered()) { - alert("Some QSO do not have band and/or mode defined!"); - - return false; - } var operator = $("#operator").val(); operator = operator.toUpperCase(); var ownCallsign = $("#station-call").val().toUpperCase(); From 2d9b8b641395f27f3f98c8f7d057da3c462170a2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 27 Oct 2023 21:45:15 +0200 Subject: [PATCH 34/45] added user_id to local storage --- application/views/simplefle/index.php | 3 +- assets/js/sections/simplefle.js | 46 +++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index b7455026..915eca8a 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,5 +1,6 @@
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 6ef3ff3a..468d8749 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -182,14 +182,14 @@ function handleInput() { $("#qsoTable > tbody:last-child").append(tableRow); - localStorage.setItem("tabledata", $("#qsoTable").html()); - localStorage.setItem("my-call", $("#station-call").val()); - localStorage.setItem("operator", $("#operator").val()); - localStorage.setItem("my-sota-wwff", $("#my-sota-wwff").val()); - localStorage.setItem("qso-area", $(".qso-area").val()); - localStorage.setItem("qsodate", $("#qsodate").val()); - localStorage.setItem("my-power", $("#my-power").val()); - localStorage.setItem("my-grid", $("#my-grid").val()); + localStorage.setItem(`user_${user_id}_tabledata`, $("#qsoTable").html()); + localStorage.setItem(`user_${user_id}_my-call`, $("#station-call").val()); + localStorage.setItem(`user_${user_id}_operator`, $("#operator").val()); + localStorage.setItem(`user_${user_id}_my-sota-wwff`, $("#my-sota-wwff").val()); + localStorage.setItem(`user_${user_id}_qso-area`, $(".qso-area").val()); + localStorage.setItem(`user_${user_id}_qsodate`, $("#qsodate").val()); + localStorage.setItem(`user_${user_id}_my-power`, $("#my-power").val()); + localStorage.setItem(`user_${user_id}_my-grid`, $("#my-grid").val()); callsign = ""; sotaWff = ""; @@ -285,13 +285,13 @@ $(".js-empty-qso").click(function () { }); function clearSession() { - localStorage.removeItem("tabledata"); - localStorage.removeItem("my-call"); - localStorage.removeItem("operator"); - localStorage.removeItem("my-sota-wwff"); - localStorage.removeItem("qso-area"); - localStorage.removeItem("qsodate"); - localStorage.removeItem("my-grid"); + localStorage.removeItem(`user_${user_id}_tabledata`); + localStorage.removeItem(`user_${user_id}_my-call`); + localStorage.removeItem(`user_${user_id}_operator`); + localStorage.removeItem(`user_${user_id}_my-sota-wwff`); + localStorage.removeItem(`user_${user_id}_qso-area`); + localStorage.removeItem(`user_${user_id}_qsodate`); + localStorage.removeItem(`user_${user_id}_my-grid`); $("#qsodate").val(""); $("#qsoTable tbody").empty(); $("#my-sota-wwff").val(""); @@ -573,14 +573,14 @@ function download(filename, text) { } $(document).ready(function () { - var tabledata = localStorage.getItem("tabledata"); - var mycall = localStorage.getItem("my-call"); - var operator = localStorage.getItem("operator"); - var mysotawwff = localStorage.getItem("my-sota-wwff"); - var qsoarea = localStorage.getItem("qso-area"); - var qsodate = localStorage.getItem("qsodate"); - var myPower = localStorage.getItem("my-power"); - var myGrid = localStorage.getItem("my-grid"); + 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`); + var mysotawwff = localStorage.getItem(`user_${user_id}_my-sota-wwff`); + var qsoarea = localStorage.getItem(`user_${user_id}_qso-area`); + var qsodate = localStorage.getItem(`user_${user_id}_qsodate`); + var myPower = localStorage.getItem(`user_${user_id}_my-power`); + var myGrid = localStorage.getItem(`user_${user_id}_my-grid`); if (mycall != null) { $("#station-call").val(mycall); From c258a86455261cb5ceb6cb1e180cab55772683f1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 28 Oct 2023 00:23:43 +0200 Subject: [PATCH 35/45] prepared tabbed area (incomplete) --- application/controllers/Simplefle.php | 1 + application/views/simplefle/index.php | 252 +++++++++++++------------- 2 files changed, 122 insertions(+), 131 deletions(-) diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index 3c77ff2f..4e2b3c81 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -15,6 +15,7 @@ class SimpleFLE extends CI_Controller { $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select $data['bands'] = $this->bands->get_all_bands(); // Fetching Bands for FLE $data['active_station_profile'] = $this->stations->find_active(); // Prepopulate active Station in Station Location Selector + $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $data['page_title'] = "Simple Fast Log Entry"; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 915eca8a..498ceb22 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -1,50 +1,68 @@
-
-
- -

- -
+
+
+ +

+ +
- session->flashdata('message')) { ?> - -
-

session->flashdata('message'); ?>

-
- + session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+
-
-
+
+
+
+ +
+ + + +
+
+
+ +
+ +
+
- -
- - - -
-
- -
-
-
-
+
+
+
@@ -52,125 +70,97 @@
-
-
- - -
-
+
- - +
- +
-
-
-

Enter the data

- +
+
+
+
+ +
-
- QSO list -
- - - - - - - - - - - - - - - - - -
DateTimeCallsignBandModeRSRROp.SOTA/WFF
+ +
+ Test Satellite
- -
-
- -
-
- -
-
- -
-
- -
-
-
+
-
-
-
- General -
-
-
-
-
-
- QSO -
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
- Bands -
-
+ + +
-
-
-
+
+

Enter the data

+
+
+ QSO list +
+ + + + + + + + + + + + + + + + + +
DateTimeCallsignBandModeRSRROp.SOTA/WFF
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
\ No newline at end of file From d86e971957d1195360b871e1e164e7db7f660a1d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 28 Oct 2023 00:29:43 +0200 Subject: [PATCH 36/45] tabbed design --- application/views/simplefle/index.php | 46 +++++++++++++++------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 498ceb22..ef601ffc 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -125,28 +125,32 @@
- QSO list -
- - - - - - - - - - - - - - - - - -
DateTimeCallsignBandModeRSRROp.SOTA/WFF
+
+ QSO list +
+
+
+ + + + + + + + + + + + + + + + + +
DateTimeCallsignBandModeRSRROp.SOTA/WFF
+
+
-
From 474e9889718051dc255bbbd882903a7e542eb8b5 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 29 Oct 2023 11:40:50 +0100 Subject: [PATCH 37/45] Commented out grid, since it breaks logging --- assets/js/sections/simplefle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 468d8749..e3a90513 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -653,7 +653,7 @@ $(".js-save-to-log").click(function () { var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); var myPower = $("#my-power").val(); - var myGrid = $("#my-grid").val().toUpperCase(); + //var myGrid = $("#my-grid").val().toUpperCase(); qsoList.forEach((item) => { var callsign = item[2]; From b18c1a6750f362f72a7d012e896f5b9611ffb896 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 29 Oct 2023 23:25:47 +0100 Subject: [PATCH 38/45] removed tabbed design --- application/views/simplefle/index.php | 91 +++++++++------------------ 1 file changed, 31 insertions(+), 60 deletions(-) diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index ef601ffc..1070f554 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -44,73 +44,44 @@
- + QSO Data
-
-
-
-
-
- - -
-
- -
-
-
-
- - - -
-
-
-
- - - -
-
+
+
+
+ +
-
-
-
- - -
+
+
+ + +
- -
- Test Satellite +
+
+
+
+ + + + If you did operate from a new location, first create a new '>Station Location
- +
From 41f02d5db99e10e91b329d5c3d54afb2c2cff2ae Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 30 Oct 2023 08:53:06 +0100 Subject: [PATCH 39/45] fixed logging issue --- assets/js/sections/simplefle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index e3a90513..256a2d41 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -650,10 +650,10 @@ $(".js-save-to-log").click(function () { operator = operator.toUpperCase(); var ownCallsign = $("#station-call").val().toUpperCase(); ownCallsign = ownCallsign.toUpperCase(); - var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); + // var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); - var myPower = $("#my-power").val(); - //var myGrid = $("#my-grid").val().toUpperCase(); + // var myPower = $("#my-power").val(); + // var myGrid = $("#my-grid").val().toUpperCase(); qsoList.forEach((item) => { var callsign = item[2]; From 1023baea95638b2669683ab73bd67b6d250f2478 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 30 Oct 2023 23:50:56 +0100 Subject: [PATCH 40/45] added general language --- application/language/bulgarian/general_words_lang.php | 3 +++ .../language/chinese_simplified/general_words_lang.php | 3 +++ application/language/czech/general_words_lang.php | 3 +++ application/language/dutch/general_words_lang.php | 3 +++ application/language/english/general_words_lang.php | 3 +++ application/language/finnish/general_words_lang.php | 3 +++ application/language/french/general_words_lang.php | 3 +++ application/language/german/general_words_lang.php | 3 +++ application/language/greek/general_words_lang.php | 3 +++ application/language/italian/general_words_lang.php | 3 +++ application/language/polish/general_words_lang.php | 3 +++ application/language/russian/general_words_lang.php | 3 +++ application/language/spanish/general_words_lang.php | 3 +++ application/language/swedish/general_words_lang.php | 3 +++ application/language/turkish/general_words_lang.php | 3 +++ application/views/interface_assets/footer.php | 4 ++++ 16 files changed, 49 insertions(+) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 97987ff3..b51f9d36 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Инфо'; $lang['general_word_choose_file'] = 'Изберете файл'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 4c9123f7..a401527f 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = '消息'; $lang['general_word_choose_file'] = '选择文件'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 12740f7b..5ce4cfe5 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Vybrat soubor'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 0b52154e..8a8204e1 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 19f6155d..47c93b5a 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 1430d65c..ef048456 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Valitse tiedosto'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index cefcb7aa..051aca31 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Information'; $lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index a1baa9f7..9e31a4d4 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Datei wählen'; $lang['general_word_next'] = 'Weiter'; $lang['general_word_previous'] = 'Zurück'; +$lang['general_word_cancel'] = "Abbrechen"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Achtung"; $lang['general_word_enabled'] = "Eingeschaltet"; $lang['general_word_disabled'] = "Ausgeschaltet"; $lang['general_word_export'] = "Exportieren"; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index a0f6f036..60d21812 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Πληροφορίες'; $lang['general_word_choose_file'] = 'Επιλογή αρχείου'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index e6df26f7..23c964ff 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Scegli file'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index fa5eb248..94501783 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Informacja'; $lang['general_word_choose_file'] = 'Wybież plik'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 65c2bd70..ee278586 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Информация'; $lang['general_word_choose_file'] = 'Выберите файл'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 169f4734..7b4df18f 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Información'; $lang['general_word_choose_file'] = 'Elegir archivo'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 5efc7004..1bf266d9 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Info'; $lang['general_word_choose_file'] = 'Välj fil'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index d23b6749..056ed8ed 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -14,6 +14,9 @@ $lang['general_word_info'] = 'Bilgiler'; $lang['general_word_choose_file'] = 'Dosya seç'; $lang['general_word_next'] = 'Next'; $lang['general_word_previous'] = 'Previous'; +$lang['general_word_cancel'] = "Cancel"; +$lang['general_word_ok'] = "OK"; +$lang['general_word_attention'] = "Attention"; $lang['general_word_enabled'] = "Enabled"; $lang['general_word_disabled'] = "Disabled"; $lang['general_word_export'] = "Export"; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 51aff59d..2a42f97d 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -17,6 +17,10 @@ */ var lang_general_word_qso_data = ""; var lang_general_word_danger = ""; + var lang_general_word_attention = ""; + var lang_general_word_warning = ""; + var lang_general_word_cancel = ""; + var lang_general_word_ok = ""; var lang_qso_delete_warning = ""; var lang_general_word_colors = ""; var lang_general_word_confirmed = ""; From f28d0cd23c1deb77d286c6df13c6b5d3a5ee7b7d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 30 Oct 2023 23:52:20 +0100 Subject: [PATCH 41/45] SimpleFLE Multilanguage Support --- application/language/bulgarian/qso_lang.php | 45 ++++++++++++ .../language/chinese_simplified/qso_lang.php | 45 ++++++++++++ application/language/czech/qso_lang.php | 45 ++++++++++++ application/language/dutch/qso_lang.php | 45 ++++++++++++ application/language/english/qso_lang.php | 47 +++++++++++-- application/language/finnish/qso_lang.php | 45 ++++++++++++ application/language/french/qso_lang.php | 45 ++++++++++++ application/language/german/qso_lang.php | 45 ++++++++++++ application/language/greek/qso_lang.php | 45 ++++++++++++ application/language/italian/qso_lang.php | 45 ++++++++++++ application/language/polish/qso_lang.php | 45 ++++++++++++ application/language/russian/qso_lang.php | 45 ++++++++++++ application/language/spanish/qso_lang.php | 45 ++++++++++++ application/language/swedish/qso_lang.php | 47 ++++++++++++- application/language/turkish/qso_lang.php | 45 ++++++++++++ application/views/simplefle/index.php | 69 +++++++++++-------- application/views/simplefle/syntax_help.php | 19 ++--- assets/js/sections/simplefle.js | 52 +++++++------- 18 files changed, 748 insertions(+), 71 deletions(-) diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 0fdcbf2f..f7acf26d 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Подробности за QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 338f6c79..1f6af442 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO 详情'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index b276233c..b0b1a64e 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Detail spojení'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index cbaab061..1ef1f502 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 87482b26..d800cfe1 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -39,12 +39,45 @@ $lang['qso_operator_callsign'] = 'Operator Callsign'; // Simple FLE (FastLogEntry) -$lang['simplefle_info'] = "What is that?"; -$lang['simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; -$lang['simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; -$lang['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['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_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_reload'] = "Reload QSO List"; +$lang['qso_simplefle_save'] = "Save in Cloudlog"; +$lang['qso_simplefle_clear'] = "Clear Logging Session"; -$lang['simplefle_syntax_help_button'] = "Syntax Help"; -$lang['simplefle_syntax_help_title'] = "Syntax for FLE"; +$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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 573d2626..1ef7188a 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO:n tiedot'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 6601bbdc..822ef5ef 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index bdc29eda..cc553da9 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Band/Mode zu Favoriten hinzufügen'; $lang['qso_operator_callsign']='Operator Rufzeichen'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "Was ist das?"; +$lang['qso_simplefle_info_ln1'] = "Einfaches Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry' oder einfach 'FLE' ist ein System um QSO sehr schnell und effizient zu loggen. Aufgrund seiner Syntax sind nur minimale Eingaben erforderlich, um mit möglichst geringem Aufwand viele QSOs zu erfassen."; +$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_list'] = "QSO Liste"; +$lang['qso_simplefle_qso_list_total'] = "Total"; +$lang['qso_simplefle_qso_date'] = "QSO Datum"; +$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_enter_the_data'] = "Gibt hier die Daten ein"; +$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_error_band'] = "Band fehlt!"; +$lang['qso_simplefle_error_mode'] = "Mode fehlt!"; +$lang['qso_simplefle_error_time'] = "Zeit nicht gesetzt!"; +$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_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!"; +$lang['qso_simplefle_error_date'] = "Ungültiges Datum"; + +$lang['qso_simplefle_syntax_help_button'] = "Syntax Hilfe"; +$lang['qso_simplefle_syntax_help_title'] = "Syntax für FLE"; +$lang['qso_simplefle_syntax_help_ln1'] = "Bevor du ein QSO loggst, beachte bitte die grundlegenden Regeln."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Jedes neue QSO sollte in einer neuen Zeile stehen."; +$lang['qso_simplefle_syntax_help_ln3'] = "- In jeder neuen Zeile schreibst du nur Daten, die sich vom vorherigen QSO geändert haben."; +$lang['qso_simplefle_syntax_help_ln4'] = "Um zu beginnen, stelle sicher, dass du die Felder auf der linken Seite bereits mit Datum, Stationsrufzeichen/-standort und Rufzeichen des Operators ausgefüllt hast. Die wichtigsten Daten umfassen das Band (oder QRG in MHz, z.B. '7.145'), Mode und Zeit. Nach der Zeit gibst du das erste QSO an, was im wesentlichen das Rufzeichen ist."; +$lang['qso_simplefle_syntax_help_ln5'] = "Zum Beispiel ein QSO um 21:34 Uhr (UTC) mit 2M0SQL auf 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "Wenn du keine RST-Informationen angibst, verwendet die Syntax 59 (599 für Daten). Unser nächstes QSO war nicht auf beiden Seiten 59, also geben wir die Informationen zuerst mit gesendeter RST an. Es war 2 Minuten später als das erste QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "Das erste QSO war um 21:34 Uhr, und das zweite 2 Minuten später um 21:36 Uhr. Wir schreiben '6' für die geänderte Minute, da dies die einzige geänderte Information ist. Die Eingaben zum Band und Mode haben sich nicht geändert, daher entfallen diese Daten hier."; +$lang['qso_simplefle_syntax_help_ln8'] = "Für unser nächstes QSO um 21:40 Uhr haben wir das Band auf 40m geändert, sind aber immer noch auf SSB. Wenn keine RST-Informationen angegeben sind, verwendet die Syntax bei jedem neuen QSO 59. Daher können wir um 21:42 Uhr ein weiteres QSO hinzufügen."; +$lang['qso_simplefle_syntax_help_ln9'] = "Für weitere Informationen zur Syntax siehe die Website von DF3CB hier."; + diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 148e6c5e..4bce9503 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Στοιχεία QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 8b80a585..cda18464 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Dettagli QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index cc751b39..296a8810 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Szczegóły QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index deaa19ad..98efa973 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Детали QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index cfa35165..336acbb5 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'Detalles de QSO'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 06c200cf..36bed414 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -28,7 +28,7 @@ $lang['qsl_notes_helptext'] = 'Detta innehåll exporteras till QSL-services som $lang['qso_btn_reset_qso'] = 'Reset'; $lang['qso_btn_save_qso'] = 'Spara QSO'; $lang['qso_btn_edit_qso'] = 'Redigera QSO'; -$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; +$lang['qso_delete_warning'] = "Warning! Are you sure you want delete QSO with "; // QSO Details @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO-detaljer'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 797ccdac..118f7239 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -36,3 +36,48 @@ $lang['qso_details'] = 'QSO detayları'; $lang['fav_add'] = 'Add Band/Mode to Favs'; $lang['qso_operator_callsign'] = 'Operator Callsign'; + +// Simple FLE (FastLogEntry) + +$lang['qso_simplefle_info'] = "What is that?"; +$lang['qso_simplefle_info_ln1'] = "Simple Fast Log Entry (FLE)"; +$lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system to log QSOs very quickly and efficiently. Due to its syntax, only a minimum of input is required to log many QSOs with as little effort as possible."; +$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_list'] = "QSO List"; +$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_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_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"; +$lang['qso_simplefle_syntax_help_ln1'] = "Before starting to log a QSO, please note the basic rules."; +$lang['qso_simplefle_syntax_help_ln2'] = "- Each new QSO should be on a new line."; +$lang['qso_simplefle_syntax_help_ln3'] = "- On each new line, only write data that has changed from the previous QSO."; +$lang['qso_simplefle_syntax_help_ln4'] = "To begin, ensure you have already filled in the form on the left with the date, station call, and operator's call. The main data includes the band (or QRG in MHz, e.g., '7.145'), mode, and time. After the time, you provide the first QSO, which is essentially the callsign."; +$lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21:34 (UTC) with 2M0SQL on 20m SSB."; +$lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; +$lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; +$lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. So, we can add another one at 21:42."; +$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; + diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 1070f554..dfe091d7 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -8,16 +8,29 @@

- +
session->flashdata('message')) { ?> @@ -44,19 +57,19 @@
- QSO Data +
- +
- +
@@ -66,7 +79,7 @@
- If you did operate from a new location, first create a new '>Station Location +
@@ -89,7 +102,7 @@
-

Enter the data

+

@@ -97,22 +110,22 @@
- QSO list +
- - - - - - - - - + + + + + + + + + @@ -124,16 +137,16 @@
- +
- +
- +
- +
diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php index fa956e6e..e1fdcbbd 100644 --- a/application/views/simplefle/syntax_help.php +++ b/application/views/simplefle/syntax_help.php @@ -1,26 +1,27 @@ -

Before start logging a qso to notice to basic rules:

-

- Every new QSO get its own new line

-

- At every new line only write data, which changed to the last qso

-

We start with the first data, you already filled the form on the left with the date, wwff/sota info, stationcall and operator call. The main data contains the band, mode and time. After time you provide the first qso (basically the callsign)

+

:

+

+

+

     20m ssb
     2134 2m0sql
 
-

So this QSO started at 21:34 (UTC!) with 2M0SQL on 20m SSB.

-

If you do not provide any RST Information the Syntax will use 59 (599 for data). Out next QSO wasn't 59 on both sides so we provide the information with the sent RST first. And it was 2 Minutes later then the first QSO.

+

+

     20m ssb
     2134 2m0sql
     6 la8aja 47 46
 
-

The first QSO was at 21:34, the second one 2 Minutes later at 21:36 so we write down 6 because this is the only data which changed here. The information about band and mode didn't change. So this data is omitted.

-

For our next QSO at 21:40 we changed band to 40m, but still on SSB. If now RST information is given the syntax will use 59 for every new QSO.

+

+

     20m ssb
     2134 2m0sql
     6 la8aja 47 46
     40m 
     40 dj7nt
+    2 df3et
 
-

For further information about the syntax please check the Website of DF3CB here.

+

diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 256a2d41..c34d8515 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -10,16 +10,16 @@ var qsoList = []; $('#simpleFleInfoButton').click(function (event) { var awardInfoLines = [ - lang_simplefle_info_ln2, - lang_simplefle_info_ln3, - lang_simplefle_info_ln4 + lang_qso_simplefle_info_ln2, + lang_qso_simplefle_info_ln3, + lang_qso_simplefle_info_ln4 ]; var simpleFleInfo = ""; awardInfoLines.forEach(function (line) { simpleFleInfo += line + "

"; }); BootstrapDialog.alert({ - title: "

"+lang_simplefle_info_ln1+"

", + title: "

"+lang_qso_simplefle_info_ln1+"

", message: simpleFleInfo, }); }); @@ -31,7 +31,7 @@ $('#js-syntax').click(function (event) { type: 'post', success: function (html) { BootstrapDialog.alert({ - title: "

"+lang_simplefle_syntax_help_title+"

", + title: "

"+lang_qso_simplefle_syntax_help_title+"

", size: BootstrapDialog.SIZE_WIDE, nl2br: false, message: html, @@ -139,17 +139,17 @@ function handleInput() { } if (band === "") { - addErrorMessage("Band is missing!"); + addErrorMessage(lang_qso_simplefle_error_band); } if (mode === "") { - addErrorMessage("Mode is missing"); + addErrorMessage(lang_qso_simplefle_error_mode); } if (qsotime === "") { - addErrorMessage("Time is not set!"); + addErrorMessage(lang_qso_simplefle_error_time); } if (isValidDate(extraQsoDate) === false) { - addErrorMessage("Invalid date " + extraQsoDate); + addErrorMessage(lang_qso_simplefle_error_date + " " + extraQsoDate); extraQsoDate = qsodate; } @@ -203,7 +203,7 @@ function handleInput() { var qsoCount = qsoList.length; if (qsoCount) { - $(".js-qso-count").html("Total: " + qsoCount + " QSO"); + $(".js-qso-count").html("" + lang_qso_simplefle_qso_list_total + ": " + qsoCount + " " + lang_gen_hamradio_qso); } else { $(".js-qso-count").html(""); } @@ -217,7 +217,7 @@ function checkMainFieldsErrors() { if ($("#station-call").val() === '-') { $('#warningStationCall').show(); $('#station-call').css('border', '2px solid rgb(217, 83, 79)'); - $('#warningStationCall').text("Station Call is not selected"); + $('#warningStationCall').text(lang_qso_simplefle_error_stationcall); } else { $('#station-call').css('border', ''); $('#warningStationCall').hide(); @@ -226,7 +226,7 @@ function checkMainFieldsErrors() { if ($("#operator").val() === "") { $('#warningOperatorField').show(); $('#operator').css('border', '2px solid rgb(217, 83, 79)'); - $('#warningOperatorField').text("'Operator' Field is empty"); + $('#warningOperatorField').text(lang_qso_simplefle_error_operator); }else { $('#operator').css('border', ''); $('#warningOperatorField').hide(); @@ -270,11 +270,11 @@ $(".js-reload-qso").click(function () { $(".js-empty-qso").click(function () { BootstrapDialog.confirm({ - title: "WARNING", - message: "Warning! Do you really want to reset everything?", + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_reset, type: BootstrapDialog.TYPE_DANGER, - btnCancelLabel: "Cancel", - btnOKLabel: "OK!", + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, btnOKClass: "btn-warning", callback: function (result) { if (result) { @@ -625,11 +625,11 @@ $(".js-save-to-log").click(function () { } if (false === isBandModeEntered()) { BootstrapDialog.alert({ - title: "WARNING", - message: "Warning! You can't log the QSO list because some QSO do not have band and/or mode defined!?", + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_missing_band_mode, type: BootstrapDialog.TYPE_DANGER, - btnCancelLabel: "Cancel", - btnOKLabel: "OK!", + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, btnOKClass: "btn-warning", }); return false; @@ -637,12 +637,12 @@ $(".js-save-to-log").click(function () { else { handleInput(); BootstrapDialog.confirm({ - title: "ATTENTION", + title: lang_general_word_attention, message: - "Are you sure that you want to add these QSO to the Log and clear the session?", + lang_qso_simplefle_confirm_save_to_log, type: BootstrapDialog.TYPE_INFO, - btnCancelLabel: "Cancel", - btnOKLabel: "Log it!", + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, btnOKClass: "btn-info", callback: function (result) { if (result) { @@ -686,9 +686,9 @@ $(".js-save-to-log").click(function () { clearSession(); BootstrapDialog.alert({ - title: "QSO logged", + title: lang_qso_simplefle_success_save_to_log_header, message: - "The QSO were successfully logged in the logbook!", + lang_qso_simplefle_success_save_to_log, }); } }, From 4c9241e4c859051107ff8e258481fc96cbdbd780 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 31 Oct 2023 10:26:15 +0100 Subject: [PATCH 42/45] fixed detection of cw rst if 3 digits are given --- assets/js/sections/simplefle.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index c34d8515..1a52f8b1 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -117,7 +117,7 @@ function handleInput() { ) ) { callsign = item.toUpperCase(); - } else if (itemNumber > 0 && item.match(/^\d{1,2}$/)) { + } else if (itemNumber > 0 && item.match(/^\d{1,3}$/)) { if (rst_s === null) { rst_s = item; } else { @@ -527,6 +527,9 @@ function getReportByMode(rst, mode) { if (rst.length === 1) { return "5" + rst; } + if (rst.length === 3) { + return rst.slice(0, 2); + } return rst; } From e1349059e6d4882ab4293897b350bc7ecbb8f25d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 31 Oct 2023 15:21:11 +0100 Subject: [PATCH 43/45] band, mode, time and call can now in one line --- assets/js/sections/simplefle.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 1a52f8b1..12a1c6ff 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -78,8 +78,7 @@ function handleInput() { ) { extraQsoDate = item; } else if ( - item.match(/^[0-2][0-9][0-5][0-9]$/) && - itemNumber === 0 + item.match(/^[0-2][0-9][0-5][0-9]$/) ) { qsotime = item; } else if (item.match(/^CW$|^SSB$|^FM$|^AM$|^PSK$|^FT8$/i)) { From 16f3103add130a9e672525cdabbd9ed1219ee0e5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 31 Oct 2023 17:05:53 +0100 Subject: [PATCH 44/45] added the "day +" command --- assets/js/sections/simplefle.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 12a1c6ff..1e245b7f 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -67,15 +67,19 @@ function handleInput() { lines.forEach((row) => { var rst_s = null; var rst_r = null; - items = row.split(" "); + items = row.startsWith("day ") ? [row] : row.split(" "); var itemNumber = 0; items.forEach((item) => { if (item === "") { return; } - if ( - item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/) - ) { + if (item.trim().match(/^day (\+)+$/)) { + var plusCount = item.match(/\+/g).length; + var originalDate = new Date(extraQsoDate);; + console.log(plusCount) + originalDate.setDate(originalDate.getDate() + plusCount); + extraQsoDate = originalDate.toISOString().split("T")[0]; + } else if (item.match(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/)) { extraQsoDate = item; } else if ( item.match(/^[0-2][0-9][0-5][0-9]$/) From 9e775dd35b3ee748d7706d12dee27eb448007026 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:50:05 +0100 Subject: [PATCH 45/45] Added support for logging WWFF and SOTA to db --- assets/js/sections/simplefle.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 1e245b7f..c2bd286c 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -671,6 +671,15 @@ $(".js-save-to-log").click(function () { var mode = item[5]; var freq_display = item[3]; var station_profile = $(".station_id").val(); + var sota_ref = ''; + var sig = ''; + var sig_info = ''; + if (isSOTA(item[8])) { + sota_ref = item[8]; + } else if (isWWFF(item[8])) { + sig = "WWFF"; + sig_info = item[8]; + } $.ajax({ url: base_url + "index.php/qso/saveqso", @@ -685,6 +694,9 @@ $(".js-save-to-log").click(function () { freq_display: freq_display, start_time: start_time, station_profile: station_profile, + sota_ref: sota_ref, + sig: sig, + sig_info: sig_info }, success: function (result) {}, });
DateTimeCallsignBandModeRSRROp.SOTA/WFFSOTA/WWFF