From 22705228f2f7fa8cacf5af3df1cee0b237303e22 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 18 Aug 2023 00:53:41 +0200 Subject: [PATCH 01/60] Fix lookup of LoTW data (LoTW hints were empty in advanced logbook) --- src/QSLManager/QSO.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 97c98d26..f488fdc2 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -202,8 +202,8 @@ class QSO } else { $this->end = null; } - $this->callsign = ($data['callsign'] ?? null === null) ? '' :$data['callsign']; - $this->lastupload = ($data['lastupload'] ?? null === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload'] ?? null)); + $this->callsign = (($data['callsign'] ?? null) === null) ? '' : $data['callsign']; + $this->lastupload = (($data['lastupload'] ?? null) === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload'] ?? null)); $this->lotw_hint = $this->getLotwHint($data['lastupload'] ?? null); } From 0320acbefdb42c3ea605211b32dec27f73bf1a14 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 18 Aug 2023 01:00:39 +0200 Subject: [PATCH 02/60] Make LoTW hint clickable and show last upload from LoTW page --- application/views/qso/index.php | 2 +- application/views/view_log/partial/log_ajax.php | 2 +- assets/js/sections/logbookadvanced.js | 4 ++-- assets/js/sections/qso.js | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 39dfc123..e4185389 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -65,7 +65,7 @@
optionslib->get_option('dxcache_url') != '') { ?>  - +
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index e0afda10..5eece060 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -112,7 +112,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { } elseif ($diff > 7) { $lotw_hint = ' lotw_info_yellow'; } - $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' L'); + $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' L'); } ?> diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 6b393de5..63f92de5 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -26,7 +26,7 @@ function updateRow(qso) { let c = 1; cells.eq(c++).text(qso.qsoDateTime); cells.eq(c++).text(qso.de); - cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); cells.eq(c++).text(qso.mode); cells.eq(c++).text(qso.rstS); cells.eq(c++).text(qso.rstR); @@ -81,7 +81,7 @@ function loadQSOTable(rows) { data.push('
'); data.push(qso.qsoDateTime); data.push(qso.de); - data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); data.push(qso.mode); data.push(qso.rstS); data.push(qso.rstR); diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 3ad082e5..23909736 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -495,8 +495,10 @@ $("#callsign").focusout(function() { } else if (result.lotw_days > 7) { $('#lotw_info').addClass('lotw_info_yellow'); } + $('#lotw_link').attr('href',"https://lotw.arrl.org/lotwuser/act?act="+find_callsign); + $('#lotw_link').attr('target',"_blank"); $('#lotw_info').attr('data-toggle',"tooltip"); - $('#lotw_info').attr('data-original-title',"LoTW User. Last upload was "+result.lotw_days+" days ago"); + $('#lotw_info').attr('data-original-title',"BLABLA LoTW User. Last upload was "+result.lotw_days+" days ago"); $('[data-toggle="tooltip"]').tooltip(); } $('#qrz_info').html(''); @@ -867,4 +869,4 @@ function closeModal() { container.removeChild(backdrop) container.removeChild(modal) }, 200) -} \ No newline at end of file +} From 807061da3355a389a81cf36937f1bea6d6bd9cfb Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 18 Aug 2023 07:01:22 +0200 Subject: [PATCH 03/60] Remove debug stuff --- 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 23909736..a558465b 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -498,7 +498,7 @@ $("#callsign").focusout(function() { $('#lotw_link').attr('href',"https://lotw.arrl.org/lotwuser/act?act="+find_callsign); $('#lotw_link').attr('target',"_blank"); $('#lotw_info').attr('data-toggle',"tooltip"); - $('#lotw_info').attr('data-original-title',"BLABLA LoTW User. Last upload was "+result.lotw_days+" days ago"); + $('#lotw_info').attr('data-original-title',"LoTW User. Last upload was "+result.lotw_days+" days ago"); $('[data-toggle="tooltip"]').tooltip(); } $('#qrz_info').html(''); From aa599f38fc2a906dd49421a0ae5836c2ac7c660e Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 08:40:09 +0000 Subject: [PATCH 04/60] Changed MaxZoom from 9 to 12 - so 6-character-grids are visible --- application/views/interface_assets/footer.php | 4 ++-- assets/js/leaflet/leafembed.js | 2 +- assets/js/sections/gridmap.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 27ecf041..262abec5 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -583,7 +583,7 @@ function newpath(latlng1, latlng2, locator1, locator2) { var osmUrl='optionslib->get_option('option_map_tile_server');?>'; var osmAttrib='Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); var redIcon = L.icon({ iconUrl: icon_dot_url, @@ -637,7 +637,7 @@ function showActivatorsMap(call, count, grids) { var osmUrl='optionslib->get_option('option_map_tile_server');?>'; var osmAttrib='Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); map.addLayer(osm); } diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js index c0ece429..5b8e556e 100644 --- a/assets/js/leaflet/leafembed.js +++ b/assets/js/leaflet/leafembed.js @@ -25,7 +25,7 @@ function initmap(ShowGrid = 'No', MapTag = 'map') { // create the tile layer with correct attribution var osmAttrib='Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); var printer = L.easyPrint({ tileLayer: osm, diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index b8ab1687..922397e9 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -51,7 +51,7 @@ function gridPlot(form) { grid_four_confirmed = data.grid_4char_confirmed; grid_six_confirmed = data.grid_6char_confirmed; var layer = L.tileLayer(jslayer, { - maxZoom: 9, + maxZoom: 12, attribution: jsattribution, id: 'mapbox.streets' }); From 2891cf09c8d8f8760ed2fdc906124e0eec13267f Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 12:48:31 +0000 Subject: [PATCH 05/60] save QRG/Mode/Band as Favourite --- assets/js/sections/qso.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index a558465b..4e04d580 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1,5 +1,30 @@ $( document ).ready(function() { + $('#start_time').click(function (event) { + save_fav(); + }); + + function save_fav() { + var payload={}; + payload.sat_name=$('#sat_name').val(); + payload.sat_mode=$('#sat_name').val(); + payload.band_rx=$('#band_rx').val(); + payload.band=$('#band').val(); + payload.frequency_tx=$('#frequency_rx').val(); + payload.frequency=$('#frequency').val(); + payload.prop_mode=$('#prop_mode').val(); + payload.mode=$('#mode').val(); + $.ajax({ + url: base_url+'index.php/user_options/set_options', + method: 'POST', + dataType: 'json', + contentType: "application/json; charset=utf-8", + data: JSON.stringify(payload), + success: function(result) { + } + }); + } + var bc_bandmap = new BroadcastChannel('qso_window'); bc_bandmap.onmessage = function (ev) { From 5dc5adb4bbd0537e1c0d276f74b6708cda2849cd Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 12:49:12 +0000 Subject: [PATCH 06/60] Model for User-options --- application/models/User_options.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 application/models/User_options.php diff --git a/application/models/User_options.php b/application/models/User_options.php new file mode 100644 index 00000000..ea375bc3 --- /dev/null +++ b/application/models/User_options.php @@ -0,0 +1,22 @@ +db->where('user_id', $this->session->userdata('user_id')); + $this->db->where('option_type', $option_type); + return $this->db->get('user_options'); + } + + public function set_option($option_type, $option_array) { + $uid=$this->session->userdata('user_id'); + $sql='insert into user_options (user_id,option_type,option_key,option_value) values (?,?,?,?) ON DUPLICATE KEY UPDATE option_value=?'; + $query = $this->db->query($sql); + foreach ($option_array() as $one_option) { + $query = $this->db->query($sql, array($uid, $option_type, $option_key, $option_value, $option_value)); + } + } + +} + +?> From 1bf2840e27b6b9761692e4eef859708e3815bf6b Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 13:16:01 +0000 Subject: [PATCH 07/60] Saving works now --- application/controllers/User_options.php | 19 +++++++++++++++++++ ...ser_options.php => User_options_model.php} | 5 ++--- assets/js/sections/qso.js | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100755 application/controllers/User_options.php rename application/models/{User_options.php => User_options_model.php} (82%) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php new file mode 100755 index 00000000..c021dfb0 --- /dev/null +++ b/application/controllers/User_options.php @@ -0,0 +1,19 @@ +load->model('user_model'); + $this->load->model('user_options_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + public function add_edit_fav() { + $obj = json_decode(file_get_contents("php://input"), true); + $this->user_options_model->set_option('Favourite',$obj); + } +} + + +?> diff --git a/application/models/User_options.php b/application/models/User_options_model.php similarity index 82% rename from application/models/User_options.php rename to application/models/User_options_model.php index ea375bc3..68e07816 100644 --- a/application/models/User_options.php +++ b/application/models/User_options_model.php @@ -1,6 +1,6 @@ db->where('user_id', $this->session->userdata('user_id')); @@ -11,8 +11,7 @@ class User_options extends CI_Model public function set_option($option_type, $option_array) { $uid=$this->session->userdata('user_id'); $sql='insert into user_options (user_id,option_type,option_key,option_value) values (?,?,?,?) ON DUPLICATE KEY UPDATE option_value=?'; - $query = $this->db->query($sql); - foreach ($option_array() as $one_option) { + foreach($option_array as $option_key => $option_value) { $query = $this->db->query($sql, array($uid, $option_type, $option_key, $option_value, $option_value)); } } diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 4e04d580..02acf4fc 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -15,7 +15,7 @@ $( document ).ready(function() { payload.prop_mode=$('#prop_mode').val(); payload.mode=$('#mode').val(); $.ajax({ - url: base_url+'index.php/user_options/set_options', + url: base_url+'index.php/user_options/add_edit_fav', method: 'POST', dataType: 'json', contentType: "application/json; charset=utf-8", From 59f81279e32ebbe33bd14edb30a1d27d23209188 Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 13:30:04 +0000 Subject: [PATCH 08/60] Added option_name to table --- application/controllers/User_options.php | 7 ++++++- application/models/User_options_model.php | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index c021dfb0..c5360590 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -11,7 +11,12 @@ class User_Options extends CI_Controller { public function add_edit_fav() { $obj = json_decode(file_get_contents("php://input"), true); - $this->user_options_model->set_option('Favourite',$obj); + if ($obj['sat_name'] ?? '' != '') { + $option_name=$obj['sat_name']; + } else { + $option_name=$obj['band'].'/'.$obj['mode']; + } + $this->user_options_model->set_option('Favourite',$option_name, $obj); } } diff --git a/application/models/User_options_model.php b/application/models/User_options_model.php index 68e07816..1304abd0 100644 --- a/application/models/User_options_model.php +++ b/application/models/User_options_model.php @@ -8,11 +8,11 @@ class User_options_model extends CI_Model return $this->db->get('user_options'); } - public function set_option($option_type, $option_array) { + public function set_option($option_type, $option_name, $option_array) { $uid=$this->session->userdata('user_id'); - $sql='insert into user_options (user_id,option_type,option_key,option_value) values (?,?,?,?) ON DUPLICATE KEY UPDATE option_value=?'; + $sql='insert into user_options (user_id,option_type,option_name,option_key,option_value) values (?,?,?,?,?) ON DUPLICATE KEY UPDATE option_value=?'; foreach($option_array as $option_key => $option_value) { - $query = $this->db->query($sql, array($uid, $option_type, $option_key, $option_value, $option_value)); + $query = $this->db->query($sql, array($uid, $option_type, $option_name, $option_key, $option_value, $option_value)); } } From e86b0a2f8673f1ba8142e56f6b977a95523bbddd Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 14:42:04 +0000 Subject: [PATCH 09/60] get_fav implemented --- application/controllers/User_options.php | 11 ++++++++++- application/models/User_options_model.php | 14 ++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index c5360590..1967349e 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -16,7 +16,16 @@ class User_Options extends CI_Controller { } else { $option_name=$obj['band'].'/'.$obj['mode']; } - $this->user_options_model->set_option('Favourite',$option_name, $obj); + return $this->user_options_model->set_option('Favourite',$option_name, $obj); + } + + public function get_favs() { + $result=$this->user_options_model->get_options('Favourite'); + foreach($result->result() as $options) { + $jsonout[$options->option_name][$options->option_key]=$options->option_value; + } + header('Content-Type: application/json'); + echo json_encode($jsonout); } } diff --git a/application/models/User_options_model.php b/application/models/User_options_model.php index 1304abd0..e37b8151 100644 --- a/application/models/User_options_model.php +++ b/application/models/User_options_model.php @@ -1,7 +1,7 @@ db->where('user_id', $this->session->userdata('user_id')); $this->db->where('option_type', $option_type); @@ -12,8 +12,14 @@ class User_options_model extends CI_Model $uid=$this->session->userdata('user_id'); $sql='insert into user_options (user_id,option_type,option_name,option_key,option_value) values (?,?,?,?,?) ON DUPLICATE KEY UPDATE option_value=?'; foreach($option_array as $option_key => $option_value) { - $query = $this->db->query($sql, array($uid, $option_type, $option_name, $option_key, $option_value, $option_value)); - } + $query = $this->db->query($sql, array($uid, $option_type, $option_name, $option_key, $option_value, $option_value)); + } + } + + public function get_options($option_type) { + $uid=$this->session->userdata('user_id'); + $sql='select option_name,option_key,option_value from user_options where user_id=? and option_type=?'; + return $this->db->query($sql, array($uid, $option_type)); } } From baa3724da9051a499d89d6d74821aaf326ef4155 Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 14:58:27 +0000 Subject: [PATCH 10/60] impemented del_fav --- application/controllers/User_options.php | 15 ++++++++++++++- application/models/User_options_model.php | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index 1967349e..864bc090 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -11,6 +11,9 @@ class User_Options extends CI_Controller { public function add_edit_fav() { $obj = json_decode(file_get_contents("php://input"), true); + foreach($obj as $option_key => $option_value) { + $obj[$option_key]=$this->security->xss_clean($option_value); + } if ($obj['sat_name'] ?? '' != '') { $option_name=$obj['sat_name']; } else { @@ -19,7 +22,7 @@ class User_Options extends CI_Controller { return $this->user_options_model->set_option('Favourite',$option_name, $obj); } - public function get_favs() { + public function get_fav() { $result=$this->user_options_model->get_options('Favourite'); foreach($result->result() as $options) { $jsonout[$options->option_name][$options->option_key]=$options->option_value; @@ -27,6 +30,16 @@ class User_Options extends CI_Controller { header('Content-Type: application/json'); echo json_encode($jsonout); } + + public function del_fav() { + $result=$this->user_options_model->get_options('Favourite'); + $obj = json_decode(file_get_contents("php://input"), true); + if ($obj['option_name'] ?? '' != '') { + $option_name=$this->security->xss_clean($obj['option_name']); + $this->user_options_model->del_option('Favourite',$option_name); + } + return; + } } diff --git a/application/models/User_options_model.php b/application/models/User_options_model.php index e37b8151..9a383338 100644 --- a/application/models/User_options_model.php +++ b/application/models/User_options_model.php @@ -22,6 +22,12 @@ class User_options_model extends CI_Model { return $this->db->query($sql, array($uid, $option_type)); } + public function del_option($option_type, $option_name) { + $uid=$this->session->userdata('user_id'); + $sql='delete from user_options where user_id=? and option_type=? and option_name=?'; + return $this->db->query($sql, array($uid, $option_type,$option_name)); + } + } ?> From c29b1f3c802e5154baa092f8972957f1785ee267 Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 15:00:40 +0000 Subject: [PATCH 11/60] example-calls for get/set/del Favs --- assets/js/sections/qso.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 02acf4fc..067d72a1 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -4,6 +4,34 @@ $( document ).ready(function() { save_fav(); }); + $('#start_date').click(function (event) { + get_fav(); + }); + + function del_fav(name) { + $.ajax({ + url: base_url+'index.php/user_options/del_fav', + method: 'GET', + dataType: 'json', + contentType: "application/json; charset=utf-8", + data: { "option_name": name }, + success: function(result) { + } + }); + } + + function get_fav() { + $.ajax({ + url: base_url+'index.php/user_options/get_fav', + method: 'GET', + dataType: 'json', + contentType: "application/json; charset=utf-8", + success: function(result) { + console.log(result); + } + }); + } + function save_fav() { var payload={}; payload.sat_name=$('#sat_name').val(); From 8fc412a1af511179433f93257cb912a082974b3d Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 18 Aug 2023 16:54:50 +0000 Subject: [PATCH 12/60] Added Prototype UI and Migrationscript --- application/config/migration.php | 2 +- application/controllers/User_options.php | 2 +- application/language/english/qso_lang.php | 1 + application/language/german/qso_lang.php | 2 ++ application/views/qso/index.php | 12 ++++++++- assets/js/sections/qso.js | 31 ++++++++++++++++++----- 6 files changed, 40 insertions(+), 10 deletions(-) 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(); } }); } From 389d9fe06b59c88a940139a774e674b1a0165532 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 18 Aug 2023 20:02:47 +0200 Subject: [PATCH 13/60] [Advanced Logbook] Added map that uses the same filters as the search --- application/controllers/Logbookadvanced.php | 129 ++++ application/models/Logbookadvanced_model.php | 19 +- application/views/logbookadvanced/index.php | 647 ++++++++++--------- assets/css/general.css | 5 + assets/js/sections/logbookadvanced.js | 214 ++++++ 5 files changed, 707 insertions(+), 307 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index f25fe68f..87a54e92 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -233,4 +233,133 @@ class Logbookadvanced extends CI_Controller { $data['qslimages'] = $this->logbookadvanced_model->getQslsForQsoIds($cleanids); $this->load->view('logbookadvanced/qslcarousel', $data); } + + public function mapQsos() { + $this->load->model('logbookadvanced_model'); + + $searchCriteria = array( + 'user_id' => (int)$this->session->userdata('user_id'), + 'dateFrom' => xss_clean($this->input->post('dateFrom')), + 'dateTo' => xss_clean($this->input->post('dateTo')), + 'de' => xss_clean($this->input->post('de')), + 'dx' => xss_clean($this->input->post('dx')), + 'mode' => xss_clean($this->input->post('mode')), + 'band' => xss_clean($this->input->post('band')), + 'qslSent' => xss_clean($this->input->post('qslSent')), + 'qslReceived' => xss_clean($this->input->post('qslReceived')), + 'iota' => xss_clean($this->input->post('iota')), + 'dxcc' => xss_clean($this->input->post('dxcc')), + 'propmode' => xss_clean($this->input->post('propmode')), + 'gridsquare' => xss_clean($this->input->post('gridsquare')), + 'state' => xss_clean($this->input->post('state')), + 'cqzone' => xss_clean($this->input->post('cqzone')), + 'qsoresults' => xss_clean($this->input->post('qsoresults')), + 'sats' => xss_clean($this->input->post('sats')), + 'lotwSent' => xss_clean($this->input->post('lotwSent')), + 'lotwReceived' => xss_clean($this->input->post('lotwReceived')), + 'eqslSent' => xss_clean($this->input->post('eqslSent')), + 'eqslReceived' => xss_clean($this->input->post('eqslReceived')), + 'qslvia' => xss_clean($this->input->post('qslvia')), + 'sota' => xss_clean($this->input->post('sota')), + 'pota' => xss_clean($this->input->post('pota')), + 'wwff' => xss_clean($this->input->post('wwff')), + 'qslimages' => xss_clean($this->input->post('qslimages')), + ); + + if ($this->session->userdata('user_measurement_base') == NULL) { + $measurement_base = $this->config->item('measurement_base'); + } + else { + $measurement_base = $this->session->userdata('user_measurement_base'); + } + + $CI =& get_instance(); + // Get Date format + if($CI->session->userdata('user_date_format')) { + // If Logged in and session exists + $custom_date_format = $CI->session->userdata('user_date_format'); + } else { + // Get Default date format from /config/cloudlog.php + $custom_date_format = $CI->config->item('qso_date_format'); + } + + switch ($measurement_base) { + case 'M': + $var_dist = " miles"; + break; + case 'N': + $var_dist = " nautic miles"; + break; + case 'K': + $var_dist = " kilometers"; + break; + } + + $mappedcoordinates = array(); + foreach ($this->logbookadvanced_model->searchDb($searchCriteria) as $qso) { + if (!empty($qso['COL_MY_GRIDSQUARE']) || !empty($qso['COL_MY_VUCC_GRIDS'])) { + if (!empty($qso['COL_GRIDSQUARE']) || !empty($qso['COL_VUCC_GRIDS'])) { + $mappedcoordinates[] = $this->calculate($qso, ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], ($qso['COL_GRIDSQUARE'] ?? '') == '' ? $qso['COL_VUCC_GRIDS'] : $qso['COL_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); + } else { + if (!empty($qso['lat']) || !empty($qso['long'])) { + $mappedcoordinates[] = $this->calculateCoordinates($qso, $qso['lat'], $qso['long'], ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); + } + } + } + } + + header("Content-Type: application/json"); + print json_encode($mappedcoordinates); + } + + public function calculate($qso, $locator1, $locator2, $measurement_base, $var_dist, $custom_date_format) { + $this->load->library('Qra'); + + $data['distance'] = $this->qra->distance($locator1, $locator2, $measurement_base) . $var_dist; + $data['bearing'] = $this->qra->get_bearing($locator1, $locator2) . "º"; + $latlng1 = $this->qra->qra2latlong($locator1); + $latlng2 = $this->qra->qra2latlong($locator2); + $latlng1[0] = number_format((float)$latlng1[0], 3, '.', '');; + $latlng1[1] = number_format((float)$latlng1[1], 3, '.', '');; + $latlng2[0] = number_format((float)$latlng2[0], 3, '.', '');; + $latlng2[1] = number_format((float)$latlng2[1], 3, '.', '');; + + $data['latlng1'] = $latlng1; + $data['latlng2'] = $latlng2; + + $data['callsign'] = $qso['COL_CALL']; + $data['band'] = $qso['COL_BAND']; + $data['mode'] = $qso['COL_MODE']; + $data['gridsquare'] = $locator2; + $data['mygridsquare'] = $locator1; + $data['mycallsign'] = $qso['station_callsign']; + $data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON'])); + $data['satname'] = $qso['COL_SAT_NAME']; + + return $data; + } + + public function calculateCoordinates($qso, $lat, $long, $mygrid, $measurement_base, $var_dist, $custom_date_format) { + $this->load->library('Qra'); + + $latlng1 = $this->qra->qra2latlong($mygrid); + $latlng2[0] = $lat; + $latlng2[1] = $long; + $latlng1[0] = number_format((float)$latlng1[0], 3, '.', '');; + $latlng1[1] = number_format((float)$latlng1[1], 3, '.', '');; + $latlng2[0] = number_format((float)$latlng2[0], 3, '.', '');; + $latlng2[1] = number_format((float)$latlng2[1], 3, '.', '');; + + $data['latlng1'] = $latlng1; + $data['latlng2'] = $latlng2; + $data['callsign'] = $qso['COL_CALL']; + $data['band'] = $qso['COL_BAND']; + $data['mode'] = $qso['COL_MODE']; + $data['mygridsquare'] = $mygrid; + $data['mycallsign'] = $qso['station_callsign']; + $data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON'])); + $data['satname'] = $qso['COL_SAT_NAME']; + + return $data; + } } diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index de032084..988e574d 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -2,11 +2,8 @@ use Cloudlog\QSLManager\QSO; class Logbookadvanced_model extends CI_Model { - /* - * @param array $searchCriteria - * @return array - */ - public function searchQsos($searchCriteria) : array { + + public function searchDb($searchCriteria) { $conditions = []; $binding = [$searchCriteria['user_id']]; @@ -202,12 +199,22 @@ class Logbookadvanced_model extends CI_Model { $results = $data->result('array'); + return $results; + } + + /* + * @param array $searchCriteria + * @return array + */ + public function searchQsos($searchCriteria) : array { + $results = $this->searchDb($searchCriteria); + $qsos = []; foreach ($results as $data) { $qsos[] = new QSO($data); } - return $qsos; + return $qsos; } public function getQsosForAdif($ids, $user_id, $sortorder = null) : object { diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 49d63ce3..bd7fee3b 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -1,63 +1,93 @@ +
    - session->flashdata('message')) { ?> - -
    -

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

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

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

    +
    + +
    -
    " method="post"> -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - - +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + + -
    -
    - - -
    -
    - - +
    +
    + + -
    -
    - - + + tag; echo '>' . $iota->tag . ' - ' . $iota->name . ''; } ?> - -
    -
    - - -
    -
    - - -
    -
    - - +
    +
    + + +
    +
    + + -
    -
    - - + + - -
    - -
    - - -
    -
    - - + + + + + + + + + + + + + + + + + + + + +
    +
    + + -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - - - - - - - - -
    -
    - - -
    -
    -
    + ?> + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + +
    +
    + + +
    +
    +
    -
    -
    - With selected: - - - - - - - - - - - - - - - -
    -
    -
    -
    - Quick search with selected: - - - - - - - - - - - -
    -
    - +
    +
    + With selected: + + + + + + + + + + + + + + + +
    +
    +
    +
    + Quick search with selected: + + + + + + + + + + + +
    +
    -
    - - - - - - - +
    + + + + + + + + + +
    -
    - - - - - - - - - - - - - - - - - session->userdata('user_eqsl_name') != ""){ +
    		Date/TimeDeDxModeRST (S)RST (R)BandMy RefsRefsNameQSL ViaQSL
    + + + + + + + + + + + + + + + + session->userdata('user_eqsl_name') != ""){ echo ''; } ?> - session->userdata('user_lotw_name') != ""){ + session->userdata('user_lotw_name') != ""){ echo ''; } ?> - - - - - - - - - -
    +
    +     		Date/TimeDeDxModeRST (S)RST (R)BandMy RefsRefsNameQSL ViaQSLeQSLLoTWQSL MsgDXCCStateCQ ZoneIOTA
    + QSL Msg + DXCC + State + CQ Zone + IOTA + + + + + diff --git a/assets/css/general.css b/assets/css/general.css index a4705e96..b9ad60e1 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -515,4 +515,9 @@ div#station_logbooks_linked_table_paginate { .previous-qsos table { margin-bottom: 0px; +} + +#advancedmap { + height: calc(100vh - 280px) !important; + max-height: 1000px !important; } \ No newline at end of file diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 63f92de5..d91c4f98 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -167,6 +167,17 @@ $(document).ready(function () { }); $('#searchForm').submit(function (e) { + var container = L.DomUtil.get('advancedmap'); + + if(container != null){ + container._leaflet_id = null; + container.remove(); + } + + $("#qsoList").attr("Hidden", false); + $("#qsoList_wrapper").attr("Hidden", false); + $("#qsoList_info").attr("Hidden", false); + $('#searchButton').prop("disabled", true); $.ajax({ @@ -675,3 +686,206 @@ function printlabel() { }); } +function mapQsos(form) { + $('#mapButton').prop("disabled", true); + + $("#qsoList").attr("Hidden", true); + $("#qsoList_wrapper").attr("Hidden", true); + $("#qsoList_info").attr("Hidden", true); + + var amap = $('#advancedmap').val(); + if (amap == undefined) { + $(".qso_manager").append('
    '); + } + + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapQsos', + type: 'post', + data: { + dateFrom: this.dateFrom.value, + dateTo: this.dateTo.value, + de: this.de.value, + dx: this.dx.value, + mode: this.mode.value, + band: this.band.value, + qslSent: this.qslSent.value, + qslReceived: this.qslReceived.value, + iota: this.iota.value, + dxcc: this.dxcc.value, + propmode: this.selectPropagation.value, + gridsquare: this.gridsquare.value, + state: this.state.value, + qsoresults: this.qsoResults.value, + sats: this.sats.value, + cqzone: this.cqzone.value, + lotwSent: this.lotwSent.value, + lotwReceived: this.lotwReceived.value, + eqslSent: this.eqslSent.value, + eqslReceived: this.eqslReceived.value, + qslvia: $('[name="qslviainput"]').val(), + sota: this.sota.value, + pota: this.pota.value, + wwff: this.wwff.value, + qslimages: this.qslimages.value, + }, + success: function(data) { + loadMap(data); + }, + error: function() { + $('#mapButton').prop("disabled", false); + }, + }); + +}; + +function loadMap(data) { + $('#mapButton').prop("disabled", false); + var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; + var osmAttrib='Map data © OpenStreetMap contributors'; + // If map is already initialized + var container = L.DomUtil.get('advancedmap'); + + if(container != null){ + container._leaflet_id = null; + container.remove(); + $(".qso_manager").append('
    '); + } + + var map = new L.Map('advancedmap', { + fullscreenControl: true, + fullscreenControlOptions: { + position: 'topleft' + }, + }); + + L.tileLayer( + osmUrl, + { + attribution: '© OpenStreetMap contributors, CC-BY-SA', + maxZoom: 18, + zoom: 3, + minZoom: 2, + } + ).addTo(map); + + map.setView([30, 0], 1.5); + + var maidenhead = L.maidenheadqrb().addTo(map); + + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib}); + + map.addLayer(osm); + + var redIcon = L.icon({ + iconUrl: icon_dot_url, + iconSize: [10, 10], // size of the icon + }); + + var counter = 0; + + $.each(data, function(k, v) { + counter++; + // Need to fix so that marker is placed at same place as end of line, but this only needs to be done when longitude is < -170 + if (this.latlng2[1] < -170) { + this.latlng2[1] = parseFloat(this.latlng2[1])+360; + } + if (this.latlng1[1] < -170) { + this.latlng1[1] = parseFloat(this.latlng1[1])+360; + } + + var popupmessage = createContentMessage(this); + var popupmessage2 = createContentMessageDx(this); + + var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: redIcon}, {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage); + marker.on('mouseover',function(ev) { + ev.target.openPopup(); + }); + + var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: redIcon},{closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage2);; + marker2.on('mouseover',function(ev) { + ev.target.openPopup(); + }); + + const multiplelines = []; + multiplelines.push( + new L.LatLng(this.latlng1[0], this.latlng1[1]), + new L.LatLng(this.latlng2[0], this.latlng2[1]) + ) + + const geodesic = L.geodesic(multiplelines, { + weight: 1, + opacity: 1, + color: 'red', + wrap: false, + steps: 100 + }).addTo(map); + }); + + /*Legend specific*/ + var legend = L.control({ position: "topright" }); + + legend.onAdd = function(map) { + var div = L.DomUtil.create("div", "legend"); + div.innerHTML += "

    " + counter + " QSOs plotted

    "; + return div; + }; + + legend.addTo(map); +} + + function createContentMessage(qso) { + var table = '' + + '' + + '" + + '' + + '"; + return (table += "
    ' + + 'Station callsign: ' + qso.mycallsign + + "
    ' + + 'Gridsquare: ' + qso.mygridsquare + + "
    "); + } + + function createContentMessageDx(qso) { + var table = '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + if (qso.satname != "") { + table += '' + + '' + + '' + + ''; + } else { + table += '' + + '' + + '' + + ''; + } + table += '' + + '' + + '' + + ''; + if (qso.gridsquare != undefined) { + table += '' + + '' + + ''; + } + if (qso.distance != undefined) { + table += '' + + '' + + ''; + } + if (qso.bearing != undefined) { + table += '' + + '' + + ''; + } + return (table += '
    Callsign' + qso.callsign + '
    Date/time' + qso.datetime + '
    Band' + qso.satname + '
    Band' + qso.band + '
    Mode' + qso.mode + '
    Gridsquare' + qso.gridsquare + '
    Distance' + qso.distance + '
    Bearing' + qso.bearing + '
    '); + } From a75257d70674eea4035f55699af9283a58f6a74c Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 18 Aug 2023 21:38:34 +0100 Subject: [PATCH 14/60] [LoTW] Remove unneeded margin at the bottom of the table --- assets/css/general.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index a4705e96..ac8ef98f 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -515,4 +515,8 @@ div#station_logbooks_linked_table_paginate { .previous-qsos table { margin-bottom: 0px; +} + +.lotw-cert-list table { + margin-bottom: 0px; } \ No newline at end of file From b56c39db6fa455e80aba6e4da5542429509d5d26 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 04:11:41 +0000 Subject: [PATCH 15/60] Reload-favs after save --- application/controllers/User_options.php | 9 +++++++-- assets/js/sections/qso.js | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index 77fc477c..46d1150d 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -19,7 +19,10 @@ class User_Options extends CI_Controller { } else { $option_name=$obj['band'].'/'.$obj['mode']; } - return $this->user_options_model->set_option('Favourite',$option_name, $obj); + $this->user_options_model->set_option('Favourite',$option_name, $obj); + $jsonout['success']=1; + header('Content-Type: application/json'); + echo json_encode($jsonout); } public function get_fav() { @@ -38,7 +41,9 @@ class User_Options extends CI_Controller { $option_name=$this->security->xss_clean($obj['option_name']); $this->user_options_model->del_option('Favourite',$option_name); } - return; + $jsonout['success']=1; + header('Content-Type: application/json'); + echo json_encode($jsonout); } } diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index b914ee9a..dc2fa377 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -23,11 +23,12 @@ var favs={}; function del_fav(name) { $.ajax({ url: base_url+'index.php/user_options/del_fav', - method: 'GET', + method: 'POST', dataType: 'json', contentType: "application/json; charset=utf-8", data: { "option_name": name }, success: function(result) { + get_fav(); } }); } From aca01fabb5e5335b144e2bf47c21725a8da95e9e Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 04:50:18 +0000 Subject: [PATCH 16/60] Now delete is working, too --- assets/js/sections/qso.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index dc2fa377..24015e57 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -7,6 +7,10 @@ var favs={}; save_fav(); }); + $(document).on("click", "#fav_del", function (event) { + del_fav($(this).attr('name')); + }); + $(document).on("click", "#fav_recall", function (event) { console.log(favs[this.innerText]); $('#sat_name').val(favs[this.innerText].sat_name); @@ -26,7 +30,7 @@ var favs={}; method: 'POST', dataType: 'json', contentType: "application/json; charset=utf-8", - data: { "option_name": name }, + data: JSON.stringify({ "option_name": name }), success: function(result) { get_fav(); } @@ -42,7 +46,7 @@ var favs={}; success: function(result) { $("#fav_menu").empty(); for (const key in result) { - $("#fav_menu").append(''+key+''); + $("#fav_menu").append(''); } favs=result; } From 3a6d2d8a2a7c09c93d5e7d0593416dc8e73f8d86 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 04:55:59 +0000 Subject: [PATCH 17/60] cosmetics: star-icon instead of "FAV" --- application/views/qso/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 3b5ae78c..05a55f52 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -36,7 +36,7 @@
  • - +
    From 794901847d0ae46a394578b085dc8298bfeba923 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 05:02:50 +0000 Subject: [PATCH 18/60] return Empty array when no favs --- application/controllers/User_options.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index 46d1150d..3aa337de 100755 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -27,6 +27,7 @@ class User_Options extends CI_Controller { public function get_fav() { $result=$this->user_options_model->get_options('Favourite'); + $jsonout=[]; foreach($result->result() as $options) { $jsonout[$options->option_name][$options->option_key]=$options->option_value; } From e01a7a3ae453b5053163678f6e8f5fa27d179408 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 05:07:43 +0000 Subject: [PATCH 19/60] MigScript was missing --- .../migrations/138_user_options_table.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 application/migrations/138_user_options_table.php diff --git a/application/migrations/138_user_options_table.php b/application/migrations/138_user_options_table.php new file mode 100644 index 00000000..4d912627 --- /dev/null +++ b/application/migrations/138_user_options_table.php @@ -0,0 +1,19 @@ +db->table_exists('user_options')) { + $this->db->query("CREATE TABLE `user_options` ( `user_id` int(11) NOT NULL, `option_type` varchar(45) NOT NULL, `option_name` varchar(45) NOT NULL, `option_key` varchar(45) NOT NULL, `option_value` varchar(45) DEFAULT NULL, PRIMARY KEY (`user_id`,`option_type`,`option_key`,`option_name`)"); + } + + } + + public function down(){ + if ($this->db->table_exists('user_options')) { + $this->dbforge->drop_table('user_options'); + } + } +} From f50e7321d6b4e47cdc80ac1d1f1bf276e301e8f4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 19 Aug 2023 10:58:35 +0200 Subject: [PATCH 20/60] Fix missing closing bracket --- application/migrations/138_user_options_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/138_user_options_table.php b/application/migrations/138_user_options_table.php index 4d912627..8961d37d 100644 --- a/application/migrations/138_user_options_table.php +++ b/application/migrations/138_user_options_table.php @@ -6,7 +6,7 @@ class Migration_user_options_table extends CI_Migration { public function up() { if (!$this->db->table_exists('user_options')) { - $this->db->query("CREATE TABLE `user_options` ( `user_id` int(11) NOT NULL, `option_type` varchar(45) NOT NULL, `option_name` varchar(45) NOT NULL, `option_key` varchar(45) NOT NULL, `option_value` varchar(45) DEFAULT NULL, PRIMARY KEY (`user_id`,`option_type`,`option_key`,`option_name`)"); + $this->db->query("CREATE TABLE `user_options` ( `user_id` int(11) NOT NULL, `option_type` varchar(45) NOT NULL, `option_name` varchar(45) NOT NULL, `option_key` varchar(45) NOT NULL, `option_value` varchar(45) DEFAULT NULL, PRIMARY KEY (`user_id`,`option_type`,`option_key`,`option_name`))"); } } From 4c9b7524363ce372b0cab63ca331ee6c32c9a680 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 19 Aug 2023 15:11:15 +0000 Subject: [PATCH 21/60] Added confirmation dialog and removed dbg --- application/views/qso/index.php | 2 +- assets/js/sections/qso.js | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 05a55f52..a977cc9b 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -36,7 +36,7 @@
  • - +
    diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 24015e57..9e2c92d2 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -12,7 +12,6 @@ var favs={}; }); $(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); @@ -25,16 +24,18 @@ var favs={}; function del_fav(name) { - $.ajax({ - url: base_url+'index.php/user_options/del_fav', - method: 'POST', - dataType: 'json', - contentType: "application/json; charset=utf-8", - data: JSON.stringify({ "option_name": name }), - success: function(result) { - get_fav(); - } - }); + if (confirm("Are you sure to delete Fav?")) { + $.ajax({ + url: base_url+'index.php/user_options/del_fav', + method: 'POST', + dataType: 'json', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ "option_name": name }), + success: function(result) { + get_fav(); + } + }); + } } function get_fav() { From 5918ff8e576aa23c4777642bc80f74952ee58d7e Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sat, 19 Aug 2023 18:18:47 +0100 Subject: [PATCH 22/60] [QSO][FAV] On over over star turn yellow --- assets/css/general.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index ac8ef98f..20282c0b 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -519,4 +519,8 @@ div#station_logbooks_linked_table_paginate { .lotw-cert-list table { margin-bottom: 0px; +} + +.qso_panel a i.fa.fa-star:hover { + color: #FFD700 !important; } \ No newline at end of file From e7a59c8b83b6fa8d87c07e8a68ed7fc3daea5ad3 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 19 Aug 2023 19:42:51 +0200 Subject: [PATCH 23/60] Fixed error in css after fixing merge conflict --- assets/css/general.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/general.css b/assets/css/general.css index 053fd499..a4ba54d6 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -520,6 +520,7 @@ div#station_logbooks_linked_table_paginate { #advancedmap { height: calc(100vh - 280px) !important; max-height: 1000px !important; +} .lotw-cert-list table { margin-bottom: 0px; From 600362b187b419f1f722a91c26730894913b9348 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 19 Aug 2023 20:20:02 +0200 Subject: [PATCH 24/60] Changed line color in light themes --- assets/js/sections/logbookadvanced.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index d91c4f98..83b374a5 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -776,6 +776,12 @@ function loadMap(data) { map.addLayer(osm); + var linecolor = 'blue'; + + if (isDarkModeTheme()) { + linecolor = 'red'; + } + var redIcon = L.icon({ iconUrl: icon_dot_url, iconSize: [10, 10], // size of the icon @@ -815,7 +821,7 @@ function loadMap(data) { const geodesic = L.geodesic(multiplelines, { weight: 1, opacity: 1, - color: 'red', + color: linecolor, wrap: false, steps: 100 }).addTo(map); From 1bc6065bef6372c7901bbd4e9366b168feff961b Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 20 Aug 2023 00:47:03 +0200 Subject: [PATCH 25/60] [Advanced Logbook] Fix for map date filters --- assets/js/sections/logbookadvanced.js | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 83b374a5..ee31764e 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -702,31 +702,31 @@ function mapQsos(form) { url: base_url + 'index.php/logbookadvanced/mapQsos', type: 'post', data: { - dateFrom: this.dateFrom.value, - dateTo: this.dateTo.value, - de: this.de.value, - dx: this.dx.value, - mode: this.mode.value, - band: this.band.value, - qslSent: this.qslSent.value, - qslReceived: this.qslReceived.value, - iota: this.iota.value, - dxcc: this.dxcc.value, - propmode: this.selectPropagation.value, - gridsquare: this.gridsquare.value, - state: this.state.value, - qsoresults: this.qsoResults.value, - sats: this.sats.value, - cqzone: this.cqzone.value, - lotwSent: this.lotwSent.value, - lotwReceived: this.lotwReceived.value, - eqslSent: this.eqslSent.value, - eqslReceived: this.eqslReceived.value, + dateFrom: form.dateFrom.value, + dateTo: form.dateTo.value, + de: form.de.value, + dx: form.dx.value, + mode: form.mode.value, + band: form.band.value, + qslSent: form.qslSent.value, + qslReceived: form.qslReceived.value, + iota: form.iota.value, + dxcc: form.dxcc.value, + propmode: form.selectPropagation.value, + gridsquare: form.gridsquare.value, + state: form.state.value, + qsoresults: form.qsoResults.value, + sats: form.sats.value, + cqzone: form.cqzone.value, + lotwSent: form.lotwSent.value, + lotwReceived: form.lotwReceived.value, + eqslSent: form.eqslSent.value, + eqslReceived: form.eqslReceived.value, qslvia: $('[name="qslviainput"]').val(), - sota: this.sota.value, - pota: this.pota.value, - wwff: this.wwff.value, - qslimages: this.qslimages.value, + sota: form.sota.value, + pota: form.pota.value, + wwff: form.wwff.value, + qslimages: form.qslimages.value, }, success: function(data) { loadMap(data); From 3b7dbffe245e60aa3c077876228038d3cf2dd474 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 20 Aug 2023 14:36:14 +0000 Subject: [PATCH 26/60] Added Operatorcallsign to add QSO --- application/controllers/Qso.php | 1 + application/language/english/qso_lang.php | 1 + application/language/german/qso_lang.php | 1 + application/models/Logbook_model.php | 2 +- application/models/User_model.php | 1 + application/views/qso/index.php | 8 +++++++- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 1df36bae..395c8a67 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -78,6 +78,7 @@ class QSO extends CI_Controller { 'prop_mode' => $this->input->post('prop_mode'), 'radio' => $this->input->post('radio'), 'station_profile_id' => $this->input->post('station_profile'), + 'operator_callsign' => $this->input->post('operator_callsign'), 'transmit_power' => $this->input->post('transmit_power') ); // ]; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index c8acea22..b386c683 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -33,3 +33,4 @@ $lang['qso_btn_edit_qso'] = 'Edit QSO'; $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Add Band/Mode to Favs'; +$lang['qso_operator_callsign'] = 'Operator Callsign'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index d7dfd357..229d2bc2 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -34,3 +34,4 @@ $lang['qso_btn_edit_qso'] = 'Editiere QSO'; $lang['qso_details'] = 'QSO Details'; $lang['fav_add'] = 'Band/Mode zu Favoriten hinzufügen'; +$lang['qso_operator_callsign']='Operator Rufzeichen'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f0e54c2e..4bd20027 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -195,7 +195,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'), 'COL_QSL_VIA' => $this->input->post('qsl_via'), 'COL_QSLMSG' => $this->input->post('qslmsg'), - 'COL_OPERATOR' => $this->session->userdata('user_callsign'), + 'COL_OPERATOR' => $this->input->post('operator_callsign') ?? $this->session->userdata('operator_callsign'), 'COL_QTH' => $this->input->post('qth'), 'COL_PROP_MODE' => $prop_mode, 'COL_IOTA' => $this->input->post('iota_ref') == null ? '' : trim($this->input->post('iota_ref')), diff --git a/application/models/User_model.php b/application/models/User_model.php index f2ca673b..293d1458 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -316,6 +316,7 @@ class User_Model extends CI_Model { 'user_name' => $u->row()->user_name, 'user_type' => $u->row()->user_type, 'user_callsign' => $u->row()->user_callsign, + 'operator_callsign' => $u->row()->user_callsign, 'user_locator' => $u->row()->user_locator, 'user_lotw_name' => $u->row()->user_lotw_name, 'user_eqsl_name' => $u->row()->user_eqsl_name, diff --git a/application/views/qso/index.php b/application/views/qso/index.php index a977cc9b..5c257555 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -221,7 +221,13 @@
    - + +
    + + +
    + +
    From 62b30bfe3bd10f2c74a69e643b36a954b6f4cad2 Mon Sep 17 00:00:00 2001 From: int2001 Date: Mon, 21 Aug 2023 08:06:07 +0000 Subject: [PATCH 27/60] Let Op-Name survive page-changes --- application/models/User_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index 293d1458..57dadbdf 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -316,7 +316,7 @@ class User_Model extends CI_Model { 'user_name' => $u->row()->user_name, 'user_type' => $u->row()->user_type, 'user_callsign' => $u->row()->user_callsign, - 'operator_callsign' => $u->row()->user_callsign, + 'operator_callsign' => ((($this->session->userdata('operator_callsign') ?? '') == '') ? $u->row()->user_callsign : $this->session->userdata('operator_callsign')), 'user_locator' => $u->row()->user_locator, 'user_lotw_name' => $u->row()->user_lotw_name, 'user_eqsl_name' => $u->row()->user_eqsl_name, From f96bc81f73a0a3d5d1d206efffc467871f57314d Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 21 Aug 2023 14:18:05 +0200 Subject: [PATCH 28/60] [Advanced Logbook] Can selects QSOs for map --- application/controllers/Logbookadvanced.php | 44 +++++++- application/models/Logbookadvanced_model.php | 5 +- assets/js/sections/logbookadvanced.js | 100 ++++++++++++------- 3 files changed, 109 insertions(+), 40 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 87a54e92..456c3e26 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -234,6 +234,43 @@ class Logbookadvanced extends CI_Controller { $this->load->view('logbookadvanced/qslcarousel', $data); } + public function mapSelectedQsos() { + $this->load->model('logbookadvanced_model'); + + $searchCriteria = array( + 'user_id' => (int)$this->session->userdata('user_id'), + 'dateFrom' => '', + 'dateTo' => '', + 'de' => '', + 'dx' => '', + 'mode' => '', + 'band' => '', + 'qslSent' => '', + 'qslReceived' => '', + 'iota' => '', + 'dxcc' => '', + 'propmode' => '', + 'gridsquare' => '', + 'state' => '', + 'cqzone' => '', + 'qsoresults' => count($this->input->post('ids')), + 'sats' => '', + 'lotwSent' => '', + 'lotwReceived' => '', + 'eqslSent' => '', + 'eqslReceived' => '', + 'qslvia' => '', + 'sota' => '', + 'pota' => '', + 'wwff' => '', + 'qslimages' => '', + 'ids' => xss_clean($this->input->post('ids')) + ); + + $result = $this->logbookadvanced_model->searchDb($searchCriteria); + $this->prepareMappedQSos($result); + } + public function mapQsos() { $this->load->model('logbookadvanced_model'); @@ -266,6 +303,11 @@ class Logbookadvanced extends CI_Controller { 'qslimages' => xss_clean($this->input->post('qslimages')), ); + $result = $this->logbookadvanced_model->searchDb($searchCriteria); + $this->prepareMappedQSos($result); + } + + public function prepareMappedQSos($qsos) { if ($this->session->userdata('user_measurement_base') == NULL) { $measurement_base = $this->config->item('measurement_base'); } @@ -296,7 +338,7 @@ class Logbookadvanced extends CI_Controller { } $mappedcoordinates = array(); - foreach ($this->logbookadvanced_model->searchDb($searchCriteria) as $qso) { + foreach ($qsos as $qso) { if (!empty($qso['COL_MY_GRIDSQUARE']) || !empty($qso['COL_MY_VUCC_GRIDS'])) { if (!empty($qso['COL_GRIDSQUARE']) || !empty($qso['COL_VUCC_GRIDS'])) { $mappedcoordinates[] = $this->calculate($qso, ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], ($qso['COL_GRIDSQUARE'] ?? '') == '' ? $qso['COL_VUCC_GRIDS'] : $qso['COL_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 988e574d..d3f1eddf 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -158,6 +158,10 @@ class Logbookadvanced_model extends CI_Model { } } + if (($searchCriteria['ids'] ?? '') !== '') { + $conditions[] = "qsos.COL_PRIMARY_KEY in (".implode(",",$searchCriteria['ids']).")"; + } + $where = trim(implode(" AND ", $conditions)); if ($where != "") { $where = "AND $where"; @@ -176,7 +180,6 @@ class Logbookadvanced_model extends CI_Model { } } - $sql = " SELECT * FROM " . $this->config->item('table_name') . " qsos diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index ee31764e..0ff48964 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -689,6 +689,15 @@ function printlabel() { function mapQsos(form) { $('#mapButton').prop("disabled", true); + var id_list=[]; + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + id_list.push(id); + }); + $("#qsoList").attr("Hidden", true); $("#qsoList_wrapper").attr("Hidden", true); $("#qsoList_info").attr("Hidden", true); @@ -698,44 +707,59 @@ function mapQsos(form) { $(".qso_manager").append('
    '); } - $.ajax({ - url: base_url + 'index.php/logbookadvanced/mapQsos', - type: 'post', - data: { - dateFrom: form.dateFrom.value, - dateTo: form.dateTo.value, - de: form.de.value, - dx: form.dx.value, - mode: form.mode.value, - band: form.band.value, - qslSent: form.qslSent.value, - qslReceived: form.qslReceived.value, - iota: form.iota.value, - dxcc: form.dxcc.value, - propmode: form.selectPropagation.value, - gridsquare: form.gridsquare.value, - state: form.state.value, - qsoresults: form.qsoResults.value, - sats: form.sats.value, - cqzone: form.cqzone.value, - lotwSent: form.lotwSent.value, - lotwReceived: form.lotwReceived.value, - eqslSent: form.eqslSent.value, - eqslReceived: form.eqslReceived.value, - qslvia: $('[name="qslviainput"]').val(), - sota: form.sota.value, - pota: form.pota.value, - wwff: form.wwff.value, - qslimages: form.qslimages.value, - }, - success: function(data) { - loadMap(data); - }, - error: function() { - $('#mapButton').prop("disabled", false); - }, - }); - + if (id_list.length > 0) { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapSelectedQsos', + type: 'post', + data: { + ids: id_list + }, + success: function(data) { + loadMap(data); + }, + error: function() { + $('#mapButton').prop("disabled", false); + }, + }); + } else { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapQsos', + type: 'post', + data: { + dateFrom: form.dateFrom.value, + dateTo: form.dateTo.value, + de: form.de.value, + dx: form.dx.value, + mode: form.mode.value, + band: form.band.value, + qslSent: form.qslSent.value, + qslReceived: form.qslReceived.value, + iota: form.iota.value, + dxcc: form.dxcc.value, + propmode: form.selectPropagation.value, + gridsquare: form.gridsquare.value, + state: form.state.value, + qsoresults: form.qsoResults.value, + sats: form.sats.value, + cqzone: form.cqzone.value, + lotwSent: form.lotwSent.value, + lotwReceived: form.lotwReceived.value, + eqslSent: form.eqslSent.value, + eqslReceived: form.eqslReceived.value, + qslvia: $('[name="qslviainput"]').val(), + sota: form.sota.value, + pota: form.pota.value, + wwff: form.wwff.value, + qslimages: form.qslimages.value, + }, + success: function(data) { + loadMap(data); + }, + error: function() { + $('#mapButton').prop("disabled", false); + }, + }); + } }; function loadMap(data) { From 23dc7005d9bfcfec57b5b3481f90bc26e167bfa2 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 22 Aug 2023 08:39:14 +0200 Subject: [PATCH 29/60] [Advanced Logbook] Unchecks marked QSOs for mapping --- assets/js/sections/logbookadvanced.js | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 0ff48964..9b7c83a0 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -696,6 +696,7 @@ function mapQsos(form) { elements.each(function() { let id = $(this).first().closest('tr').data('qsoID') id_list.push(id); + unselectQsoID(id); }); $("#qsoList").attr("Hidden", true); From d53d69494bf15953302b1a8d5a346eb0841b5ce6 Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 22 Aug 2023 16:57:42 +0000 Subject: [PATCH 30/60] Added OperatorCall to Contesting --- application/views/contesting/index.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index f4f3ea14..aaa54a6c 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -30,6 +30,11 @@ } ?>
    + + +
    + ' required> +
    From 6ae781d471c1bef1421ca102c85c7f3ed227ff67 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:55:08 +0200 Subject: [PATCH 31/60] [Advanced Logbook] Added tags for styling via custom css --- assets/js/sections/logbookadvanced.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 9b7c83a0..824da49a 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -26,7 +26,7 @@ function updateRow(qso) { let c = 1; cells.eq(c++).text(qso.qsoDateTime); cells.eq(c++).text(qso.de); - cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + cells.eq(c++).html(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); cells.eq(c++).text(qso.mode); cells.eq(c++).text(qso.rstS); cells.eq(c++).text(qso.rstR); @@ -81,7 +81,7 @@ function loadQSOTable(rows) { data.push('
    '); data.push(qso.qsoDateTime); data.push(qso.de); - data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); + data.push(''+qso.dx+'' + (qso.callsign == '' ? '' : ' L') + ' Lookup ' + qso.dx + ' on QRZ.com Lookup ' + qso.dx + ' on HamQTH'); data.push(qso.mode); data.push(qso.rstS); data.push(qso.rstR); From 77edb72d2c57d60bc320c4c5e55f077d53a6add7 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 23 Aug 2023 14:22:20 +0200 Subject: [PATCH 32/60] Handle VUCC grid lines and corners in Qrb mapping --- application/libraries/Qra.php | 44 ++++++++++++++++++++++------------- assets/js/sections/common.js | 6 ++--- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/application/libraries/Qra.php b/application/libraries/Qra.php index db55dc93..5dadc311 100644 --- a/application/libraries/Qra.php +++ b/application/libraries/Qra.php @@ -23,12 +23,6 @@ class Qra { // calculate the bearing between two squares function bearing($tx, $rx, $unit = 'M') { - if(strlen($tx) > 6) { - $tx = substr($tx, 0, 6); - } - if(strlen($rx) > 6) { - $rx = substr($rx, 0, 6); - } $my = qra2latlong($tx); $stn = qra2latlong($rx); @@ -44,12 +38,6 @@ class Qra { * */ function distance($tx, $rx, $unit = 'M') { - if(strlen($tx) > 6) { - $tx = substr($tx, 0, 6); - } - if(strlen($rx) > 6) { - $rx = substr($rx, 0, 6); - } // Calc LatLongs $my = qra2latlong($tx); $stn = qra2latlong($rx); @@ -176,9 +164,34 @@ function get_bearing($lat1, $lon1, $lat2, $lon2) { } function qra2latlong($strQRA) { - if (strpos($strQRA, ',') !== false) { - $gridsquareArray = explode(',', $strQRA); - $strQRA = $gridsquareArray[0]; + if (substr_count($strQRA, ',') == 3) { + // Handle grid corners + $grids = explode(',', $strQRA); + $coords = array(0, 0); + for($i=0; $i<4; $i++) { + $cornercoords[$i] = qra2latlong($grids[$i]); + $coords[0] += $cornercoords[$i][0]; + $coords[1] += $cornercoords[$i][1]; + } + return array (round($coords[0]/4), round($coords[1]/4)); + } else if (substr_count($strQRA, ',') == 1) { + // Handle grid lines + $grids = explode(',', $strQRA); + $coords = array(0, 0); + for($i=0; $i<2; $i++) { + $linecoords[$i] = qra2latlong($grids[$i]); + } + if ($linecoords[0][0] != $linecoords[1][0]) { + $coords[0] = round((($linecoords[0][0] + $linecoords[1][0]) / 2),1); + } else { + $coords[0] = round($linecoords[0][0],1); + } + if ($linecoords[0][1] != $linecoords[1][1]) { + $coords[1] = round(($linecoords[0][1] + $linecoords[1][1]) / 2); + } else { + $coords[1] = round($linecoords[0][1]); + } + return $coords; } if ((strlen($strQRA) % 2 == 0) && (strlen($strQRA) <= 8)) { // Check if QRA is EVEN (the % 2 does that) and smaller/equal 8 @@ -200,7 +213,6 @@ function qra2latlong($strQRA) { $g = ord($g) - ord('0'); $h = ord($h) - ord('0'); - $nLong = ($a*20) + ($c*2) + (($e+0.5)/12) + (($g-5)/120) - 180; // the 4th pair is "in the middle", so we've to substract 5 $nLat = ($b*10) + $d + (($f+0.5)/24) + (($h-5)/240) - 90; diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 265f27f1..4606da55 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -345,13 +345,13 @@ function calculateQrb() { data: {'locator1': locator1, 'locator2': locator2}, success: function (html) { - + var result = "
    Negative latitudes are south of the equator, negative longitudes are west of Greenwich.
    "; result += ' ' + locator1.toUpperCase() + ' Latitude = ' + html['latlng1'][0] + ' Longitude = ' + html['latlng1'][1] + '
    '; result += ' ' + locator2.toUpperCase() + ' Latitude = ' + html['latlng2'][0] + ' Longitude = ' + html['latlng2'][1] + '
    '; result += 'Distance between ' + locator1.toUpperCase() + ' and ' + locator2.toUpperCase() + ' is ' + html['distance'] + '.
    '; result += 'The bearing is ' + html['bearing'] + '.
    '; - + $(".qrbResult").html(result); newpath(html['latlng1'], html['latlng2'], locator1, locator2); } @@ -365,7 +365,7 @@ function validateLocator(locator) { if(locator.length < 4 && !(/^[a-rA-R]{2}[0-9]{2}[a-xA-X]{0,2}[0-9]{0,2}[a-xA-X]{0,2}$/.test(locator))) { return false; } - + return true; } From 61e24616460bbd8e3cb2370904498254ad3ec671 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 23 Aug 2023 14:48:49 +0200 Subject: [PATCH 33/60] Add an exit for the case 2 or more than 3 commans exist in grid --- application/libraries/Qra.php | 56 +++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/application/libraries/Qra.php b/application/libraries/Qra.php index 5dadc311..a9122c29 100644 --- a/application/libraries/Qra.php +++ b/application/libraries/Qra.php @@ -164,34 +164,38 @@ function get_bearing($lat1, $lon1, $lat2, $lon2) { } function qra2latlong($strQRA) { - if (substr_count($strQRA, ',') == 3) { - // Handle grid corners - $grids = explode(',', $strQRA); - $coords = array(0, 0); - for($i=0; $i<4; $i++) { - $cornercoords[$i] = qra2latlong($grids[$i]); - $coords[0] += $cornercoords[$i][0]; - $coords[1] += $cornercoords[$i][1]; - } - return array (round($coords[0]/4), round($coords[1]/4)); - } else if (substr_count($strQRA, ',') == 1) { - // Handle grid lines - $grids = explode(',', $strQRA); - $coords = array(0, 0); - for($i=0; $i<2; $i++) { - $linecoords[$i] = qra2latlong($grids[$i]); - } - if ($linecoords[0][0] != $linecoords[1][0]) { - $coords[0] = round((($linecoords[0][0] + $linecoords[1][0]) / 2),1); + if (substr_count($strQRA, ',') > 0) { + if (substr_count($strQRA, ',') == 3) { + // Handle grid corners + $grids = explode(',', $strQRA); + $coords = array(0, 0); + for($i=0; $i<4; $i++) { + $cornercoords[$i] = qra2latlong($grids[$i]); + $coords[0] += $cornercoords[$i][0]; + $coords[1] += $cornercoords[$i][1]; + } + return array (round($coords[0]/4), round($coords[1]/4)); + } else if (substr_count($strQRA, ',') == 1) { + // Handle grid lines + $grids = explode(',', $strQRA); + $coords = array(0, 0); + for($i=0; $i<2; $i++) { + $linecoords[$i] = qra2latlong($grids[$i]); + } + if ($linecoords[0][0] != $linecoords[1][0]) { + $coords[0] = round((($linecoords[0][0] + $linecoords[1][0]) / 2),1); + } else { + $coords[0] = round($linecoords[0][0],1); + } + if ($linecoords[0][1] != $linecoords[1][1]) { + $coords[1] = round(($linecoords[0][1] + $linecoords[1][1]) / 2); + } else { + $coords[1] = round($linecoords[0][1]); + } + return $coords; } else { - $coords[0] = round($linecoords[0][0],1); + return false; } - if ($linecoords[0][1] != $linecoords[1][1]) { - $coords[1] = round(($linecoords[0][1] + $linecoords[1][1]) / 2); - } else { - $coords[1] = round($linecoords[0][1]); - } - return $coords; } if ((strlen($strQRA) % 2 == 0) && (strlen($strQRA) <= 8)) { // Check if QRA is EVEN (the % 2 does that) and smaller/equal 8 From 345c2f7515dadfe24b0e7c129abfa065d0419baa Mon Sep 17 00:00:00 2001 From: Alex Johnstone Date: Wed, 23 Aug 2023 22:05:31 +0100 Subject: [PATCH 34/60] typo --- application/controllers/Logbooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php index a5f021c3..61938f5c 100644 --- a/application/controllers/Logbooks.php +++ b/application/controllers/Logbooks.php @@ -132,7 +132,7 @@ class Logbooks extends CI_Controller { public function save_publicsearch() { $this->load->model('logbooks_model'); $returndata = $this->logbooks_model->save_public_search($this->input->post('public_search'), $this->input->post('logbook_id')); - echo "
    Public Search Setttings Saved
    "; + echo "
    Public Search Settings Saved
    "; } public function save_publicslug() { From 2bd09d31e17068c60b1debe1c03ad79b16262e45 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 24 Aug 2023 18:12:55 +0200 Subject: [PATCH 35/60] Check for invalid grids in qrbCalc --- assets/js/sections/common.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 4606da55..158b1228 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -362,6 +362,10 @@ function calculateQrb() { } function validateLocator(locator) { + vucc_gridno = locator.split(",").length; + if(vucc_gridno == 3 || vucc_gridno > 4) { + return false; + } if(locator.length < 4 && !(/^[a-rA-R]{2}[0-9]{2}[a-xA-X]{0,2}[0-9]{0,2}[a-xA-X]{0,2}$/.test(locator))) { return false; } From 9b4b723dd461c7def1d9a2815029c7e8d104b543 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 24 Aug 2023 23:00:05 +0200 Subject: [PATCH 36/60] Fix instanciation of Logbook_model --- application/controllers/Logbook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index fcd10061..4abd170e 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -235,7 +235,7 @@ class Logbook extends CI_Controller { if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); } else { - $this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode)); + $this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode)); $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); From a4ede01bb1ac5ee250411eb344b6a3dde81a43fa Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 25 Aug 2023 12:28:37 +0000 Subject: [PATCH 37/60] id for Call to enable individual CSS in overview --- application/views/view_log/partial/log_ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 5eece060..e0e55f26 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -112,7 +112,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { } elseif ($diff > 7) { $lotw_hint = ' lotw_info_yellow'; } - $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' L'); + $timestamp = strtotime($row->lastupload); echo ($row->callsign == '' ? '' : ' L'); } ?> From f66a0559610c3a863c97475627f87e9a7b185b7f Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 25 Aug 2023 12:35:33 +0000 Subject: [PATCH 38/60] CSS for aligning badge and Call --- assets/css/darkly/overrides.css | 10 +++++++++- assets/css/default/overrides.css | 10 +++++++++- assets/css/superhero/overrides.css | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 9d5ea2bf..eaed97c0 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -108,4 +108,12 @@ div.alert-success a, div.alert-danger a, div.alert-danger { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + +#lotw_badge { + float:right; +} + +#edit_qso { + float:left; +} diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 57b583fb..424111c7 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -4,4 +4,12 @@ thead>tr>td { .selectize-input { border: 1px solid #ced4da; -} \ No newline at end of file +} + +#lotw_badge { + float:right; +} + +#edit_qso { + float:left; +} diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 33a991cb..bb37e651 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -112,4 +112,12 @@ div.alert-danger { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + +#lotw_badge { + float:right; +} + +#edit_qso { + float:left; +} From a163b8d387084f39a18f5049b6420628156af738 Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 25 Aug 2023 12:41:09 +0000 Subject: [PATCH 39/60] Alignment of icons at overview and lba adjusted --- assets/css/cyborg/overrides.css | 25 ++++++++++++++++++++++++- assets/css/darkly/overrides.css | 15 +++++++++++++++ assets/css/default/overrides.css | 15 +++++++++++++++ assets/css/superhero/overrides.css | 15 +++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index fe94a530..03e7a0e4 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -116,4 +116,27 @@ path.grid-worked { .selectize-dropdown, .selectize-dropdown.form-control { border-radius: 0; -} \ No newline at end of file +} + + +#lotw_badge { + float:right; +} + +#edit_qso { float:left; +} + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +td { text-align: left !important; } +th { text-align: left !important; } + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index eaed97c0..d18e0321 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -117,3 +117,18 @@ div.alert-success a, div.alert-danger a, div.alert-danger { #edit_qso { float:left; } + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +td { text-align: left !important; } +th { text-align: left !important; } + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 424111c7..7a210096 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -13,3 +13,18 @@ thead>tr>td { #edit_qso { float:left; } + +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +td { text-align: left !important; } +th { text-align: left !important; } + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index bb37e651..765b4dde 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -114,6 +114,21 @@ div.alert-danger { border-radius: 0; } +.qso_call { + float:left; + width:140px; +} + +.qso_icons { + float:right; +} + +td { text-align: left !important; } +th { text-align: left !important; } + +#qsoList_wrapper th { text-align: left !important; white-space: nowrap;} +#qsoList_wrapper td { text-align: left !important; white-space: nowrap;} + #lotw_badge { float:right; } From 59d8c2a6ce558049d305f0e8385537314103c32f Mon Sep 17 00:00:00 2001 From: int2001 Date: Fri, 25 Aug 2023 12:47:27 +0000 Subject: [PATCH 40/60] not at buttons --- assets/css/cyborg/overrides.css | 2 +- assets/css/darkly/overrides.css | 2 +- assets/css/default/overrides.css | 2 +- assets/css/superhero/overrides.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 03e7a0e4..97dd42a0 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -123,7 +123,7 @@ path.grid-worked { float:right; } -#edit_qso { float:left; +#edit_qso:not(.btn) { float:left; } .qso_call { diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index d18e0321..cbdaee6a 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -114,7 +114,7 @@ div.alert-success a, div.alert-danger a, div.alert-danger { float:right; } -#edit_qso { +#edit_qso:not(.btn) { float:left; } diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 7a210096..221248ea 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -10,7 +10,7 @@ thead>tr>td { float:right; } -#edit_qso { +#edit_qso:not(.btn) { float:left; } diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 765b4dde..952e4614 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -133,6 +133,6 @@ th { text-align: left !important; } float:right; } -#edit_qso { +#edit_qso:not(.btn) { float:left; } From 7f8341b580c606b48f73a32efc378bc596f465af Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 25 Aug 2023 14:56:29 +0200 Subject: [PATCH 41/60] Of course we need to load the model before using it ... --- application/controllers/Logbook.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 4abd170e..95cb05ff 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -235,6 +235,7 @@ class Logbook extends CI_Controller { if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); } else { + $CI->load->model('logbook_model'); $this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode)); $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); From 27cd9fb5719c309000f452df271faa6acfed535e Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Fri, 25 Aug 2023 19:15:20 +0200 Subject: [PATCH 42/60] [Themes] Adjusting css. Removed these rules, since they left-align all tables in Cloudlog --- assets/css/cyborg/overrides.css | 3 --- assets/css/darkly/overrides.css | 3 --- assets/css/default/overrides.css | 3 --- assets/css/superhero/overrides.css | 3 --- 4 files changed, 12 deletions(-) diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 97dd42a0..bef177b5 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -135,8 +135,5 @@ path.grid-worked { float:right; } -td { text-align: left !important; } -th { text-align: left !important; } - #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index cbdaee6a..39e30072 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -127,8 +127,5 @@ div.alert-success a, div.alert-danger a, div.alert-danger { float:right; } -td { text-align: left !important; } -th { text-align: left !important; } - #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css index 221248ea..84d4d651 100644 --- a/assets/css/default/overrides.css +++ b/assets/css/default/overrides.css @@ -23,8 +23,5 @@ thead>tr>td { float:right; } -td { text-align: left !important; } -th { text-align: left !important; } - #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;} diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 952e4614..4871dfc5 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -123,9 +123,6 @@ div.alert-danger { float:right; } -td { text-align: left !important; } -th { text-align: left !important; } - #qsoList_wrapper th { text-align: left !important; white-space: nowrap;} #qsoList_wrapper td { text-align: left !important; white-space: nowrap;} From aa9c5542a7bbc913e9a958749cff0c003df69e1e Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 25 Aug 2023 23:08:47 +0200 Subject: [PATCH 43/60] Add LoTW last upload link to QSO view --- application/language/english/lotw_lang.php | 3 ++- application/language/german/lotw_lang.php | 3 ++- application/views/view_log/qso.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/language/english/lotw_lang.php b/application/language/english/lotw_lang.php index 4ef6691c..3ed3245d 100644 --- a/application/language/english/lotw_lang.php +++ b/application/language/english/lotw_lang.php @@ -58,4 +58,5 @@ $lang['lotw_cert_expiring'] = 'At least one of your LoTW certificates is about t $lang['lotw_cert_expired'] = 'At least one of your LoTW certificates is expired!'; // Lotw User -$lang['lotw_user'] = 'This station uses LoTW. The last upload was'; +$lang['lotw_user'] = 'This station uses LoTW.'; +$lang['lotw_last_upload'] = 'Last upload'; diff --git a/application/language/german/lotw_lang.php b/application/language/german/lotw_lang.php index 88485441..03b2d398 100644 --- a/application/language/german/lotw_lang.php +++ b/application/language/german/lotw_lang.php @@ -58,4 +58,5 @@ $lang['lotw_cert_expiring'] = 'Mindestens eines deiner LoTW-Zertifikate läuft b $lang['lotw_cert_expired'] = 'Mindestens eines deiner LoTW-Zertifikate ist abgelaufen!'; // Lotw User -$lang['lotw_user'] = 'Diese Station nutzt LoTW. Der letzte Upload war am'; +$lang['lotw_user'] = 'Diese Station nutzt LoTW.'; +$lang['lotw_last_upload'] = 'Letzter Upload'; diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 5aa66b60..fdba5f55 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -354,7 +354,7 @@ lotwuser != null) { ?> -

    lastupload); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->lastupload); echo " at ".date('H:i', $timestamp);?> UTC.

    +

    : '; ?>lastupload); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->lastupload); echo " ".date('H:i', $timestamp);?> UTC.

    COL_LOTW_QSL_RCVD == "Y") { ?> From f1f3aace3e854dd4e91a053dea79f9c15bdf1caa Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 26 Aug 2023 09:11:44 +0000 Subject: [PATCH 44/60] fixes error-logging, when submode is null --- application/views/gridmap/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index 43168a75..cd6f79fe 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -74,7 +74,7 @@ submode == null) { + if ($mode->submode ?? '' == '') { echo ''."\n"; } } From 2d0fe4bd44e49b2ecba7e72770c646d5336f5e4e Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 27 Aug 2023 05:10:51 +0000 Subject: [PATCH 45/60] Fix Bug at ADIF-Import when hrd-fields are not populated --- application/models/Logbook_model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 4bd20027..42fe8bbc 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3184,15 +3184,15 @@ class Logbook_model extends CI_Model { if ($markHrd != null) { $input_hrdlog_qso_upload_status = 'Y'; $input_hrdlog_qso_upload_date = $date = date("Y-m-d H:i:s", strtotime("now")); + } else { + $input_hrdlog_qso_upload_date = (!empty($record['hrdlog_qso_upload_date'])) ? $record['hrdlog_qso_upload_date'] : null; + $input_hrdlog_qso_upload_status = (!empty($record['hrdlog_qso_upload_status'])) ? $record['hrdlog_qso_upload_status'] : ''; } if ($markQrz != null) { $input_qrzcom_qso_upload_status = 'Y'; $input_qrzcom_qso_upload_date = $date = date("Y-m-d H:i:s", strtotime("now")); - } - else { - $input_hrdlog_qso_upload_date = (!empty($record['hrdlog_qso_upload_date'])) ? $record['hrdlog_qso_upload_date'] : null; - $input_hrdlog_qso_upload_status = (!empty($record['hrdlog_qso_upload_status'])) ? $record['hrdlog_qso_upload_status'] : ''; + } else { $input_qrzcom_qso_upload_date = (!empty($record['qrzcom_qso_upload_date'])) ? $record['qrzcom_qso_upload_date'] : null; $input_qrzcom_qso_upload_status = (!empty($record['qrzcom_qso_upload_status'])) ? $record['qrzcom_qso_upload_status'] : ''; } From 2f694e060e99d395cc16832c2bd411cbb6d718ae Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 27 Aug 2023 05:37:16 +0000 Subject: [PATCH 46/60] Populate COL_DISTANCE at DB when plotting --- application/models/Distances_model.php | 130 +++++++++++++------------ 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index 068d1906..e1eb2c6c 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -25,7 +25,7 @@ class Distances_model extends CI_Model if ($station_gridsquare != null) { $gridsquare = explode(',', $station_gridsquare); // We need to convert to an array, since a user can enter several gridsquares - $this->db->select('col_call callsign, col_gridsquare grid'); + $this->db->select('COL_PRIMARY_KEY,COL_DISTANCE,col_call callsign, col_gridsquare grid'); $this->db->where('LENGTH(col_gridsquare) >', 0); if ($postdata['band'] == 'sat') { @@ -121,80 +121,82 @@ class Distances_model extends CI_Model // then calculates distance between homelocator and locator given in qso. // It builds an array, which has 50km intervals, then inputs each length into the correct spot // The function returns a json-encoded array. - function plot($qsoArray, $gridsquare, $measurement_base) { + function plot($qsoArray, $gridsquare, $measurement_base) { - $stationgrid = strtoupper($gridsquare[0]); // We use only the first entered gridsquare from the active profile - if (strlen($stationgrid) == 4) $stationgrid .= 'MM'; // adding center of grid if only 4 digits are specified + $stationgrid = strtoupper($gridsquare[0]); // We use only the first entered gridsquare from the active profile + if (strlen($stationgrid) == 4) $stationgrid .= 'MM'; // adding center of grid if only 4 digits are specified - switch ($measurement_base) { - case 'M': - $unit = "mi"; - $dist = '13000'; - break; - case 'K': - $unit = "km"; - $dist = '20000'; - break; - case 'N': - $unit = "nmi"; - $dist = '11000'; - break; - default: - $unit = "km"; - $dist = '20000'; - } + switch ($measurement_base) { + case 'M': + $unit = "mi"; + $dist = '13000'; + break; + case 'K': + $unit = "km"; + $dist = '20000'; + break; + case 'N': + $unit = "nmi"; + $dist = '11000'; + break; + default: + $unit = "km"; + $dist = '20000'; + } - if (!$this->valid_locator($stationgrid)) { - header('Content-Type: application/json'); - echo json_encode(array('Error' => 'Error. There is a problem with the gridsquare set in your profile!')); - exit; - } - else { - // Making the array we will use for plotting, we save occurrences of the length of each qso in the array - $j = 0; - for ($i = 0; $j < $dist; $i++) { - $dataarray[$i]['dist'] = $j . $unit . ' - ' . ($j + 50) . $unit; - $dataarray[$i]['count'] = 0; - $dataarray[$i]['calls'] = ''; - $dataarray[$i]['callcount'] = 0; - $j += 50; - } + if (!$this->valid_locator($stationgrid)) { + header('Content-Type: application/json'); + echo json_encode(array('Error' => 'Error. There is a problem with the gridsquare set in your profile!')); + exit; + } else { + // Making the array we will use for plotting, we save occurrences of the length of each qso in the array + $j = 0; + for ($i = 0; $j < $dist; $i++) { + $dataarray[$i]['dist'] = $j . $unit . ' - ' . ($j + 50) . $unit; + $dataarray[$i]['count'] = 0; + $dataarray[$i]['calls'] = ''; + $dataarray[$i]['callcount'] = 0; + $j += 50; + } - $qrb = array ( // Used for storing the QSO with the longest QRB - 'Callsign' => '', - 'Grid' => '', - 'Distance' => '', - 'Qsos' => '', - 'Grids' => '' - ); + $qrb = array ( // Used for storing the QSO with the longest QRB + 'Callsign' => '', + 'Grid' => '', + 'Distance' => '', + 'Qsos' => '', + 'Grids' => '' + ); - foreach ($qsoArray as $qso) { - $qrb['Qsos']++; // Counts up number of qsos - $bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base); // Calculates distance based on grids - $arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array - if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO - $qrb['Distance'] = $bearingdistance; - $qrb['Callsign'] = $qso['callsign']; - $qrb['Grid'] = $qso['grid']; - } - $dataarray[$arrayplacement]['count']++; // Used for counting total qsos plotted - if ($dataarray[$arrayplacement]['callcount'] < 5) { // Used for tooltip in graph, set limit to 5 calls shown - if ($dataarray[$arrayplacement]['callcount'] > 0) { - $dataarray[$arrayplacement]['calls'] .= ', '; - } - $dataarray[$arrayplacement]['calls'] .= $qso['callsign']; - $dataarray[$arrayplacement]['callcount']++; - } - } + foreach ($qsoArray as $qso) { + $qrb['Qsos']++; // Counts up number of qsos + $bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base); // Calculates distance based on grids + if (($qso['COL_DISTANCE'] ?? -1) != $bearingdistance) { + log_message("error",$qso['COL_PRIMARY_KEY'].' from '.$qso['COL_DISTANCE'].' to '.$bearingdistance); + } + $arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array + if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO + $qrb['Distance'] = $bearingdistance; + $qrb['Callsign'] = $qso['callsign']; + $qrb['Grid'] = $qso['grid']; + } + $dataarray[$arrayplacement]['count']++; // Used for counting total qsos plotted + if ($dataarray[$arrayplacement]['callcount'] < 5) { // Used for tooltip in graph, set limit to 5 calls shown + if ($dataarray[$arrayplacement]['callcount'] > 0) { + $dataarray[$arrayplacement]['calls'] .= ', '; + } + $dataarray[$arrayplacement]['calls'] .= $qso['callsign']; + $dataarray[$arrayplacement]['callcount']++; + } + } $data['ok'] = 'OK'; $data['qrb'] = $qrb; $data['qsodata'] = $dataarray; $data['unit'] = $unit; - return $data; - } - } + return $data; + } + } /* * Checks the validity of the locator From b947b76fb0bba3d29711e2add6801305e1c9da7e Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 27 Aug 2023 06:30:47 +0000 Subject: [PATCH 47/60] Refactored Distances_model to use Qra-Lib. Still Debug-Output in it --- application/models/Distances_model.php | 158 ++++++++----------------- 1 file changed, 51 insertions(+), 107 deletions(-) diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index e1eb2c6c..f8006219 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -4,17 +4,16 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); class Distances_model extends CI_Model { - function get_distances($postdata, $measurement_base) - { + function get_distances($postdata, $measurement_base) { $CI =& get_instance(); $CI->load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - if (!$logbooks_locations_array) { - header('Content-Type: application/json'); - echo json_encode(array('Error' => 'No QSOs found to plot.')); - return; - } + if (!$logbooks_locations_array) { + header('Content-Type: application/json'); + echo json_encode(array('Error' => 'No QSOs found to plot.')); + return; + } $result = array(); @@ -41,12 +40,12 @@ class Distances_model extends CI_Model $this->db->where('station_id', $station_id); $queryresult = $this->db->get($this->config->item('table_name')); - if ($queryresult->result_array()) { - $temp = $this->plot($queryresult->result_array(), $gridsquare, $measurement_base); + if ($queryresult->result_array()) { + $temp = $this->plot($queryresult->result_array(), $gridsquare, $measurement_base); - $result = $this->mergeresult($result, $temp); + $result = $this->mergeresult($result, $temp); - } + } } @@ -61,13 +60,13 @@ class Distances_model extends CI_Model echo json_encode(array('Error' => 'No QSOs found to plot.')); } - } + } /* * We merge the result from several station_id's. They can have different gridsquares, so we need to use the correct gridsquare to calculate the correct distance. */ - function mergeresult($result, $add) { - if (sizeof($result) > 0) { + function mergeresult($result, $add) { + if (sizeof($result) > 0) { if ($result['qrb']['Distance'] < $add['qrb']['Distance']) { $result['qrb']['Distance'] = $add['qrb']['Distance']; $result['qrb']['Grid'] = $add['qrb']['Grid']; @@ -77,29 +76,29 @@ class Distances_model extends CI_Model for ($i = 0; $i <= 399; $i++) { - if(isset($result['qsodata'][$i]['count'])) { - $result['qsodata'][$i]['count'] += $add['qsodata'][$i]['count']; - } + if(isset($result['qsodata'][$i]['count'])) { + $result['qsodata'][$i]['count'] += $add['qsodata'][$i]['count']; + } - if(isset($result['qsodata'][$i]['callcount'])) { - if ($result['qsodata'][$i]['callcount'] < 5 && $add['qsodata'][$i]['callcount'] > 0) { - $calls = explode(',', $add['qsodata'][$i]['calls']); - foreach ($calls as $c) { - if ($result['qsodata'][$i]['callcount'] < 5) { - if ($result['qsodata'][$i]['callcount'] > 0) { - $result['qsodata'][$i]['calls'] .= ', '; - } - $result['qsodata'][$i]['calls'] .= $c; - $result['qsodata'][$i]['callcount']++; - } - } - } - } + if(isset($result['qsodata'][$i]['callcount'])) { + if ($result['qsodata'][$i]['callcount'] < 5 && $add['qsodata'][$i]['callcount'] > 0) { + $calls = explode(',', $add['qsodata'][$i]['calls']); + foreach ($calls as $c) { + if ($result['qsodata'][$i]['callcount'] < 5) { + if ($result['qsodata'][$i]['callcount'] > 0) { + $result['qsodata'][$i]['calls'] .= ', '; + } + $result['qsodata'][$i]['calls'] .= $c; + $result['qsodata'][$i]['callcount']++; + } + } + } + } } return $result; } - return $add; + return $add; } /* @@ -108,11 +107,11 @@ class Distances_model extends CI_Model function find_gridsquare($station_id) { $this->db->where('station_id', $station_id); - $result = $this->db->get('station_profile')->row_array(); + $result = $this->db->get('station_profile')->row_array(); - if ($result) { - return $result['station_gridsquare']; - } + if ($result) { + return $result['station_gridsquare']; + } return null; } @@ -122,7 +121,7 @@ class Distances_model extends CI_Model // It builds an array, which has 50km intervals, then inputs each length into the correct spot // The function returns a json-encoded array. function plot($qsoArray, $gridsquare, $measurement_base) { - + $this->load->library('Qra'); $stationgrid = strtoupper($gridsquare[0]); // We use only the first entered gridsquare from the active profile if (strlen($stationgrid) == 4) $stationgrid .= 'MM'; // adding center of grid if only 4 digits are specified @@ -169,9 +168,9 @@ class Distances_model extends CI_Model foreach ($qsoArray as $qso) { $qrb['Qsos']++; // Counts up number of qsos - $bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base); // Calculates distance based on grids - if (($qso['COL_DISTANCE'] ?? -1) != $bearingdistance) { - log_message("error",$qso['COL_PRIMARY_KEY'].' from '.$qso['COL_DISTANCE'].' to '.$bearingdistance); + $bearingdistance = $this->qra->distance($stationgrid, $qso['grid'], $measurement_base); + if ($bearingdistance != $qso['COL_DISTANCE']) { + log_message("error",$qso['COL_PRIMARY_KEY'].'/'.$qso['callsign'].' from '.$qso['COL_DISTANCE'].' to '.$bearingdistance); } $arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO @@ -203,72 +202,17 @@ class Distances_model extends CI_Model * Input: locator * Returns: bool */ - function valid_locator ($loc) { - $regex = '^[A-R]{2}[0-9]{2}[A-X]{2}$'; - if (preg_match("%{$regex}%i", $loc)) { - return true; - } - else { - return false; - } - } + function valid_locator ($loc) { + $regex = '^[A-R]{2}[0-9]{2}[A-X]{2}$'; + if (preg_match("%{$regex}%i", $loc)) { + return true; + } + else { + return false; + } + } - /* - * Converts locator to latitude and longitude - * Input: locator - * Returns: array with longitude and latitude - */ - function loc_to_latlon ($loc) { - /* lat */ - $l[0] = - (ord(substr($loc, 1, 1))-65) * 10 - 90 + - (ord(substr($loc, 3, 1))-48) + - (ord(substr($loc, 5, 1))-65) / 24 + 1/48; - $l[0] = $this->deg_to_rad($l[0]); - /* lon */ - $l[1] = - (ord(substr($loc, 0, 1))-65) * 20 - 180 + - (ord(substr($loc, 2, 1))-48) * 2 + - (ord(substr($loc, 4, 1))-65) / 12 + 1/24; - $l[1] = $this->deg_to_rad($l[1]); - - return $l; - } - - function deg_to_rad ($deg) { - return (M_PI * $deg/180); - } - - function bearing_dist($loc1, $loc2, $measurement_base) { - $loc1 = strtoupper($loc1); - $loc2 = strtoupper($loc2); - - if (strlen($loc1) == 4) $loc1 .= 'MM'; - if (strlen($loc2) == 4) $loc2 .= 'MM'; - - if (!$this->valid_locator($loc1) || !$this->valid_locator($loc2)) { - return 0; - } - - $l1 = $this->loc_to_latlon($loc1); - $l2 = $this->loc_to_latlon($loc2); - - $co = cos($l1[1] - $l2[1]) * cos($l1[0]) * cos($l2[0]) + sin($l1[0]) * sin($l2[0]); - $ca = atan2(sqrt(1 - $co*$co), $co); - - switch ($measurement_base) { - case 'M': - return ceil(6371*$ca/1.609344); - case 'K': - return ceil(6371*$ca); - case 'N': - return ceil(6371*$ca/1.852); - default: - return ceil(6371*$ca); - } - } - - /* + /* * Used to fetch QSOs from the logbook in the awards */ public function qso_details($distance, $band, $sat){ @@ -284,7 +228,7 @@ class Distances_model extends CI_Model $this->db->where('COL_DISTANCE <=', $distarray[1]); $this->db->where('LENGTH(col_gridsquare) >', 0); - $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array); + $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array); if ($band != 'All') { if($band != "sat") { @@ -305,7 +249,7 @@ class Distances_model extends CI_Model function getdistparams($distance) { $temp = explode('-', $distance); $regex = '[a-zA-Z]+'; - preg_match("%{$regex}%i", $temp[0], $unit); + preg_match("%{$regex}%i", $temp[0], $unit); $result = []; $result[0] = filter_var($temp[0], FILTER_SANITIZE_NUMBER_INT); From f2e2c20849030a1e968b9e9a64ff1cc398fdb4f5 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 27 Aug 2023 10:22:22 +0000 Subject: [PATCH 48/60] Now updating / Debug removed --- application/models/Distances_model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index f8006219..3aa17c0c 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -170,7 +170,9 @@ class Distances_model extends CI_Model $qrb['Qsos']++; // Counts up number of qsos $bearingdistance = $this->qra->distance($stationgrid, $qso['grid'], $measurement_base); if ($bearingdistance != $qso['COL_DISTANCE']) { - log_message("error",$qso['COL_PRIMARY_KEY'].'/'.$qso['callsign'].' from '.$qso['COL_DISTANCE'].' to '.$bearingdistance); + $data = array('COL_DISTANCE' => $bearingdistance); + $this->db->where('COL_PRIMARY_KEY', $qso['COL_PRIMARY_KEY']); + $this->db->update($this->config->item('table_name'), $data); } $arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO From 74becc03065bed532f600ec713a26688de205815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Krac=C3=ADk?= Date: Sun, 27 Aug 2023 12:26:39 +0200 Subject: [PATCH 49/60] FIX missing semicolons in Czech translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Kracík --- application/language/czech/account_lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index b7048da6..986504f5 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -35,10 +35,10 @@ $lang['account_timezone'] = 'Časové pásmo'; $lang['account_date_format'] = 'Formát data'; $lang['account_measurement_preferences'] = 'Nastavení měření'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Vyberte, jak chcete, aby byla data zobrazena při přihlášení do vašeho účtu.'; -$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.' +$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Vyberte, v jakých jednotkách se budou zobrazovat vzdálenosti.'; $lang['account_main_menu'] = 'Hlavní menu'; -$lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.' +$lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.'; $lang['account_main_menu'] = 'Hlavní menu'; $lang['account_show_notes_in_the_main_menu'] = 'Zobrazovat poznámky v hlavním menu.'; @@ -48,14 +48,14 @@ $lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'Pokud je $lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'Automatické vyhledávání lokátoru a jména pro SOTA vrchol.'; $lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'Automatické vyhledávání lokátoru a jména pro WWFF referenci.'; $lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'Automatické vyhledávání lokátoru a jména pro POTA park.'; -$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Pokud je nastaveno, jméno a lokátor jsou získány z API a vyplněny do umístění a lokátoru.' +$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'Pokud je nastaveno, jméno a lokátor jsou získány z API a vyplněny do umístění a lokátoru.'; $lang['account_previous_qsl_type'] = 'Předchozí typ QSL'; $lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Vyberte typ QSL k zobrazení v sekci předchozích QSOs.'; $lang['account_qrzcom_hamqthcom_images'] = 'Obrázky qrz.com/hamqth.com'; $lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Zobrazit profilový obrázek partnera z QSO záznamu z profilu qrz.com/hamqth.com v sekci protokolu QSO.'; -$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Prosím, nastavte své přihlašovací údaje pro qrz.com/hamqth.com v obecném konfiguračním souboru.' +$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Prosím, nastavte své přihlašovací údaje pro qrz.com/hamqth.com v obecném konfiguračním souboru.'; $lang['account_amsat_status_upload'] = 'Nahrávání stavu AMSAT'; $lang['account_upload_status_of_sat_qsos_to'] = 'Nahrávání stavu SAT QSOs na'; From cd191244d3b1db42f629a1ea3704cf7a4c222efd Mon Sep 17 00:00:00 2001 From: Petr Kracik Date: Sun, 27 Aug 2023 21:54:19 +0200 Subject: [PATCH 50/60] Update script: Add eQSL images to restore perms aswell Signed-off-by: Petr Kracik --- update_cloudlog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_cloudlog.sh b/update_cloudlog.sh index 6a0927e7..fa1a0f20 100644 --- a/update_cloudlog.sh +++ b/update_cloudlog.sh @@ -10,7 +10,7 @@ # The user and group that own the CLOUDLOG_SUBDIR directories. Passed to 'chown' as-is. DIR_OWNERSHIP="root:www-data" # The list of directories that need to have ownership restored after a git pull -declare -a CLOUDLOG_SUBDIRS=("application/config" "assets" "backup" "updates" "uploads") +declare -a CLOUDLOG_SUBDIRS=("application/config" "assets" "backup" "updates" "uploads" "images/eqsl_card_images") # The name of the Git remote to fetch/pull from GIT_REMOTE="origin" # If true, pull from the HEAD of the configured origin, otherwise the latest tag From fde3357d2ae4f0c4e841f00cfdb26d889cb4521b Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 28 Aug 2023 15:26:48 +0100 Subject: [PATCH 51/60] [Options] Creates options table during install and inserts the version2 flag and migration file makes sure it doesn't exisit. This will hopefully resolve #2443 loop for new installs who of course don't need to run through the upgrade process for version 1 to 2 --- .../migrations/058_new_options_table.php | 61 ++++++++++--------- ...102_add_version_two_trigger_to_options.php | 2 + install/assets/install.sql | 13 ++++ 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/application/migrations/058_new_options_table.php b/application/migrations/058_new_options_table.php index 99bc8239..6c888985 100644 --- a/application/migrations/058_new_options_table.php +++ b/application/migrations/058_new_options_table.php @@ -11,35 +11,38 @@ class Migration_new_options_table extends CI_Migration { public function up() { - $this->dbforge->add_field(array( - 'option_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => TRUE - ), - - 'option_name' => array( - 'type' => 'VARCHAR', - 'constraint' => '191', - 'null' => TRUE, - 'unique' => TRUE, - ), - - 'option_value' => array( - 'type' => 'longtext', - ), - - 'autoload' => array( - 'type' => 'varchar', - 'constraint' => '20', - 'null' => TRUE, - ) - )); - - $this->dbforge->add_key('option_id', TRUE); - - $this->dbforge->create_table('options'); + // if table options doesn't exist + if (!$this->db->table_exists('options')) { + $this->dbforge->add_field(array( + 'option_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => TRUE + ), + + 'option_name' => array( + 'type' => 'VARCHAR', + 'constraint' => '191', + 'null' => TRUE, + 'unique' => TRUE, + ), + + 'option_value' => array( + 'type' => 'longtext', + ), + + 'autoload' => array( + 'type' => 'varchar', + 'constraint' => '20', + 'null' => TRUE, + ) + )); + + $this->dbforge->add_key('option_id', TRUE); + + $this->dbforge->create_table('options'); + } } public function down() diff --git a/application/migrations/102_add_version_two_trigger_to_options.php b/application/migrations/102_add_version_two_trigger_to_options.php index e0dac738..f1da0867 100644 --- a/application/migrations/102_add_version_two_trigger_to_options.php +++ b/application/migrations/102_add_version_two_trigger_to_options.php @@ -11,6 +11,7 @@ class Migration_add_version_two_trigger_to_options extends CI_Migration { public function up() { + $data = array( array('option_name' => "version2_trigger", 'option_value' => "false", 'autoload' => "yes"), ); @@ -19,6 +20,7 @@ class Migration_add_version_two_trigger_to_options extends CI_Migration { if($query->num_rows() == 0) { $this->db->insert_batch('options', $data); } + } public function down() diff --git a/install/assets/install.sql b/install/assets/install.sql index 3fccb104..7a918282 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -296,6 +296,19 @@ CREATE TABLE `TABLE_HRD_CONTACTS_V01` ( -- Records of TABLE_HRD_CONTACTS_V01 -- ---------------------------- + + +CREATE TABLE `options` ( + `option_id` bigint(20) UNSIGNED NOT NULL, + `option_name` varchar(191) DEFAULT NULL, + `option_value` longtext NOT NULL, + `autoload` varchar(20) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; + +-- +-- Dumping data for table `options` that stops the version2 trigger from firing +INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'yes', 'true') + -- ---------------------------- -- Table structure for timezones -- ---------------------------- From 575ede3eb915e821d17f7952043da9af93b4ae3e Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 28 Aug 2023 15:37:58 +0100 Subject: [PATCH 52/60] Typo fix doh --- install/assets/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index 7a918282..013a5316 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -307,7 +307,7 @@ CREATE TABLE `options` ( -- -- Dumping data for table `options` that stops the version2 trigger from firing -INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'yes', 'true') +INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'true', 'yes') -- ---------------------------- -- Table structure for timezones From b082ccf1e31aecd5a4747a7afb08aaa564937b73 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 28 Aug 2023 16:27:33 +0100 Subject: [PATCH 53/60] Forgot the ; --- install/assets/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index 013a5316..894dadd2 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -307,7 +307,7 @@ CREATE TABLE `options` ( -- -- Dumping data for table `options` that stops the version2 trigger from firing -INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'true', 'yes') +INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'true', 'yes'); -- ---------------------------- -- Table structure for timezones From 5c7bcdc5f242f280da679277e81141daa2c60ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Krac=C3=ADk?= Date: Mon, 28 Aug 2023 17:27:37 +0200 Subject: [PATCH 54/60] Install: Create auto-increment, fix semicolon, fixes #2443 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Kracík --- install/assets/install.sql | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index 013a5316..3d574d07 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -297,17 +297,24 @@ CREATE TABLE `TABLE_HRD_CONTACTS_V01` ( -- ---------------------------- - CREATE TABLE `options` ( `option_id` bigint(20) UNSIGNED NOT NULL, `option_name` varchar(191) DEFAULT NULL, `option_value` longtext NOT NULL, `autoload` varchar(20) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +ALTER TABLE `options` + ADD PRIMARY KEY (`option_id`), + ADD UNIQUE KEY `option_name` (`option_name`); + +ALTER TABLE `options` + MODIFY `option_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT; + -- -- Dumping data for table `options` that stops the version2 trigger from firing -INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'true', 'yes') +INSERT INTO `options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (NULL, 'version2_trigger', 'true', 'yes'); -- ---------------------------- -- Table structure for timezones From 25147cdc2b5ee09a94ff295ab863de70390ee43b Mon Sep 17 00:00:00 2001 From: Luca IU2FRL Date: Mon, 28 Aug 2023 19:41:25 +0200 Subject: [PATCH 55/60] Moving to PHP8.2 --- docker/Dockerfile | 12 ++++++------ install/index.php | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 725bc2c6..da2bfd74 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,24 +1,24 @@ -FROM php:7.4-apache +FROM php:8.2-apache +# Enabling custom upload settings in PHP RUN touch /usr/local/etc/php/conf.d/uploads.ini \ && echo "file_uploads = On" >> /usr/local/etc/php/conf.d/uploads.ini \ && echo "memory_limit = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \ && echo "upload_max_filesize = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \ && echo "post_max_size = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \ && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/uploads.ini +# Adding required libraries and modules RUN apt-get update \ && apt-get install -y git curl libxml2-dev libonig-dev RUN docker-php-ext-install mysqli mbstring xml -#RUN docker-php-ext-install curl -#RUN docker-php-ext-install openssl +# Cleanup RUN rm -rf /var/www/html/docker/ +# Copy proper file to target image COPY ./ /var/www/html/ WORKDIR /var/www/html # Setting permissions as: https://github.com/magicbug/Cloudlog/wiki/Installation RUN cd /var/www/html \ -&& echo "Setting root as owner of the html folder" \ && chown -R root:www-data /var/www/html -RUN echo "Setting permissions to the install folder" \ -&& chmod -R g+rw ./application/config/ \ +RUN chmod -R g+rw ./application/config/ \ && chmod -R g+rw ./application/logs/ \ && chmod -R g+rw ./assets/qslcard/ \ && chmod -R g+rw ./backup/ \ diff --git a/install/index.php b/install/index.php index 1e65398d..9524e520 100644 --- a/install/index.php +++ b/install/index.php @@ -19,9 +19,9 @@ function delDir($dir) { } } // This step may be not needed - if (file_exists($dir)) { - rmdir( $dir ); - } + // if (file_exists($dir)) { + // rmdir( $dir ); + // } } if (file_exists($db_file_path)) { From 6b7902b023bbfd83e7820ea16971921767e16e65 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 29 Aug 2023 14:26:03 +0100 Subject: [PATCH 56/60] [Nav] Removed the words search to add some room --- 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 42f3dbfe..234a479f 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -198,7 +198,7 @@
    - +
    From 059a0860af2cd4d1e352076b1ea8134b10596955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Krac=C3=ADk?= Date: Sun, 27 Aug 2023 14:53:57 +0200 Subject: [PATCH 57/60] eSQL: Security fix, use HTTPS to send password over the internet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Kracík --- application/config/migration.php | 2 +- application/controllers/Eqsl.php | 4 ++-- application/libraries/EqslImporter.php | 2 +- application/migrations/139_modify_eQSL_url.php | 16 ++++++++++++++++ application/models/Eqslmethods_model.php | 4 ++-- application/views/eqsl/import.php | 2 +- 6 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 application/migrations/139_modify_eQSL_url.php diff --git a/application/config/migration.php b/application/config/migration.php index 51eebc64..e4c7db9a 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 138; +$config['migration_version'] = 139; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 8bb72380..f6a29e6b 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -277,13 +277,13 @@ class eqsl extends CI_Controller { return $table; } - // Build out the ADIF info string according to specs http://eqsl.cc/qslcard/ADIFContentSpecs.cfm + // Build out the ADIF info string according to specs https://eqsl.cc/qslcard/ADIFContentSpecs.cfm function generateAdif($qsl, $data) { $COL_QSO_DATE = date('Ymd',strtotime($qsl['COL_TIME_ON'])); $COL_TIME_ON = date('Hi',strtotime($qsl['COL_TIME_ON'])); # Set up the single record file - $adif = "http://www.eqsl.cc/qslcard/importADIF.cfm?"; + $adif = "https://www.eqsl.cc/qslcard/importADIF.cfm?"; $adif .= "ADIFData=CloudlogUpload%20"; /* Handy reference of escaping chars diff --git a/application/libraries/EqslImporter.php b/application/libraries/EqslImporter.php index 087ca036..2ca8ff4b 100644 --- a/application/libraries/EqslImporter.php +++ b/application/libraries/EqslImporter.php @@ -111,7 +111,7 @@ class EqslImporter foreach ($matches[2] as $match) { // Look for the link that has the .adi file, and download it to $file if (substr($match, -4, 4) == ".adi") { - file_put_contents($this->adif_file, file_get_contents("http://eqsl.cc/qslcard/" . $match)); + file_put_contents($this->adif_file, file_get_contents("https://eqsl.cc/qslcard/" . $match)); return $this->import(); } } diff --git a/application/migrations/139_modify_eQSL_url.php b/application/migrations/139_modify_eQSL_url.php new file mode 100644 index 00000000..ab8cbba4 --- /dev/null +++ b/application/migrations/139_modify_eQSL_url.php @@ -0,0 +1,16 @@ +db->query($sql); + } + + public function down() + { + // Will not go back to insecure connections + } +} +?> diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index 5ad652dd..5972bd5d 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -154,8 +154,8 @@ class Eqslmethods_model extends CI_Model { } // Update a QSO with eQSL QSL info - // We could also probably use this use this: http://eqsl.cc/qslcard/VerifyQSO.txt - // http://www.eqsl.cc/qslcard/ImportADIF.txt + // We could also probably use this use this: https://eqsl.cc/qslcard/VerifyQSO.txt + // https://www.eqsl.cc/qslcard/ImportADIF.txt function eqsl_update($datetime, $callsign, $band, $mode, $qsl_status,$station_callsign) { $data = array( 'COL_EQSL_QSLRDATE' => date('Y-m-d H:i:s'), // eQSL doesn't give us a date, so let's use current diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php index 2c9edf72..f0167906 100644 --- a/application/views/eqsl/import.php +++ b/application/views/eqsl/import.php @@ -30,7 +30,7 @@ Import from file...

    -

    Upload the Exported ADIF file from eQSL from the Download Inbox page, to mark QSOs as confirmed on eQSL.

    +

    Upload the Exported ADIF file from eQSL from the Download Inbox page, to mark QSOs as confirmed on eQSL.

    Important Log files must have the file type .adi



    From ec85d4ef5ca0bfee63ce191a7d9cbac6d6912e9d Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 30 Aug 2023 14:59:23 +0100 Subject: [PATCH 58/60] Updated Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e94862bb..c0aef174 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,6 @@ Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K Cloudlog is supported by Patreon and donations via PayPal, thanks to the following people: -Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L). +Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic, Tom (M0LTE), smurphboy, Lars (SM0TGU), Theo (PD9DP), Stefan (SM0RGM). Peter (G0ABI), Lou (KI5FTY), Michael (DG3NAB), Dragan (4O4A), minorsecond, Emily (W7AYQ), Steve (M0SKM), Rob (M0VFC), Doug (WA6L), Petr (OK1PKR), Fabian (HB9HI). If you'd like to donate to Cloudlog to help allow @magicbug spend less time doing commercial work and more time coding Cloudlog then you can donate via [PayPal](https://paypal.me/PGoodhall), [Github Sponsor](https://github.com/sponsors/magicbug) or become a [Patreon](https://www.patreon.com/2m0sql) From f6044097c180ec365167cc71571d8c01c09fa9d7 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 30 Aug 2023 16:51:06 +0200 Subject: [PATCH 59/60] We should export to csv without slashed zero --- application/controllers/Qslprint.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/Qslprint.php b/application/controllers/Qslprint.php index 9c391c1e..11a902f2 100644 --- a/application/controllers/Qslprint.php +++ b/application/controllers/Qslprint.php @@ -114,8 +114,8 @@ class QSLPrint extends CI_Controller { foreach ($myData->result() as $qso) { fputcsv($file, array($qso->STATION_CALLSIGN, - str_replace("0", "Ø", $qso->COL_CALL), - $qso->COL_QSL_VIA!=""?"Via ".str_replace("0", "Ø", $qso->COL_QSL_VIA):"", + $qso->COL_CALL, + $qso->COL_QSL_VIA!=""?"via ".$qso->COL_QSL_VIA:"", $qso->COL_TIME_ON, $qso->COL_MODE, $qso->COL_FREQ, From d6150d1c17ceda831edd640423e6492b6681cbd9 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 30 Aug 2023 21:58:39 +0100 Subject: [PATCH 60/60] Tag 2.4.8 --- application/config/migration.php | 2 +- application/migrations/140_tag_2_4_8.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 application/migrations/140_tag_2_4_8.php diff --git a/application/config/migration.php b/application/config/migration.php index e4c7db9a..f11c7f7b 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 139; +$config['migration_version'] = 140; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/140_tag_2_4_8.php b/application/migrations/140_tag_2_4_8.php new file mode 100644 index 00000000..ee070205 --- /dev/null +++ b/application/migrations/140_tag_2_4_8.php @@ -0,0 +1,24 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.8')); + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.7')); + } +} \ No newline at end of file