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

Merge pull request #1435 from phl0/qslNotes 

Fill and send eqsl.cc comment field (QSLMSG)
pull/1444/head
Peter Goodhall 2022-03-25 16:37:55 +00:00 zatwierdzone przez GitHub
rodzic eaf814b336 3be65ae548
commit b699b75dbf
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 37 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -430,6 +430,17 @@ class eqsl extends CI_Controller {
$adif .= "%20";
}
// adding qslmsg if it isn't blank
if ($qsl['COL_QSLMSG'] != ''){
$adif .= "%3C";
$adif .= "QSLMSG";
$adif .= "%3A";
$adif .= strlen($qsl['COL_QSLMSG']);
$adif .= "%3E";
$adif .= $qsl['COL_QSLMSG'];
$adif .= "%20";
}
if ($qsl['eqslqthnickname'] != ''){
$adif .= "%3C";
$adif .= "APP%5FEQSL%5FQTH%5FNICKNAME";

1
application/language/english/qso_lang.php
Wyświetl plik

@ -18,6 +18,7 @@ $lang['qso_sig_info_helptext'] = 'For example: DLFF-0029';
$lang['qso_dok_helptext'] = 'For example: Q03';
$lang['qso_notes_helptext'] = 'Note content is used within Cloudlog only and is not exported to other services.';
$lang['qsl_notes_helptext'] = 'This note content is exported to QSL services like eqsl.cc.';
// Button Text on /qso Display

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

@ -146,6 +146,7 @@ class Logbook_model extends CI_Model {
'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
'COL_QSL_VIA' => $this->input->post('qsl_via'),
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_OPERATOR' => $this->session->userdata('user_callsign'),
'COL_QTH' => $this->input->post('qth'),
'COL_PROP_MODE' => $prop_mode,
@ -618,6 +619,7 @@ class Logbook_model extends CI_Model {
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
'COL_EQSL_QSL_SENT' => $this->input->post('eqsl_sent'),
'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_recv'),
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_LOTW_QSL_SENT' => $this->input->post('lotw_sent'),
'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'),
'COL_IOTA' => $this->input->post('iota_ref'),
@ -631,9 +633,9 @@ class Logbook_model extends CI_Model {
'COL_FREQ_RX' => $this->parse_frequency($this->input->post('freq_display_rx')),
'COL_STX_STRING' => $this->input->post('stx_string'),
'COL_SRX_STRING' => $this->input->post('srx_string'),
'COL_STX' => $stx_string,
'COL_SRX' => $srx_string,
'COL_CONTEST_ID' => $this->input->post('contest_name'),
'COL_STX' => $stx_string,
'COL_SRX' => $srx_string,
'COL_CONTEST_ID' => $this->input->post('contest_name'),
'COL_QSL_VIA' => $this->input->post('qsl_via_callsign'),
'station_id' => $stationId,
'COL_OPERATOR' => $this->input->post('operator_callsign'),
@ -2085,7 +2087,7 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL
function eqsl_not_yet_sent() {
$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_SUBMODE, '.$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->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE');
$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_SUBMODE, '.$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->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG');
$this->db->from('station_profile');
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','left');
$this->db->where($this->config->item('table_name').'.COL_CALL !=', '');

12
application/views/qso/edit_ajax.php
Wyświetl plik

@ -518,6 +518,18 @@
<option value="V" <?php if($qso->COL_EQSL_QSL_RCVD == "V") { echo "selected=\"selected\""; } ?>>Verified (Match)</option>
</select></div>
</div>
<div class="form-group row">
<div class="col-sm-9">
<label for="qslmsg"><?php echo $this->lang->line('general_word_notes'); ?></label>
<div class="alert alert-info" role="alert">
<span class="badge badge-info"><?php echo $this->lang->line('general_word_info'); ?></span> <?php echo $this->lang->line('qsl_notes_helptext'); ?>
</div>
</div>
<div class="col-sm-9">
<textarea type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5"><?php echo $qso->COL_QSLMSG; ?></textarea>
</div>
</div>
</div>
<div class="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">
<div class="form-group row">

7
application/views/qso/index.php
Wyświetl plik

@ -472,6 +472,13 @@
</div>
</div>
<div class="alert alert-info" role="alert">
<span class="badge badge-info"><?php echo $this->lang->line('general_word_info'); ?></span> <?php echo $this->lang->line('qsl_notes_helptext'); ?>
</div>
<div class="form-group">
<label for="qslmsg"><?php echo $this->lang->line('general_word_notes'); ?></label>
<textarea type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5"></textarea>
</div>
</div>
</div>