Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-24 19:21:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1081 from int2001/edit_qrz

Browse Source 
Added QRZ-Tab to Edit-QSO/QSLs
This commit is contained in:
Joerg (DJ7NT)
2024-10-15 17:37:54 +02:00
committed by GitHub
parent 627a4a176d 43c77631b8
commit 9db1f39a6e
2 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
application/models/Logbook_model.php
View File

@@ -1265,6 +1265,18 @@ class Logbook_model extends CI_Model {
$eqsl_rcvd = 'N';
}
if ($this->input->post('qrz_sent')) {
$qrz_sent = $this->input->post('qrz_sent');
} else {
$qrz_sent = 'N';
}
if ($this->input->post('qrz_rcvd')) {
$qrz_rcvd = $this->input->post('qrz_rcvd');
} else {
$qrz_rcvd = 'N';
}
if (in_array($this->input->post('prop_mode'), $this->config->item('lotw_unsupported_prop_modes'))) {
$lotw_sent = 'I';
} elseif ($this->input->post('lotw_sent')) {
@@ -1329,6 +1341,27 @@ class Logbook_model extends CI_Model {
$lotwrdate = $qso->COL_LOTW_QSLRDATE;
}
$qrz_modified=false;
if ($qrz_sent == 'N' && $qso->COL_QRZCOM_QSO_UPLOAD_STATUS != $qrz_sent) {
$qrzsdate = null;
$qrz_modified=true;
} elseif (!$qso->COL_QRZCOM_QSO_UPLOAD_DATE || $qso->COL_QRZCOM_QSO_UPLOAD_STATUS != $qrz_sent) {
$qrzsdate = date('Y-m-d H:i:s');
$qrz_modified=true;
} else {
$qrzsdate = $qso->COL_QRZCOM_QSO_UPLOAD_DATE;
}
if ($qrz_rcvd == 'N' && $qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS != $qrz_rcvd) {
$qrzrdate = null;
$qrz_modified=true;
} elseif (!$qso->COL_QRZCOM_QSO_DOWNLOAD_DATE || $qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS != $qrz_rcvd) {
$qrzrdate = date('Y-m-d H:i:s');
$qrz_modified=true;
} else {
$qrzrdate = $qso->COL_QRZCOM_QSO_DOWNLOAD_DATE;
}
if (($this->input->post('distance')) && (is_numeric($this->input->post('distance')))) {
$distance = $this->input->post('distance');
} else {
@@ -1370,6 +1403,10 @@ class Logbook_model extends CI_Model {
'COL_EQSL_QSL_SENT' => $this->input->post('eqsl_sent'),
'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_rcvd'),
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_QRZCOM_QSO_UPLOAD_DATE' => $qrzsdate,
'COL_QRZCOM_QSO_DOWNLOAD_DATE' => $qrzrdate,
'COL_QRZCOM_QSO_UPLOAD_STATUS' => $qrz_sent,
'COL_QRZCOM_QSO_DOWNLOAD_STATUS' => $qrz_rcvd,
'COL_LOTW_QSLSDATE' => $lotwsdate,
'COL_LOTW_QSLRDATE' => $lotwrdate,
'COL_LOTW_QSL_SENT' => $lotw_sent,
@@ -1406,11 +1443,11 @@ class Logbook_model extends CI_Model {
'COL_MY_SIG_INFO' => $sigInfo
);
if ($this->exists_hrdlog_credentials($data['station_id'])) {
if ($this->exists_hrdlog_credentials($data['station_id']) && !$qrz_modified) {
$data['COL_HRDLOG_QSO_UPLOAD_STATUS'] = 'M';
}
if ($this->exists_qrz_api_key($data['station_id'])) {
if ($this->exists_qrz_api_key($data['station_id']) && !$qrz_modified) {
$data['COL_QRZCOM_QSO_UPLOAD_STATUS'] = 'M';
}

30
application/views/qso/edit_ajax.php
View File

@@ -411,6 +411,9 @@
<li class="nav-item">
<a class="nav-link" id="contact-tab" data-bs-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false"><?= __("LoTW"); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" id="contact-tab" data-bs-toggle="tab" href="#qrz" role="tab" aria-controls="qrz" aria-selected="false"><?= __("QRZ"); ?></a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
@@ -536,6 +539,33 @@
<small id="lotw_propmode_hint" class="form-text text-muted"><?php if (in_array($qso->COL_PROP_MODE, $this->config->item('lotw_unsupported_prop_modes'))) { echo __("Propagation mode is not supported by LoTW. LoTW QSL fields disabled."); } else { echo "&nbsp;"; } ?></small>
</div>
</div>
</div>
<div class="tab-pane fade" id="qrz" role="tabpanel" aria-labelledby="qrz-tab">
<div class="mb-3 row">
<label for="sent" class="col-sm-3 col-form-label"><?= __("Sent"); ?></label>
<div class="col-sm-9">
<select class="form-select" id="qrz_sent" name="qrz_sent">
<option value="N" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "N") { echo "selected=\"selected\""; } ?>><?= __("No"); ?></option>
<option value="Y" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo "selected=\"selected\""; } ?>><?= __("Yes"); ?></option>
<option value="R" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "R") { echo "selected=\"selected\""; } ?>><?= __("Requested"); ?></option>
<option value="Q" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "Q") { echo "selected=\"selected\""; } ?>><?= __("Queued"); ?></option>
<option value="I" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "I") { echo "selected=\"selected\""; } ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="M" <?php if($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "M") { echo "selected=\"selected\""; } ?>><?= __("Modified"); ?></option>
</select></div>
</div>
<div class="mb-3 row">
<label for="sent" class="col-sm-3 col-form-label"><?= __("Received"); ?></label>
<div class="col-sm-9">
<select class="form-select" id="qrz_rcvd" name="qrz_rcvd">
<option value="N" <?php if($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "N") { echo "selected=\"selected\""; } ?>><?= __("No"); ?></option>
<option value="Y" <?php if($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { echo "selected=\"selected\""; } ?>><?= __("Yes"); ?></option>
<option value="R" <?php if($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "R") { echo "selected=\"selected\""; } ?>><?= __("Requested"); ?></option>
<option value="I" <?php if($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "I") { echo "selected=\"selected\""; } ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="V" <?php if($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "V") { echo "selected=\"selected\""; } ?>><?= __("Verified (Match)"); ?></option>
</select>
</div>
</div>
</div>
</div>