mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

remove /map (not used)

pull/2810/head
abarrau 2023-12-27 20:10:45 +01:00
rodzic c05d553657
commit fb21c33a1a
3 zmienionych plików z 2 dodań i 74 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

31
application/controllers/Map.php
Wyświetl plik

@ -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;

14
application/models/Logbook_model.php
Wyświetl plik

@ -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) {

31
application/views/interface_assets/footer.php
Wyświetl plik

@ -762,37 +762,6 @@ function showActivatorsMap(call, count, grids) {
</script>
<?php } ?>
<?php if ($this->uri->segment(1) == "map" && $this->uri->segment(2) == "") { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>
<script type="text/javascript">
$(function () {
$('[data-bs-toggle="tooltip"]').tooltip()
});
<?php if($qra == "set") { ?>
var q_lat = <?php echo $qra_lat; ?>;
var q_lng = <?php echo $qra_lng; ?>;
<?php } else { ?>
var q_lat = 40.313043;
var q_lng = -32.695312;
<?php } ?>
var qso_loc = '<?php echo site_url('map/map_plot_json');?>';
var q_zoom = 2;
$(document).ready(function(){
<?php if ($this->config->item('map_gridsquares') != FALSE) { ?>
var grid = "Yes";
<?php } else { ?>
var grid = "No";
<?php } ?>
initmap(grid,'map',{'dataPost':{'isFull':true}});
});
</script>
<?php } ?>
<?php if ($this->uri->segment(1) == "" || $this->uri->segment(1) == "dashboard" ) { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>