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

Show deleted DXCC badge in timeline

pull/2085/head
phl0 2023-04-27 09:23:11 +02:00
rodzic 97a026077e
commit a485d9e72e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 48EA1E640798CA9A
2 zmienionych plików z 18 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/models/Timeline_model.php
Wyświetl plik

@ -217,6 +217,7 @@ class Timeline_model extends CI_Model
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC');
if ($band != 'All') {
if ($band == 'SAT') {
@ -240,6 +241,7 @@ class Timeline_model extends CI_Model
case 'waz': $this->db->where('COL_CQZ', $querystring); break;
case 'vucc': $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring); $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break;
}
$this->db->order_by('COL_TIME_ON', 'DEsC');
return $this->db->get($this->config->item('table_name'));
}

27
application/views/timeline/index.php
Wyświetl plik

@ -106,15 +106,16 @@
<?php
function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>Prefix</td>
<td>Country</td>
<td>Deleted</td>
<td>'.$ci->lang->line('general_word_country').'</td>
<td>Status</td>
<td>End Date</td>
<td>Show QSOs</td>
</tr>
@ -129,7 +130,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
<td>' . $line->prefix . '</td>
<td>' . $line->col_country . '</td>
<td>';
if (!empty($line->end)) echo 'Yes';
if (!empty($line->end)) echo '<span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>';
echo '</td>
<td>' . $line->end . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
@ -139,13 +140,14 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
}
function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>State</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_state').'</td>
<td>Show QSOs</td>
</tr>
</thead>
@ -164,13 +166,14 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $
}
function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>Iota</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>IOTA</td>
<td>Name</td>
<td>Prefix</td>
<td>Show QSOs</td>
@ -193,12 +196,13 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect,
}
function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>CQ Zone</td>
<td>Show QSOs</td>
</tr>
@ -218,13 +222,14 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $
}
function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>Gridsquare</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_gridsquare').'</td>
<td>Show QSOs</td>
</tr>
</thead>