From f494b55491a1787fb25ef804054dac17c2507c8b Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 24 Sep 2020 20:22:09 +0200 Subject: [PATCH 1/4] Added bootstrapdialog in dashboard, logbook and search. I think that should cover it. --- application/controllers/Logbook.php | 4 ++-- application/views/dashboard/index.php | 4 +--- application/views/interface_assets/footer.php | 2 +- application/views/search/result_search.php | 2 +- application/views/view_log/index.php | 2 +- application/views/view_log/qso.php | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 3c99ad7c..61e06e58 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -556,7 +556,7 @@ class Logbook extends CI_Controller { if ($query->num_rows() > 0) { $data['results'] = $query; - $this->load->view('view_log/partial/log.php', $data); + $this->load->view('view_log/partial/log_ajax.php', $data); } else { $this->load->model('search'); @@ -565,7 +565,7 @@ class Logbook extends CI_Controller { if ($iota_search->num_rows() > 0) { $data['results'] = $iota_search; - $this->load->view('view_log/partial/log.php', $data); + $this->load->view('view_log/partial/log_ajax.php', $data); } else { if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null) { // Lookup using QRZ diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 2cb62260..826bf343 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -71,9 +71,7 @@ - COL_PRIMARY_KEY; ?>" href="javascript:;"> - COL_CALL)); ?> - + COL_CALL)); ?> COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?> COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 95fb1f64..e6da3f47 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1431,7 +1431,7 @@ $(document).ready(function(){ var lat = $("#lat").text(); var long = $("#long").text(); var callsign = $("#callsign").text(); - var mymap = L.map('map').setView([lat,long], 5); + var mymap = L.map('mapqso').setView([lat,long], 5); L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', { maxZoom: 18, diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php index 07175e58..39cf56f9 100644 --- a/application/views/search/result_search.php +++ b/application/views/search/result_search.php @@ -33,7 +33,7 @@ '; ?> COL_TIME_ON); echo date('d/m/y', $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> - COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?> + COL_CALL)); ?> COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?> COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> COL_RST_RCVD; ?> COL_SRX_STRING) { ?>COL_SRX_STRING;?> diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index abaa6a9d..fbe51c86 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -13,4 +13,4 @@
- load->view('view_log/partial/log') ?> + load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 76271e35..87df334b 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -245,7 +245,7 @@
-
+
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
From d60c01df118a11da6539f889de332b4bdbd22342 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 24 Sep 2020 20:49:38 +0200 Subject: [PATCH 2/4] Fixed previous contacts. --- application/views/qso/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index e78a66e1..d6544efa 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -462,7 +462,9 @@ foreach ($query->result() as $row) { ?> '; ?> config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?> - COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?> + + COL_CALL)); ?> + COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?> COL_RST_SENT; ?> COL_RST_RCVD; ?> From 67417b39afc97d6cd2645a52b20c022b72b51569 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 24 Sep 2020 21:40:29 +0200 Subject: [PATCH 3/4] Last one? --- application/views/interface_assets/footer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index e6da3f47..5a5f248d 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -86,8 +86,7 @@ $(".search-results-box").hide(); } else { band = item.COL_BAND; } - - var callsign = '' + item.COL_CALL + ''; + var callsign = '' + item.COL_CALL + ''; if (item.COL_SUBMODE == '' || item.COL_SUBMODE == null) { $('#results').append('' + item.COL_TIME_ON + '' + callsign + '' + item.COL_MODE + '' + item.COL_RST_SENT + '' + item.COL_RST_RCVD + '' + band + '' + item.COL_COUNTRY + ''); } From ca70049444ecbfe7acad9842b6737d7591b48083 Mon Sep 17 00:00:00 2001 From: Andreas Date: Fri, 25 Sep 2020 18:22:13 +0200 Subject: [PATCH 4/4] Timeline fixed. --- application/controllers/Timeline.php | 8 ++--- application/views/interface_assets/footer.php | 30 +++++++++++++++++++ application/views/timeline/details.php | 2 +- application/views/timeline/index.php | 2 +- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/application/controllers/Timeline.php b/application/controllers/Timeline.php index 8bd28ed1..cb99c636 100644 --- a/application/controllers/Timeline.php +++ b/application/controllers/Timeline.php @@ -37,9 +37,9 @@ class Timeline extends CI_Controller { public function details() { $this->load->model('logbook_model'); - $adif = str_replace('"', "", $this->input->get("Adif")); + $adif = str_replace('"', "", $this->input->post("Adif")); $country = $this->logbook_model->get_entity($adif); - $band = str_replace('"', "", $this->input->get("Band")); + $band = str_replace('"', "", $this->input->post("Band")); $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band); // Render Page @@ -50,9 +50,7 @@ class Timeline extends CI_Controller { $data['filter'] .= " and " . $band; } - $this->load->view('interface_assets/header', $data); - $this->load->view('timeline/details'); - $this->load->view('interface_assets/footer'); + $this->load->view('timeline/details', $data); } } \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 5a5f248d..6f3ed7d3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1720,6 +1720,36 @@ $(document).ready(function(){ }); } + uri->segment(1) == "timeline") { ?> + + + diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php index 56394d9f..d5e85065 100644 --- a/application/views/timeline/details.php +++ b/application/views/timeline/details.php @@ -4,4 +4,4 @@

Filtering on

- load->view('view_log/partial/log') ?> + load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 2374cd03..2b8021c6 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -68,7 +68,7 @@ if (!empty($line->end)) echo 'Yes'; echo ' ' . $line->end . ' - adif . '"&Band="'. $bandselect . '"\'>Show + adif . '","'. $bandselect . '")>Show '; } echo '
';