Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved function from logbook_model to distancerecords_model

Browse Source
This commit is contained in:
Andreas Kristiansen
2024-09-02 16:24:06 +02:00
parent 958c550699
commit d483440462
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Distancerecords.php
View File

@@ -50,11 +50,11 @@ class Distancerecords extends CI_Controller {
}
public function sat_records_ajax() {
$this->load->model('logbook_model');
$this->load->model('distancerecords_model');
$sat = str_replace('"', "", $this->security->xss_clean($this->input->post("Sat")));
$searchmode = $this->input->post('searchmode') == null ? '' : $this->security->xss_clean($this->input->post('searchmode'));
$data['results'] = $this->logbook_model->sat_distances($sat);
$data['results'] = $this->distancerecords_model->sat_distances($sat);
$data['page_title'] = __("Log View")." - " . __("Satellite Distance Records");
$data['filter'] = $sat;

13
application/models/Distancerecords_model.php
View File

@@ -74,6 +74,19 @@ class Distancerecords_model extends CI_Model {
}
return($result);
}
public function sat_distances($sat){
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->where('COL_SAT_NAME', $sat);
$this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
$this->db->order_by("COL_DISTANCE", "desc");
$this->db->limit(500);
return $this->db->get($this->config->item('table_name'));
}
}
?>

15
application/models/Logbook_model.php
View File

@@ -419,17 +419,6 @@ class Logbook_model extends CI_Model {
return($row);
}
}
public function sat_distances($sat){
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->where('COL_SAT_NAME', $sat);
$this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
$this->db->order_by("COL_DISTANCE", "desc");
$this->db->limit(500);
return $this->db->get($this->config->item('table_name'));
}
/*
* Used to fetch QSOs from the logbook in the awards
@@ -623,7 +612,7 @@ class Logbook_model extends CI_Model {
return $this->db->get($this->config->item('table_name'));
}
public function vucc_qso_details($gridsquare, $band) {
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@@ -3402,7 +3391,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$this->db->where('COL_STATION_CALLSIGN', $station_callsign);
$this->db->where('COL_PRIMARY_KEY', $qsoid);
$this->db->update($this->config->item('table_name'), $data);
unset($data);