mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

take station_callsign from station_profile

pull/354/head
Kim Huebel 2019-09-28 17:35:57 +02:00
rodzic e301c569a3
commit 3ee091a9df
2 zmienionych plików z 26 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/controllers/Qslprint.php
Wyświetl plik

@ -54,7 +54,7 @@ class QSLPrint extends CI_Controller {
// file creation
$file = fopen('php://output', 'w');
$header = array("COL_STATION_CALLSIGN",
$header = array("STATION_CALLSIGN",
"COL_CALL",
"COL_QSL_VIA",
"COL_TIME_ON",
@ -73,7 +73,7 @@ class QSLPrint extends CI_Controller {
foreach ($myData->result() as $qso) {
fputcsv($file,
array($qso->COL_STATION_CALLSIGN,
array($qso->STATION_CALLSIGN,
str_replace("0", "Ø", $qso->COL_CALL),
$qso->COL_QSL_VIA!=""?"Via ".str_replace("0", "Ø", $qso->COL_QSL_VIA):"",
$qso->COL_TIME_ON,

25
application/models/Logbook_model.php
Wyświetl plik

@ -422,7 +422,30 @@ class Logbook_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$query = $this->db->query('SELECT COL_PRIMARY_KEY, COL_CALL, COL_STATION_CALLSIGN, COL_QSL_VIA, COL_TIME_ON, COL_MODE, COL_FREQ, UPPER(COL_BAND) as COL_BAND, COL_RST_SENT, COL_SAT_NAME, COL_SAT_MODE, COL_QSL_RCVD, (CASE WHEN COL_QSL_VIA != \'\' THEN COL_QSL_VIA ELSE COL_CALL END) AS COL_ROUTING, ADIF, ENTITY FROM '.$this->config->item('table_name').', dxcc_prefixes WHERE COL_QSL_SENT LIKE \'R\' 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 station_id = '.$station_id.' ORDER BY adif, col_routing');
$query = $this->db->query('SELECT
STATION_CALLSIGN,
COL_PRIMARY_KEY,
COL_CALL,
COL_QSL_VIA,
COL_TIME_ON,
COL_MODE,
COL_FREQ,
UPPER(COL_BAND) as COL_BAND,
COL_RST_SENT,
COL_SAT_NAME,
COL_SAT_MODE,
COL_QSL_RCVD,
(CASE WHEN COL_QSL_VIA != \'\' THEN COL_QSL_VIA ELSE COL_CALL END) AS COL_ROUTING,
ADIF,
ENTITY
FROM '.$this->config->item('table_name').', dxcc_prefixes, station_profile
WHERE
COL_QSL_SENT LIKE \'R\'
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 '.$this->config->item('table_name').'.station_id = '.$station_id.'
and '.$this->config->item('table_name').'.station_id = station_profile.station_id
ORDER BY adif, col_routing');
return $query;
}