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 .= ""; + $table .= ""; $table .= ""; $table .= ""; $table .= ""; @@ -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 .= ""; + $timestamp = strtotime($qsl['COL_TIME_ON']); + $table .= ""; + $table .= ""; $table .= ""; $table .= ""; if(isset($qsl['COL_SUBMODE'])) { @@ -428,6 +433,7 @@ class eqsl extends CI_Controller { $table = "
DateTimeCallModeSubmode
".$qsl['COL_TIME_ON']."".date($custom_date_format, $timestamp)."".date('H:i', $timestamp)."".str_replace("0","Ø",$qsl['COL_CALL'])."".$qsl['COL_MODE']."
"; $table .= ""; $table .= ""; + $table .= ""; $table .= ""; $table .= ""; $table .= ""; @@ -438,7 +444,9 @@ class eqsl extends CI_Controller { foreach ($qslsnotsent->result_array() as $qsl) { $table .= ""; - $table .= ""; + $timestamp = strtotime($qsl['COL_TIME_ON']); + $table .= ""; + $table .= ""; $table .= ""; $table .= ""; 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'); +?>
@@ -25,9 +28,10 @@
0) { ?> -
DateTimeCallModeSubmode
".$qsl['COL_TIME_ON']."".date($custom_date_format, $timestamp)."".date('H:i', $timestamp)."" . str_replace("0","Ø",strtoupper($qsl['COL_CALL'])) . "".$qsl['COL_MODE']."
+
+ @@ -36,7 +40,9 @@ - + + +
DateTime Call Mode Submode