diff --git a/application/controllers/Map.php b/application/controllers/Map.php index 456b23cb9..4e27c60ac 100644 --- a/application/controllers/Map.php +++ b/application/controllers/Map.php @@ -4,69 +4,13 @@ class Map extends CI_Controller { function index() { - redirect('map/custom'); - } - - function custom() - { - $this->load->model('bands'); - $this->load->model('modes'); - - $data['worked_bands'] = $this->bands->get_worked_bands(); // Used in the view for band select - $data['modes'] = $this->modes->active(); // Used in the view for mode select - - if ($this->input->post('band') != NULL) { // Band is not set when page first loads. - if ($this->input->post('band') == 'All') { // Did the user specify a band? If not, use all bands - $bands = $data['worked_bands']; - } - else { - $bands[] = $this->input->post('band'); - } - } - else { - $bands = $data['worked_bands']; - } - - $data['bands'] = $bands; // Used for displaying selected band(s) in the table in the view - - // Calculate Lat/Lng from Locator to use on Maps - if($this->session->userdata('user_locator')) { - $this->load->library('qra'); - - $qra_position = $this->qra->qra2latlong($this->session->userdata('user_locator')); - $data['qra'] = "set"; - $data['qra_lat'] = $qra_position[0]; - $data['qra_lng'] = $qra_position[1]; - } else { - $data['qra'] = "none"; - } - - $CI =& get_instance(); - $CI->load->model('logbooks_model'); - $result = $CI->logbooks_model->logbook($this->session->userdata('active_station_logbook'))->result(); - - if ($result) { - $logbook_name = $result[0]->logbook_name; - } else { - $logbook_name = ''; - } - - // load the view - $data['logbook_name'] = $logbook_name; - $data['page_title'] = "Map QSOs"; - - $data['date_from'] = $data['date_to'] = date('Y-m-d'); - - $this->load->view('interface_assets/header', $data); - $this->load->view('map/custom_date'); - $this->load->view('interface_assets/footer'); } // Generic fonction for return Json for MAP // public function map_plot_json() { $this->load->model('Stations'); $this->load->model('logbook_model'); - + // set informations // if ($this->input->post('isCustom') == true) { $date_from = xss_clean($this->input->post('date_from')); @@ -84,7 +28,7 @@ class Map extends CI_Controller { $plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result()); // [MAP Custom] ADD Station // $station_array = $this->Stations->get_station_array_for_map(); - + header('Content-Type: application/json; charset=utf-8'); echo json_encode(array_merge($plot_array, $station_array)); } diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php deleted file mode 100644 index ecc255df2..000000000 --- a/application/views/map/custom_date.php +++ /dev/null @@ -1,99 +0,0 @@ -
-
-

logbook QSOs (Custom Date)

- - session->flashdata('notice')) { ?> - - - -
-
-
- - -
- -
- - -
-
- -
-
- - -
- - -
- - -
- -
- - -
-
- -
-
- -
-
- -
-
-
- -
- - -
- - \ No newline at end of file