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

/logbook now shows the station_callsign used

pull/355/head
Peter Goodhall 2019-09-24 22:54:37 +01:00
rodzic ecd7f7f6ac
commit 26e4fd16ef
3 zmienionych plików z 20 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/config/cloudlog.php
Wyświetl plik

@ -73,4 +73,6 @@ $config['cat_timeout_interval'] = 300;
|
*/
$config['public_search'] = FALSE;
$config['public_search'] = FALSE;
$config['callsign_tags'] = TRUE;

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

@ -422,12 +422,16 @@ class Logbook_model extends CI_Model {
}
function get_qsos($num, $offset) {
$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX, COL_STX_STRING, COL_SRX, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD, COL_VUCC_GRIDS');
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
$this->db->from($this->config->item('table_name'));
$query = $this->db->get($this->config->item('table_name'), $num, $offset);
$this->db->join('station_profile', 'station_profile.station_id = TABLE_HRD_CONTACTS_V01.station_id');
$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
return $query;
$this->db->limit($num);
$this->db->offset($offset);
return $this->db->get();
}
function get_clublog_qsos(){

16
application/views/view_log/partial/log.php
Wyświetl plik

@ -19,6 +19,7 @@
<?php if($this->session->userdata('user_lotw_name') != "") { ?>
<td>LoTW</td>
<?php } ?>
<td>Station</td>
<td></td>
<?php } ?>
</tr>
@ -61,6 +62,14 @@
</td>
<?php } ?>
<?php if($this->config->item('callsign_tags') == true) { ?>
<?php if($row->station_callsign != null) { ?>
<td>
<span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
</td>
<?php } ?>
<?php } ?>
<td>
<div class="dropdown">
<a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -83,13 +92,6 @@
</div>
</div>
</td>
<?php if($this->config->item('callsign_tags') == true) { ?>
<?php if($row->COL_STATION_CALLSIGN != null) { ?>
<td><span class="label notice"><?php echo $row->COL_STATION_CALLSIGN; ?></span></td>
<?php } elseif($row->COL_OPERATOR != null) { ?>
<td><span class="label notice"><?php echo $row->COL_OPERATOR; ?></span></td>
<?php } ?>
<?php } ?>
<?php } ?>
</tr>
<?php $i++; } ?>