From 4139b3cb4ccbf05b8cb9a524f8b0c14338dd3b9d Mon Sep 17 00:00:00 2001 From: abarrau Date: Mon, 4 Dec 2023 21:06:00 +0100 Subject: [PATCH] qso time off tested befor submit --- application/views/qso/index.php | 2 ++ assets/css/general.css | 10 ++++++++++ assets/js/sections/qso.js | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index b6cbed4b..5f9c367e 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -1,4 +1,5 @@
+
@@ -547,6 +548,7 @@ +
diff --git a/assets/css/general.css b/assets/css/general.css index 317418d3..18411b4d 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -651,4 +651,14 @@ table.dataTable tfoot td { } .icon_selectBox_data label:hover { background-color:var(--bs-primary); +} + +.inputError { + border: 1px var(--bs-danger) solid; +} +.warningOnSubmit { + margin-top:15px; +} +.warningOnSubmit_txt { + margin-left:10px; } \ No newline at end of file diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 58f0a962..fefe5484 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -345,6 +345,14 @@ var favs={}; $('.satellite_names_list').append(items.join( "" )); }); + // Test Consistency value on submit form // + $("#qso_input").off('submit').on('submit', function(){ + var _submit = true; + if ((typeof qso_manual !== "undefined")&&(qso_manual == "1")) { + if ($('#qso_input input[name="end_time"]').length == 1) { _submit = testTimeOffConsistency(); } + } + return _submit; + }) }); var selected_sat; @@ -1053,3 +1061,19 @@ function closeModal() { container.removeChild(modal) }, 200) } + +// [TimeOff] test Consistency timeOff value // +function testTimeOffConsistency() { + var _start_time = $('#qso_input input[name="start_time"]').val(); + var _end_time = $('#qso_input input[name="end_time"]').val(); + $('#qso_input input[name="end_time"]').removeClass('inputError'); + $('#qso_input .warningOnSubmit').hide(); + if ( !( (parseInt(_start_time.replaceAll(':','')) <= parseInt(_end_time.replaceAll(':',''))) + || ((_start_time.substring(0,2)=="23")&&(_end_time.substring(0,2)=="00")) ) ) { + $('#qso_input input[name="end_time"]').addClass('inputError'); + $('#qso_input .warningOnSubmit').show(); + $('#qso_input input[name="end_time"]').off('change').on('change',function(){ testTimeOffConsistency(); }); + return false; + } + return true; +}