goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Fixed "mark as sent" to not overwrite the method (only if empty)

浏览代码
这个提交包含在：
int2001 2023-12-14 07:10:24 +00:00
父节点 c43ab44219
当前提交 72d69f6d88
找不到此签名对应的密钥
GPG 密钥 ID: DFB1C13CD2DB037B
共有 2 个文件被更改，包括 21 次插入 和 15 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

8
application/models/Logbook_model.php
查看文件

@ -1485,12 +1485,18 @@ class Logbook_model extends CI_Model {
// Set Paper to sent // Set Paper to sent
function paperqsl_update_sent($qso_id, $method) { function paperqsl_update_sent($qso_id, $method) {
if ($this->logbook_model->check_qso_is_accessible($qso_id)) { if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
if ($method != '') {
$data = array( $data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'), 'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y', 'COL_QSL_SENT' => 'Y',
'COL_QSL_SENT_VIA' => $method 'COL_QSL_SENT_VIA' => $method
); );
} else {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y'
);
}
$this->db->where('COL_PRIMARY_KEY', $qso_id); $this->db->where('COL_PRIMARY_KEY', $qso_id);

2
application/views/qslprint/qslprint.php
查看文件

@ -56,7 +56,7 @@ if ($qsos->result() != NULL) {
echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>'; echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>'; echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>'; echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>'; echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \''. $qsl->COL_QSL_SENT_VIA. '\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>'; echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>';
echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>'; echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
echo '</tr>'; echo '</tr>';