diff --git a/application/config/migration.php b/application/config/migration.php index 70bc112e..51eebc64 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 137; +$config['migration_version'] = 138; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index 864bc090..77fc477c 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -15,7 +15,7 @@ class User_Options extends CI_Controller { $obj[$option_key]=$this->security->xss_clean($option_value); } if ($obj['sat_name'] ?? '' != '') { - $option_name=$obj['sat_name']; + $option_name=$obj['sat_name'].'/'.$obj['mode']; } else { $option_name=$obj['band'].'/'.$obj['mode']; } diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 3b27929f..c8acea22 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -32,3 +32,4 @@ $lang['qso_btn_edit_qso'] = 'Edit QSO'; // QSO Details $lang['qso_details'] = 'QSO Details'; +$lang['fav_add'] = 'Add Band/Mode to Favs'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 0f1b0949..d7dfd357 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -32,3 +32,5 @@ $lang['qso_btn_edit_qso'] = 'Editiere QSO'; // QSO Details $lang['qso_details'] = 'QSO Details'; + +$lang['fav_add'] = 'Band/Mode zu Favoriten hinzufügen'; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 4a8ac031..3b5ae78c 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -34,7 +34,17 @@ - + + + +
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 067d72a1..b914ee9a 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1,13 +1,25 @@ $( document ).ready(function() { - $('#start_time').click(function (event) { +var favs={}; + get_fav(); + + $('#fav_add').click(function (event) { save_fav(); }); - $('#start_date').click(function (event) { - get_fav(); + $(document).on("click", "#fav_recall", function (event) { + console.log(favs[this.innerText]); + $('#sat_name').val(favs[this.innerText].sat_name); + $('#sat_mode').val(favs[this.innerText].sat_mode); + $('#band_rx').val(favs[this.innerText].band_rx); + $('#band').val(favs[this.innerText].band); + $('#frequency_rx').val(favs[this.innerText].frequency_rx); + $('#frequency').val(favs[this.innerText].frequency); + $('#selectPropagation').val(favs[this.innerText].prop_mode); + $('#mode').val(favs[this.innerText].mode); }); + function del_fav(name) { $.ajax({ url: base_url+'index.php/user_options/del_fav', @@ -27,7 +39,11 @@ $( document ).ready(function() { dataType: 'json', contentType: "application/json; charset=utf-8", success: function(result) { - console.log(result); + $("#fav_menu").empty(); + for (const key in result) { + $("#fav_menu").append(''+key+''); + } + favs=result; } }); } @@ -35,12 +51,12 @@ $( document ).ready(function() { function save_fav() { var payload={}; payload.sat_name=$('#sat_name').val(); - payload.sat_mode=$('#sat_name').val(); + payload.sat_mode=$('#sat_mode').val(); payload.band_rx=$('#band_rx').val(); payload.band=$('#band').val(); - payload.frequency_tx=$('#frequency_rx').val(); + payload.frequency_rx=$('#frequency_rx').val(); payload.frequency=$('#frequency').val(); - payload.prop_mode=$('#prop_mode').val(); + payload.prop_mode=$('#selectPropagation').val(); payload.mode=$('#mode').val(); $.ajax({ url: base_url+'index.php/user_options/add_edit_fav', @@ -49,6 +65,7 @@ $( document ).ready(function() { contentType: "application/json; charset=utf-8", data: JSON.stringify(payload), success: function(result) { + get_fav(); } }); }