Merge pull request #871 from AndreasK79/master

Fetches state from previous QSO. Fixes #854
这个提交包含在:
Peter Goodhall 2021-02-08 13:05:16 +00:00 提交者 GitHub
当前提交 42a8657fbb
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 21 次插入0 次删除

查看文件

@ -130,6 +130,7 @@ class Logbook extends CI_Controller {
$return['callsign_qth'] = $this->logbook_model->call_qth($callsign);
$return['callsign_iota'] = $this->logbook_model->call_iota($callsign);
$return['qsl_manager'] = $this->logbook_model->call_qslvia($callsign);
$return['callsign_state'] = $this->logbook_model->call_state($callsign);
$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base);
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);

查看文件

@ -661,6 +661,26 @@ class Logbook_model extends CI_Model {
return $qsl_via;
}
function call_state($callsign) {
$this->db->select('COL_CALL, COL_STATE');
$this->db->where('COL_CALL', $callsign);
$where = "COL_NAME != \"\"";
$this->db->where($where);
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit(1);
$query = $this->db->get($this->config->item('table_name'));
$name = "";
if ($query->num_rows() > 0)
{
$data = $query->row();
$qsl_state = $data->COL_STATE;
}
return $qsl_state;
}
function call_qth($callsign) {
$this->db->select('COL_CALL, COL_QTH, COL_TIME_ON');
$this->db->where('COL_CALL', $callsign);