diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php index c3520e4d..99cb800d 100644 --- a/application/models/Timeline_model.php +++ b/application/models/Timeline_model.php @@ -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')); } diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 42f94743..2ca3bc7d 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -106,15 +106,16 @@ # - Date + '.$ci->lang->line('general_word_date').' Prefix - Country - Deleted + '.$ci->lang->line('general_word_country').' + Status End Date Show QSOs @@ -129,7 +130,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, ' . $line->prefix . ' ' . $line->col_country . ' '; - if (!empty($line->end)) echo 'Yes'; + if (!empty($line->end)) echo ''.$ci->lang->line('gen_hamradio_deleted_dxcc').''; echo ' ' . $line->end . ' adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show @@ -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 ' - - + + @@ -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 '
#DateState'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_state').' Show QSOs
- - + + @@ -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 '
#DateIota'.$ci->lang->line('general_word_date').'IOTA Name Prefix Show QSOs
- + @@ -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 '
#Date'.$ci->lang->line('general_word_date').' CQ Zone Show QSOs
- - + +
#DateGridsquare'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_gridsquare').' Show QSOs