diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php
index 121d3582..18f6f7aa 100644
--- a/application/controllers/Eqsl.php
+++ b/application/controllers/Eqsl.php
@@ -103,6 +103,7 @@ class eqsl extends CI_Controller {
$this->load->model('logbook_model');
$data['page_title'] = "eQSL QSO Upload";
+ $custom_date_format = $this->session->userdata('user_date_format');
if ($this->input->post('eqslexport') == "export")
{
@@ -122,9 +123,10 @@ class eqsl extends CI_Controller {
// perform an HTTP get on each one, and grab the status back
$qslsnotsent = $this->logbook_model->eqsl_not_yet_sent();
- $table = "
";
+ $table = "";
$table .= "";
$table .= "Date | ";
+ $table .= "Time | ";
$table .= "Call | ";
$table .= "Mode | ";
$table .= "Submode | ";
@@ -336,6 +338,7 @@ class eqsl extends CI_Controller {
$result = curl_exec($ch);
$chi = curl_getinfo($ch);
curl_close($ch);
+
/* Time for some error handling
Things we might get back
@@ -401,7 +404,9 @@ class eqsl extends CI_Controller {
}
}
$table .= "
";
- $table .= "".$qsl['COL_TIME_ON']." | ";
+ $timestamp = strtotime($qsl['COL_TIME_ON']);
+ $table .= "".date($custom_date_format, $timestamp)." | ";
+ $table .= "".date('H:i', $timestamp)." | ";
$table .= "".str_replace("0","Ø",$qsl['COL_CALL'])." | ";
$table .= "".$qsl['COL_MODE']." | ";
if(isset($qsl['COL_SUBMODE'])) {
@@ -428,6 +433,7 @@ class eqsl extends CI_Controller {
$table = "";
$table .= "";
$table .= "Date | ";
+ $table .= "Time | ";
$table .= "Call | ";
$table .= "Mode | ";
$table .= "Submode | ";
@@ -438,7 +444,9 @@ class eqsl extends CI_Controller {
foreach ($qslsnotsent->result_array() as $qsl)
{
$table .= "
";
- $table .= "".$qsl['COL_TIME_ON']." | ";
+ $timestamp = strtotime($qsl['COL_TIME_ON']);
+ $table .= "".date($custom_date_format, $timestamp)." | ";
+ $table .= "".date('H:i', $timestamp)." | ";
$table .= "" . str_replace("0","Ø",strtoupper($qsl['COL_CALL'])) . " | ";
$table .= "".$qsl['COL_MODE']." | ";
diff --git a/application/views/eqsl/analysis.php b/application/views/eqsl/analysis.php
index af5be872..077e966e 100644
--- a/application/views/eqsl/analysis.php
+++ b/application/views/eqsl/analysis.php
@@ -1,4 +1,7 @@
+session->userdata('user_date_format');
+?>
0) { ?>
-
+
Date |
+ Time |
Call |
Mode |
Submode |
@@ -36,7 +40,9 @@
- |
+
+ |
+ |
|
|
|