mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #1912 from phl0/showEqslOnImport 

Show link to eQSL image on import status page
pull/1916/head
Peter Goodhall 2023-01-10 11:34:55 +00:00 zatwierdzone przez GitHub
rodzic f9c62d5409 cab8f01c6c
commit ab12eca088
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 15 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/controllers/Lotw.php
Wyświetl plik

@ -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 .= "<td>".$state."</td>";
$table .= "<td>".$qsl_gridsquare."</td>";
$table .= "<td>".$iota."</td>";
$table .= "<td>QSO Record: ".$status."</td>";
$table .= "<td>QSO Record: ".$status[0]."</td>";
$table .= "<td>LoTW Record: ".$lotw_status."</td>";
$table .= "</tr>";
}

7
application/libraries/EqslImporter.php
Wyświetl plik

@ -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", "&Oslash;", $record['call']),
'mode' => $record['mode'],
'submode' => $record['submode'] ?? null,
'status' => $status,
'status' => $status[0],
'eqsl_status' => $eqsl_status,
'qsoid' => $qsoid,
);
}

7
application/models/Logbook_model.php
Wyświetl plik

@ -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];
}
}

4
application/views/eqsl/analysis.php
Wyświetl plik

@ -43,7 +43,11 @@ $custom_date_format = $this->session->userdata('user_date_format');
<?php $timestamp = strtotime($qso['date']); ?>
<td><?php echo date($custom_date_format, $timestamp) ?></td>
<td><?php echo date('H:i', $timestamp); ?></td>
<?php if ($qso['status'] == "Found") { ?>
<td><a href="<?php echo site_url("eqsl/image/".$qso['qsoid']); ?>" data-fancybox="images" data-width="528" data-height="336"><?php echo $qso['call']; ?></a></td>
<?php } else { ?>
<td><?php echo $qso['call']; ?></td>
<?php } ?>
<td><?php echo $qso['mode']; ?></td>
<td><?php echo $qso['submode']; ?></td>
<td><?php echo $qso['status']; ?></td>