[Custom Maps] Fixes #1055 where time wasn't handled.
这个提交包含在:
父节点
656ff24744
当前提交
719581e6ec
共有 2 个文件被更改,包括 7 次插入 和 6 次删除
|
|
@ -58,18 +58,19 @@ class Map extends CI_Controller {
|
|||
if ($this->input->post('from')) {
|
||||
$from = $this->input->post('from');
|
||||
$from = DateTime::createFromFormat('m/d/Y g:i A', $from);
|
||||
$from = $from->format('Y-m-d');
|
||||
$from = $from->format('Y-m-d H:i');
|
||||
|
||||
$footer_data['date_from'] = $from;
|
||||
} else {
|
||||
$footer_data['date_from'] = date('Y-m-d');
|
||||
$footer_data['date_from'] = date('Y-m-d H:i:00');
|
||||
}
|
||||
if ($this->input->post('to')) {
|
||||
$to = DateTime::createFromFormat('m/d/Y g:i A', $this->input->post('to'));
|
||||
$to = $to->modify('+1 day')->format('Y-m-d');
|
||||
$to = $to->modify('+1 day')->format('Y-m-d H:i:00');
|
||||
$footer_data['date_to'] = $to;
|
||||
} else {
|
||||
$temp_to = new DateTime('tomorrow');
|
||||
$footer_data['date_to'] = $temp_to->format('Y-m-d');
|
||||
$footer_data['date_to'] = $temp_to->format('Y-m-d H:i:00');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -86,7 +87,7 @@ class Map extends CI_Controller {
|
|||
|
||||
$this->load->library('qra');
|
||||
|
||||
$qsos = $this->logbook_model->map_week_qsos($start_date, $end_date);
|
||||
$qsos = $this->logbook_model->map_week_qsos(rawurldecode($start_date), rawurldecode($end_date));
|
||||
|
||||
echo "{\"markers\": [";
|
||||
$count = 1;
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ function getLookupResult() {
|
|||
var q_lng = -32.695312;
|
||||
<?php } ?>
|
||||
|
||||
var qso_loc = '<?php echo site_url('map/map_data_custom/');?><?php echo urlencode($date_from); ?>/<?php echo urlencode($date_to); ?>';
|
||||
var qso_loc = '<?php echo site_url('map/map_data_custom/');?><?php echo rawurlencode($date_from); ?>/<?php echo rawurlencode($date_to); ?>';
|
||||
var q_zoom = 2;
|
||||
|
||||
$(document).ready(function(){
|
||||
|
|
|
|||
正在加载…
在新工单中引用