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

Cloudlog now requires eQSL QTH NIckname to upload QSOs

pull/360/head
Peter Goodhall 2019-10-04 11:32:29 +01:00
rodzic 698fc51dab
commit 6439af3df9
3 zmienionych plików z 40 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
application/controllers/Eqsl.php
Wyświetl plik

@ -264,7 +264,7 @@ class eqsl extends CI_Controller {
// Grab the list of QSOs to send information about
// perform an HTTP get on each one, and grab the status back
$qslsnotsent = $this->logbook_model->eqsl_not_yet_sent();
$table = "<table>";
$table .= "<tr class=\"titles\">";
$table .= "<td>Date</td>";
@ -415,6 +415,27 @@ class eqsl extends CI_Controller {
$adif .= "%20";
}
if ($qsl['eqslqthnickname'] = ''){
$adif .= "%3C";
$adif .= "APP_EQSL_QTH_NICKNAME";
$adif .= "%3A";
$adif .= strlen($qsl['eqslqthnickname']);
$adif .= "%3E";
$adif .= $qsl['eqslqthnickname'];
$adif .= "%20";
}
// adding sat mode if it isn't blank
if ($qsl['station_gridsquare'] = ''){
$adif .= "%3C";
$adif .= "MY_GRIDSQUARE";
$adif .= "%3A";
$adif .= strlen($qsl['station_gridsquare']);
$adif .= "%3E";
$adif .= $qsl['station_gridsquare'];
$adif .= "%20";
}
# Tie a bow on it!
$adif .= "%3C";
@ -522,12 +543,13 @@ class eqsl extends CI_Controller {
if ($qslsnotsent->num_rows() > 0)
{
$table = "<table>";
$table = "<table width=\"100%\">";
$table .= "<tr class=\"titles\">";
$table .= "<td>Date</td>";
$table .= "<td>Call</td>";
$table .= "<td>Mode</td>";
$table .= "<td>Band</td>";
$table .= "<td>eQSL QTH Nickname</td>";
$table .= "<tr>";
foreach ($qslsnotsent->result_array() as $qsl)
@ -537,6 +559,7 @@ class eqsl extends CI_Controller {
$table .= "<td><a class=\"qsobox\" href=\"".site_url('qso/edit')."/".$qsl['COL_PRIMARY_KEY']."\">".str_replace("0","&Oslash;",strtoupper($qsl['COL_CALL']))."</a></td>";
$table .= "<td>".$qsl['COL_MODE']."</td>";
$table .= "<td>".$qsl['COL_BAND']."</td>";
$table .= "<td>".$qsl['eqslqthnickname']."</td>";
$table .= "<tr>";
}
$table .= "</table>";

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

@ -972,11 +972,16 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL
function eqsl_not_yet_sent() {
$this->db->select("COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND, COL_COMMENT, COL_RST_SENT, COL_PROP_MODE");
$this->db->where('COL_EQSL_QSL_SENT !=', 'Y');
$this->db->where('COL_EQSL_QSL_SENT !=', 'I');
return $this->db->get($this->config->item('table_name'));
$this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE');
$this->db->from('station_profile');
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left');
$this->db->where('station_profile.eqslqthnickname !=', '');
$this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'Y');
$this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'I');
return $this->db->get();
}
function import($record, $station_id = "0") {

7
application/views/eqsl/export.php
Wyświetl plik

@ -19,7 +19,12 @@
<?php
if (isset($eqsl_table))
{
echo "<p>The following QSOs have not been sent to eQSL.cc</p>";
?>
<p>The following QSOs have not been sent to eQSL.cc</p>
<p>Please make sure you have defined the eQSL QTH Nickname in the Station Profile this matches the QTH Nickname you used within eQSL.</p>
<?php
echo $eqsl_table;
echo "<p>Clicking \"Upload QSOs\" will send QSO information to eQSL.cc.</p>";
echo form_open('eqsl/export');