reworked QSL-Indicators and print-functions to not only use "R" but also

look for "Q" (Queued)... this is logically better if you initiate QSL-sending
by your own... R is for requested by other station to send...

Now we are back to ADIF-Specs-logic :-)
这个提交包含在:
Kim Huebel 2020-05-25 23:05:21 +02:00
父节点 0c11f4e9a7
当前提交 6813237c59
共有 6 个文件被更改,包括 22 次插入4 次删除

查看文件

@ -425,9 +425,15 @@ class Logbook extends CI_Controller {
case "Y": case "Y":
$html .= "green"; $html .= "green";
break; break;
case "Q":
$html .= "yellow";
break;
case "R": case "R":
$html .= "yellow"; $html .= "yellow";
break; break;
case "I":
echo "grey";
break;
default: default:
$html .= "red"; $html .= "red";
} }
@ -437,9 +443,15 @@ class Logbook extends CI_Controller {
case "Y": case "Y":
$html .= "green"; $html .= "green";
break; break;
case "Q":
$html .= "yellow";
break;
case "R": case "R":
$html .= "yellow"; $html .= "yellow";
break; break;
case "I":
echo "grey";
break;
default: default:
$html .= "red"; $html .= "red";
} }

查看文件

@ -24,7 +24,7 @@ class adif_data extends CI_Model {
$active_station_id = $this->stations->find_active(); $active_station_id = $this->stations->find_active();
$this->db->where('station_id', $active_station_id); $this->db->where('station_id', $active_station_id);
$this->db->where('COL_QSL_SENT', 'R'); $this->db->where_in('COL_QSL_SENT', array('R', 'Q'));
$this->db->order_by("COL_TIME_ON", "ASC"); $this->db->order_by("COL_TIME_ON", "ASC");
$query = $this->db->get($this->config->item('table_name')); $query = $this->db->get($this->config->item('table_name'));

查看文件

@ -780,7 +780,7 @@ class Logbook_model extends CI_Model {
ENTITY ENTITY
FROM '.$this->config->item('table_name').', dxcc_prefixes, station_profile FROM '.$this->config->item('table_name').', dxcc_prefixes, station_profile
WHERE WHERE
COL_QSL_SENT LIKE \'R\' COL_QSL_SENT in (\'R\', \'Q\')
and (CASE WHEN COL_QSL_VIA != \'\' THEN COL_QSL_VIA ELSE COL_CALL END) like CONCAT(dxcc_prefixes.call,\'%\') and (CASE WHEN COL_QSL_VIA != \'\' THEN COL_QSL_VIA ELSE COL_CALL END) like CONCAT(dxcc_prefixes.call,\'%\')
and (end is null or end > now()) and (end is null or end > now())
and '.$this->config->item('table_name').'.station_id = '.$station_id.' and '.$this->config->item('table_name').'.station_id = '.$station_id.'

查看文件

@ -18,7 +18,7 @@ class Qslprint_model extends CI_Model {
'COL_QSL_SENT_VIA' => "B", 'COL_QSL_SENT_VIA' => "B",
); );
$this->db->where("COL_QSL_SENT", "R"); $this->db->where_in("COL_QSL_SENT", array("R","Q"));
$this->db->where("station_id", $station_id); $this->db->where("station_id", $station_id);
$this->db->update($this->config->item('table_name'), $data); $this->db->update($this->config->item('table_name'), $data);
} }

查看文件

@ -16,7 +16,7 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title"></h5> <h5 class="card-title"></h5>
<p class="card-text"> <p class="card-text">
Here you can export requested QSLs as CSV-file or ADIF and mark them as sent via buro in a mass transaction if you like. The considered QSOs for this functions would be those of the active station profile. Here you can export requested QSLs as CSV-file or ADIF and mark them as sent via buro in a mass transaction if you like. Requested QSOs are QSOs marked as "Requested" or "Queued" in the QSL-sent-field. The considered QSOs for this functions would be those of the active station profile.
</p> </p>

查看文件

@ -49,6 +49,9 @@
case "Y": case "Y":
echo "green"; echo "green";
break; break;
case "Q":
echo "yellow";
break;
case "R": case "R":
echo "yellow"; echo "yellow";
break; break;
@ -64,6 +67,9 @@
case "Y": case "Y":
echo "green"; echo "green";
break; break;
case "Q":
echo "yellow";
break;
case "R": case "R":
echo "yellow"; echo "yellow";
break; break;