diff --git a/application/models/Eqsl_images.php b/application/models/Eqsl_images.php index e97cd324e..e17c90bb5 100644 --- a/application/models/Eqsl_images.php +++ b/application/models/Eqsl_images.php @@ -27,7 +27,7 @@ class Eqsl_images extends CI_Model { function eqsl_qso_list() { $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - $this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_SAT_NAME, image_file'); + $this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_SAT_NAME, COL_EQSL_QSLRDATE, image_file'); $this->db->join($this->config->item('table_name'), 'qso_id = COL_PRIMARY_KEY', 'left outer'); $this->db->join('station_profile', $this->config->item('table_name').'.station_id = station_profile.station_id', 'left outer'); $this->db->where_in('station_profile.station_id', $logbooks_locations_array); diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php index b9723b5b8..4382fada0 100644 --- a/application/views/eqslcard/index.php +++ b/application/views/eqslcard/index.php @@ -13,13 +13,13 @@ session->userdata('user_date_format')) { - // If Logged in and session exists - $custom_date_format = $this->session->userdata('user_date_format'); - } else { - // Get Default date format from /config/wavelog.php - $custom_date_format = $this->config->item('qso_date_format'); - } + if($this->session->userdata('user_date_format')) { + // If Logged in and session exists + $custom_date_format = $this->session->userdata('user_date_format'); + } else { + // Get Default date format from /config/wavelog.php + $custom_date_format = $this->config->item('qso_date_format'); + } if (is_array($qslarray->result())) { echo ' @@ -30,7 +30,7 @@ - + '; @@ -38,19 +38,21 @@ foreach ($qslarray->result() as $qsl) { echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo ''; }
'.$this->lang->line('general_word_date').' '.$this->lang->line('general_word_time').' '.$this->lang->line('gen_hamradio_band').''.$this->lang->line('gen_hamradio_qsl').''.$this->lang->line('gen_hamradio_qsl').' '.$this->lang->line('general_word_date').'
' . str_replace("0","Ø",$qsl->COL_CALL) . ''; - echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; - echo ''; - $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); - echo ''; - $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); - echo ''; - if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; - echo '' . $qsl->image_file . ''; + echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; + echo ''; + $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); + echo ''; + $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); + echo ''; + if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; + echo ''; + $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); + echo '