From 93c31e53b260bc725ccbc6b4d14b5a27661b3bc6 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 7 May 2024 18:22:52 +0200
Subject: [PATCH 1/3] Adif export can now use filter for adif export
---
application/controllers/Logbookadvanced.php | 14 ++++-
application/models/Logbookadvanced_model.php | 17 ++++--
application/views/logbookadvanced/index.php | 12 ++--
assets/js/sections/logbookadvanced.js | 62 ++++++++++++--------
assets/js/sections/logbookadvanced_map.js | 12 ++--
5 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index 89a356453..c431c32ed 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -201,6 +201,16 @@ class Logbookadvanced extends CI_Controller {
$this->load->view('adif/data/exportall', $data);
}
+ function export_to_adif_params() {
+ $this->load->model('logbookadvanced_model');
+
+ $postdata = $this->input->post();
+ $postdata['user_id'] = (int)$this->session->userdata('user_id');
+ $data['qsos'] = $this->logbookadvanced_model->getSearchResult($postdata);
+
+ $this->load->view('adif/data/exportall', $data);
+ }
+
function update_qsl() {
$this->load->model('logbookadvanced_model');
@@ -306,7 +316,7 @@ class Logbookadvanced extends CI_Controller {
'ids' => xss_clean($this->input->post('ids'))
);
- $result = $this->logbookadvanced_model->searchDb($searchCriteria);
+ $result = $this->logbookadvanced_model->getSearchResultArray($searchCriteria);
$this->prepareMappedQSos($result);
}
@@ -347,7 +357,7 @@ class Logbookadvanced extends CI_Controller {
'qslimages' => xss_clean($this->input->post('qslimages')),
);
- $result = $this->logbookadvanced_model->searchDb($searchCriteria);
+ $result = $this->logbookadvanced_model->getSearchResultArray($searchCriteria);
$this->prepareMappedQSos($result);
}
diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 6d8205caa..625d2827c 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -222,7 +222,7 @@ class Logbookadvanced_model extends CI_Model {
}
$sql = "
- SELECT *
+ SELECT *, dxcc_entities.name AS station_country
FROM " . $this->config->item('table_name') . " qsos
INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
LEFT OUTER JOIN satellite ON qsos.COL_SAT_NAME = satellite.name
@@ -239,10 +239,17 @@ class Logbookadvanced_model extends CI_Model {
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc
LIMIT $limit
";
- $data = $this->db->query($sql, $binding);
+ return $this->db->query($sql, $binding);
- $results = $data->result('array');
- return $results;
+ }
+
+ public function getSearchResult($searchCriteria) {
+ return $this->searchDb($searchCriteria);
+ }
+
+ public function getSearchResultArray($searchCriteria) {
+ $result = $this->searchDb($searchCriteria);
+ return $result->result('array');
}
/*
@@ -250,7 +257,7 @@ class Logbookadvanced_model extends CI_Model {
* @return array
*/
public function searchQsos($searchCriteria) : array {
- $results = $this->searchDb($searchCriteria);
+ $results = $this->getSearchResultArray($searchCriteria);
$qsos = [];
foreach ($results as $data) {
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 05351ed9c..05338cb03 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -139,7 +139,7 @@ $options = json_decode($options);
-
-
-
-
+
@@ -401,11 +401,13 @@ $options = json_decode($options);
-