diff --git a/application/controllers/Hamsat.php b/application/controllers/Hamsat.php index afcf37ee0..10d590aa5 100644 --- a/application/controllers/Hamsat.php +++ b/application/controllers/Hamsat.php @@ -18,6 +18,34 @@ class Hamsat extends CI_Controller { 'assets/js/sections/hamsat.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/hamsat.js")), ]; + // Get Date format + if($this->session->userdata('user_date_format')) { + // If Logged in and session exists + $pageData['custom_date_format'] = $this->session->userdata('user_date_format'); + } else { + // Get Default date format from /config/wavelog.php + $pageData['custom_date_format'] = $this->config->item('qso_date_format'); + } + + switch ($pageData['custom_date_format']) { + case "d/m/y": $pageData['custom_date_format'] = 'DD/MM/YY'; break; + case "d/m/Y": $pageData['custom_date_format'] = 'DD/MM/YYYY'; break; + case "m/d/y": $pageData['custom_date_format'] = 'MM/DD/YY'; break; + case "m/d/Y": $pageData['custom_date_format'] = 'MM/DD/YYYY'; break; + case "d.m.Y": $pageData['custom_date_format'] = 'DD.MM.YYYY'; break; + case "y/m/d": $pageData['custom_date_format'] = 'YY/MM/DD'; break; + case "Y-m-d": $pageData['custom_date_format'] = 'YYYY-MM-DD'; break; + case "M d, Y": $pageData['custom_date_format'] = 'MMM DD, YYYY'; break; + case "M d, y": $pageData['custom_date_format'] = 'MMM DD, YY'; break; + default: $pageData['custom_date_format'] = 'DD/MM/YYYY'; + } + + $footerData = []; + $footerData['scripts'] = [ + 'assets/js/moment.min.js', + 'assets/js/datetime-moment.js' + ]; + $hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'workable'))->result(); if (count($hkey_opt)>0) { $data['user_hamsat_workable_only'] = $hkey_opt[0]->option_value; @@ -34,8 +62,8 @@ class Hamsat extends CI_Controller { // Load public view $data['page_title'] = "Hamsat - Satellite Roving"; $this->load->view('interface_assets/header', $data); - $this->load->view('/hamsat/index'); - $this->load->view('interface_assets/footer'); + $this->load->view('/hamsat/index', $pageData); + $this->load->view('interface_assets/footer'); //, $footerData); } public function activations() { diff --git a/application/views/hamsat/index.php b/application/views/hamsat/index.php index 796a2c615..312d55e3f 100644 --- a/application/views/hamsat/index.php +++ b/application/views/hamsat/index.php @@ -1,3 +1,7 @@ +