From 6ab636ae3b95762345a9859b15ee5d7cd7a40731 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 Nov 2023 13:57:59 +0000 Subject: [PATCH 1/3] Tag 2.5.1 --- application/config/migration.php | 2 +- application/migrations/152_tag_2_5_1.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 application/migrations/152_tag_2_5_1.php diff --git a/application/config/migration.php b/application/config/migration.php index f855e92f..a84fafcf 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 151; +$config['migration_version'] = 152; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/152_tag_2_5_1.php b/application/migrations/152_tag_2_5_1.php new file mode 100644 index 00000000..ad90a8b0 --- /dev/null +++ b/application/migrations/152_tag_2_5_1.php @@ -0,0 +1,24 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.5.1')); + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.5.0')); + } +} \ No newline at end of file From 028644a837d8ec41c23fb69d06ba72c62bd42744 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 14 Nov 2023 20:29:58 +0100 Subject: [PATCH 2/3] changed if callsignValue --- assets/js/sections/qso.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index a1146772..f454e03c 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1,7 +1,7 @@ $( document ).ready(function() { setTimeout(function() { var callsignValue = localStorage.getItem("quicklogCallsign"); - if (callsignValue !== "") { + if (callsignValue !== null && callsignValue !== undefined) { $("#callsign").val(callsignValue); $("#mode").focus(); localStorage.removeItem("quicklogCallsign"); From 0e68b0641ddde9f7b999d2d5fd68f0dafacde452 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 14 Nov 2023 23:25:06 +0100 Subject: [PATCH 3/3] fix_reset_time --- application/views/interface_assets/footer.php | 31 ----------------- assets/js/sections/qso.js | 33 ++++++++++++++++++- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 18970412..40597e06 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1000,37 +1000,6 @@ $(document).on('keypress',function(e) { } ); }); - $('#reset_time').click(function() { - var now = new Date(); - var localTime = now.getTime(); - var utc = localTime + (now.getTimezoneOffset() * 60000); - $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); - $("[id='start_time']").each(function() { - $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); - }); - }); - $('#reset_start_time').click(function() { - var now = new Date(); - var localTime = now.getTime(); - var utc = localTime + (now.getTimezoneOffset() * 60000); - $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); - $("[id='start_time']").each(function() { - $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); - }); - $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); - $("[id='end_time']").each(function() { - $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); - }); - }); - $('#reset_end_time').click(function() { - var now = new Date(); - var localTime = now.getTime(); - var utc = localTime + (now.getTimezoneOffset() * 60000); - $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); - $("[id='end_time']").each(function() { - $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); - }); - }); }); diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index f454e03c..b3090454 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -6,7 +6,38 @@ $( document ).ready(function() { $("#mode").focus(); localStorage.removeItem("quicklogCallsign"); } - }, 100); + }, 100); + $('#reset_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); + $("[id='start_time']").each(function() { + $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); + }); + }); + $('#reset_start_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $("[id='start_time']").each(function() { + $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); + }); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $("[id='end_time']").each(function() { + $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); + }); + }); + $('#reset_end_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $("[id='end_time']").each(function() { + $(this).attr("value", ("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); + }); + }); var favs={}; get_fav();