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

Edit QSO // DCL-Fields

Browse Source
This commit is contained in:
int2001
2025-08-21 14:44:21 +00:00
parent cae240920c
commit 233f807c6f
2 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
application/models/Logbook_model.php
View File

@@ -1368,53 +1368,65 @@ class Logbook_model extends CI_Model {
}
if ($this->input->post('qsl_sent')) {
$qsl_sent = $this->input->post('qsl_sent');
$qsl_sent = $this->input->post('qsl_sent',true);
} else {
$qsl_sent = 'N';
}
if ($this->input->post('qsl_rcvd')) {
$qsl_rcvd = $this->input->post('qsl_rcvd');
$qsl_rcvd = $this->input->post('qsl_rcvd',true);
} else {
$qsl_rcvd = 'N';
}
if ($this->input->post('eqsl_sent')) {
$eqsl_sent = $this->input->post('eqsl_sent');
$eqsl_sent = $this->input->post('eqsl_sent',true);
} else {
$eqsl_sent = 'N';
}
if ($this->input->post('eqsl_rcvd')) {
$eqsl_rcvd = $this->input->post('eqsl_rcvd');
$eqsl_rcvd = $this->input->post('eqsl_rcvd',true);
} else {
$eqsl_rcvd = 'N';
}
if ($this->input->post('qrz_sent')) {
$qrz_sent = $this->input->post('qrz_sent');
$qrz_sent = $this->input->post('qrz_sent',true);
} else {
$qrz_sent = 'N';
}
if ($this->input->post('qrz_rcvd')) {
$qrz_rcvd = $this->input->post('qrz_rcvd');
$qrz_rcvd = $this->input->post('qrz_rcvd',true);
} else {
$qrz_rcvd = 'N';
}
if ($this->input->post('clublog_sent')) {
$clublog_sent = $this->input->post('clublog_sent');
$clublog_sent = $this->input->post('clublog_sent',true);
} else {
$clublog_sent = 'N';
}
if ($this->input->post('clublog_rcvd')) {
$clublog_rcvd = $this->input->post('clublog_rcvd');
$clublog_rcvd = $this->input->post('clublog_rcvd',true);
} else {
$clublog_rcvd = 'N';
}
if ($this->input->post('dcl_sent')) {
$dcl_sent = $this->input->post('dcl_sent',true);
} else {
$dcl_sent = 'N';
}
if ($this->input->post('dcl_rcvd')) {
$dcl_rcvd = $this->input->post('dcl_rcvd',true);
} else {
$dcl_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')) {
@@ -1516,6 +1528,22 @@ class Logbook_model extends CI_Model {
$clublogrdate = $qso->COL_CLUBLOG_QSO_DOWNLOAD_DATE;
}
if ($dcl_sent == 'N' && $qso->COL_CLUBLOG_QSO_UPLOAD_STATUS != $dcl_sent) {
$dclsdate = null;
} elseif (!$qso->COL_DCL_QSLSDATE || $qso->COL_DCL_QSLSDATE != $dcl_sent) {
$dclsdate = date('Y-m-d H:i:s');
} else {
$dclsdate = $qso->COL_DCL_QSLSDATE;
}
if ($dcl_rcvd == 'N' && $qso->COL_DCL_QSLRDATE != $dcl_rcvd) {
$dclrdate = null;
} elseif (!$qso->COL_DCL_QSLRDATE || $qso->COL_DCL_QSLRDATE != $dcl_rcvd) {
$dclrdate = date('Y-m-d H:i:s');
} else {
$dclrdate = $qso->COL_DCL_QSLRDATE;
}
if (($this->input->post('distance')) && (is_numeric($this->input->post('distance')))) {
$distance = $this->input->post('distance');
} else {
@@ -1588,6 +1616,10 @@ class Logbook_model extends CI_Model {
'COL_CLUBLOG_QSO_DOWNLOAD_DATE' => $clublogrdate,
'COL_CLUBLOG_QSO_DOWNLOAD_STATUS' => $clublog_rcvd,
'COL_CLUBLOG_QSO_UPLOAD_STATUS' => $clublog_sent,
'COL_DCL_QSLSDATE' => $dclsdate,
'COL_DCL_QSLRDATE' => $dclrdate,
'COL_DCL_QSL_RCVD' => $dcl_rcvd,
'COL_DCL_QSL_SENT' => $dcl_sent,
'COL_IOTA' => $this->input->post('iota_ref'),
'COL_SOTA_REF' => strtoupper(trim($this->input->post('sota_ref'))),
'COL_WWFF_REF' => strtoupper(trim($this->input->post('wwff_ref'))),

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

@@ -427,9 +427,12 @@
<li class="nav-item">
<a class="nav-link" id="qrz-tab" data-bs-toggle="tab" href="#qrz-edit" role="tab" aria-controls="qrz" aria-selected="false"><?= __("QRZ"); ?></a>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link" id="clublog-tab" data-bs-toggle="tab" href="#clublog-edit" role="tab" aria-controls="clublog" aria-selected="false"><?= __("Clublog"); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" id="dcl-tab" data-bs-toggle="tab" href="#dcl-edit" role="tab" aria-controls="dcl" aria-selected="false"><?= __("DCL"); ?></a>
</li>
</ul>
<div class="tab-content" id="qsl_edit_tabs">
<div class="tab-pane fade show active" id="qsl-edit" role="tabpanel" aria-labelledby="qsl-edit-tab">
@@ -595,7 +598,33 @@
</div>
</div>
</div>
<div class="tab-pane fade" id="clublog-edit" role="tabpanel" aria-labelledby="clublog-tab">
<div class="tab-pane fade" id="dcl-edit" role="tabpanel" aria-labelledby="dcl-tab">
<div class="mt-3 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="clublog_sent" name="dcl_sent">
<option value="N" <?php if ($qso->COL_DCL_QSL_SENT == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_DCL_QSL_SENT == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_DCL_QSL_SENT == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="Q" <?php if ($qso->COL_DCL_QSL_SENT == "Q") echo "selected=\"selected\""; ?>><?= __("Queued"); ?></option>
<option value="I" <?php if ($qso->COL_DCL_QSL_SENT == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></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="clublog_rcvd" name="dcl_rcvd">
<option value="N" <?php if ($qso->COL_DCL_QSL_RCVD == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_DCL_QSL_RCVD == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_DCL_QSL_RCVD == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="I" <?php if ($qso->COL_DCL_QSL_RCVD == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="V" <?php if ($qso->COL_DCL_QSL_RCVD == "V") echo "selected=\"selected\""; ?>><?= __("Verified (Match)"); ?></option>
</select>
</div>
</div>
</div>
<div class="tab-pane fade" id="clublog-edit" role="tabpanel" aria-labelledby="clublog-tab">
<div class="mt-3 mb-3 row">
<label for="sent" class="col-sm-3 col-form-label"><?= __("Sent"); ?></label>
<div class="col-sm-9">
@@ -608,7 +637,6 @@
</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">