diff --git a/application/controllers/Map.php b/application/controllers/Map.php index 5fffb50d..456b23cb 100644 --- a/application/controllers/Map.php +++ b/application/controllers/Map.php @@ -3,32 +3,8 @@ class Map extends CI_Controller { - function index() - { - - // 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"; - } - - $this->load->model('Stations'); - $station_id = $this->Stations->find_active(); - $station_data = $this->Stations->profile_clean($station_id); - - // load the view - $data['station_profile'] = $station_data; - $data['page_title'] = "Map QSOs"; - - $this->load->view('interface_assets/header', $data); - $this->load->view('map/qsos'); - $this->load->view('interface_assets/footer'); + function index() { + redirect('map/custom'); } function custom() @@ -99,9 +75,6 @@ class Map extends CI_Controller { $mode = xss_clean($this->input->post('mode')); $prop_mode = xss_clean($this->input->post('prop_mode')); $qsos = $this->logbook_model->map_custom_qsos($date_from, $date_to, $band, $mode, $prop_mode); - } else if ($this->input->post('isFull') == true) { - $station_id = $this->Stations->find_active(); - $qsos = $this->logbook_model->get_qsos(null,null,array($station_id)); // no limit for full // } else { $nb_qso = (intval($this->input->post('nb_qso'))>0)?xss_clean($this->input->post('nb_qso')):18; $offset = (intval($this->input->post('offset'))>0)?xss_clean($this->input->post('offset')):null; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 2e09c4ef..c7b67846 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2223,20 +2223,6 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = } } - /* Return QSOs for the year for the active profile */ - function map_all_qsos_for_active_station_profile() { - $CI =& get_instance(); - $CI->load->model('stations'); - $station_id = $CI->stations->find_active(); - - $this->db->where("station_id", $station_id); - $this->db->order_by("COL_TIME_ON", "ASC"); - $query = $this->db->get($this->config->item('table_name')); - - return $query; - } - - /* Return QSOs made during the current Year */ function year_qsos($StationLocationsArray = null, $api_key = null) { diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index e8e27b91..6fd88b70 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -762,37 +762,6 @@ function showActivatorsMap(call, count, grids) { -uri->segment(1) == "map" && $this->uri->segment(2) == "") { ?> - - - - - uri->segment(1) == "" || $this->uri->segment(1) == "dashboard" ) { ?>