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

[Custom Map] Cleaned up the code a little bit. Swapped station profile name to logbook name in the view.

Browse Source
This commit is contained in:
Andreas
2021-09-20 22:03:39 +02:00
parent 9311e7c85a
commit 9a6b6263bb
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/controllers/Map.php
View File

@@ -40,8 +40,8 @@ class Map extends CI_Controller {
$data['worked_bands'] = $this->dxcc->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
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 {
@@ -55,7 +55,7 @@ class Map extends CI_Controller {
$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')) {
if($this->session->userdata('user_locator')) {
$this->load->library('qra');
$qra_position = $this->qra->qra2latlong($this->session->userdata('user_locator'));
@@ -64,17 +64,17 @@ class Map extends CI_Controller {
$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);
$CI =& get_instance();
$CI->load->model('logbooks_model');
$result = $CI->logbooks_model->logbook($this->session->userdata('active_station_logbook'))->result();
$logbook_name = $result[0]->logbook_name;
// load the view
$data['station_profile'] = $station_data;*/
$data['logbook_name'] = $logbook_name;
$data['page_title'] = "Map QSOs";
if ($this->input->post('from')) {
$from = $this->input->post('from');
$from = DateTime::createFromFormat('m/d/Y g:i A', $from);
@@ -93,7 +93,6 @@ class Map extends CI_Controller {
$footer_data['date_to'] = $temp_to->format('Y-m-d H:i:00');
}
$this->load->view('interface_assets/header', $data);
$this->load->view('map/custom_date');
$this->load->view('interface_assets/footer',$footer_data);

4
application/views/map/custom_date.php
View File

@@ -1,6 +1,6 @@
<div class="container custom-map-QSOs">
<h2>Station Profile QSOs (Custom Date)</h2>
<h2><?php echo $logbook_name ?> logbook QSOs (Custom Date)</h2>
<?php if($this->session->flashdata('notice')) { ?>
<div class="alert alert-info" role="alert">
@@ -55,4 +55,4 @@
<!-- Map -->
<div id="map" style="width: 100%; height: 700px;"></div>
<div class="alert alert-success" role="alert">Showing QSOs for Custom Date</div>
<div class="alert alert-success" role="alert">Showing QSOs for Custom Date for Active Logbook <?php echo $logbook_name ?></div>