Merge branch 'simplefle_improvements_v2' of https://github.com/hb9hil/cloudlog into pr/HB9HIL/2645-1

application/language/bulgarian/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/chinese_simplified/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/czech/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/dutch/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/english/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/finnish/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/french/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/german/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Stationsstandort nicht ausgewählt";
 $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer";
 $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!";
+$lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!";
 $lang['qso_simplefle_success_save_to_log'] = "Die QSO wurden erfolgreich im Logbuch gespeichert!";

application/language/greek/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/italian/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/polish/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/russian/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/spanish/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/swedish/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/language/turkish/qso_lang.php

@@ -65,6 +65,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected";
 $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty";
 $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?";
 $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!";
+$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!";
 $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?";
 $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!";
 $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!";

application/views/simplefle/index.php

@@ -26,6 +26,7 @@
 			var lang_qso_simplefle_error_operator = "<?php echo lang('qso_simplefle_error_operator'); ?>";
 			var lang_qso_simplefle_warning_reset = "<?php echo lang('qso_simplefle_warning_reset'); ?>";
 			var lang_qso_simplefle_warning_missing_band_mode = "<?php echo lang('qso_simplefle_warning_missing_band_mode'); ?>";
+			var lang_qso_simplefle_warning_example_data = "<?php echo lang('qso_simplefle_warning_example_data'); ?>";
 			var lang_qso_simplefle_confirm_save_to_log = "<?php echo lang('qso_simplefle_confirm_save_to_log'); ?>";
 			var lang_qso_simplefle_success_save_to_log_header = "<?php echo lang('qso_simplefle_success_save_to_log_header'); ?>";
 			var lang_qso_simplefle_success_save_to_log = "<?php echo lang('qso_simplefle_success_save_to_log'); ?>";

assets/js/sections/simplefle.js

@@ -52,6 +52,7 @@ $('#js-syntax').click(function (event) {
 										clearSession();
 
 										const logData = `
+*example-data*
 80m cw
 1212 m0abc okff-1234
 3 hb9hil
@@ -65,6 +66,7 @@ ssb
 
 										$textarea.val(logData.trim());
 										handleInput();
+										BootstrapDialog.closeAll();
 									}
 								},
 							});
@@ -461,6 +463,16 @@ function isBandModeEntered() {
 	return isBandModeOK;
 }
 
+function isExampleDataEntered() {
+	let isExampleData = false;
+	if (textarea.value.startsWith("*example-data*")) {
+		isExampleData = true;
+		
+	};
+	return isExampleData;
+
+}
+
 function getAdifTag(tagName, value) {
 	return "<" + tagName + ":" + value.length + ">" + value + " ";
 }
@@ -575,6 +587,7 @@ $(".js-save-to-log").click(function () {
 		setTimeout(function() {
 			$('#textarea').css('border', '');
 		  }, 2000);
+		return false;
 	}
 	if (false === isBandModeEntered()) {
 		BootstrapDialog.alert({
@@ -587,6 +600,17 @@ $(".js-save-to-log").click(function () {
 		});
 		return false;
 	}
+	if (true === isExampleDataEntered()) {
+		BootstrapDialog.alert({
+			title: lang_general_word_warning,
+			message: lang_qso_simplefle_warning_example_data,
+			type: BootstrapDialog.TYPE_DANGER,
+			btnCancelLabel: lang_general_word_cancel,
+			btnOKLabel: lang_general_word_ok,
+			btnOKClass: "btn-warning",
+		});
+		return false;
+	}
 	else {
 		handleInput();
 		BootstrapDialog.confirm({