diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index f62b16ce..cb7c9544 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -513,7 +513,7 @@ class Lotw extends CI_Controller {
$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']);
$skipNewQso = $this->input->post('importMissing'); // If import missing was checked
- if($status == "No Match" && $skipNewQso != NULL) {
+ if($status[0] == "No Match" && $skipNewQso != NULL) {
$station_id = $this->logbook_model->find_correct_station_id($record['station_callsign'], $record['my_gridsquare']);
@@ -559,7 +559,7 @@ class Lotw extends CI_Controller {
$table .= "
".$state." | ";
$table .= "".$qsl_gridsquare." | ";
$table .= "".$iota." | ";
- $table .= "QSO Record: ".$status." | ";
+ $table .= "QSO Record: ".$status[0]." | ";
$table .= "LoTW Record: ".$lotw_status." | ";
$table .= "";
}
diff --git a/application/libraries/EqslImporter.php b/application/libraries/EqslImporter.php
index 3e042f86..a8dd6841 100644
--- a/application/libraries/EqslImporter.php
+++ b/application/libraries/EqslImporter.php
@@ -154,7 +154,9 @@ class EqslImporter
}
$status = $this->CI->logbook_model->import_check($time_on, $record['call'], $record['band']);
- if ($status == "Found") {
+ $qsoid = 0;
+ if ($status[0] == "Found") {
+ $qsoid = $status[1];
$dupe = $this->CI->logbook_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']);
if ($dupe == false) {
$updated += 1;
@@ -173,8 +175,9 @@ class EqslImporter
'call' => str_replace("0", "Ø", $record['call']),
'mode' => $record['mode'],
'submode' => $record['submode'] ?? null,
- 'status' => $status,
+ 'status' => $status[0],
'eqsl_status' => $eqsl_status,
+ 'qsoid' => $qsoid,
);
}
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index c2d5597e..08a1a2d6 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -2058,7 +2058,7 @@ class Logbook_model extends CI_Model {
/* Used to check if the qso is already in the database */
function import_check($datetime, $callsign, $band) {
- $this->db->select('COL_TIME_ON, COL_CALL, COL_BAND');
+ $this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND');
$this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )');
$this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )');
$this->db->where('COL_CALL', $callsign);
@@ -2068,9 +2068,10 @@ class Logbook_model extends CI_Model {
if ($query->num_rows() > 0)
{
- return "Found";
+ $ret = $query->row();
+ return ["Found", $ret->COL_PRIMARY_KEY];
} else {
- return "No Match";
+ return ["No Match", 0];
}
}
diff --git a/application/views/eqsl/analysis.php b/application/views/eqsl/analysis.php
index 077e966e..c2230d3e 100644
--- a/application/views/eqsl/analysis.php
+++ b/application/views/eqsl/analysis.php
@@ -43,7 +43,11 @@ $custom_date_format = $this->session->userdata('user_date_format');
|
|
+
+ " data-fancybox="images" data-width="528" data-height="336"> |
+
|
+
|
|
|