From 6bfdd8a3d505e566af5101cdc516271c6f424a27 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 5 Oct 2022 23:23:32 +0200 Subject: [PATCH] Hide SAT stuff if SAT band is disabled --- application/controllers/Activated_grids.php | 2 ++ application/controllers/Gridsquares.php | 2 ++ application/controllers/Qso.php | 3 ++- application/controllers/Statistics.php | 2 ++ application/views/activated_grids/main.php | 2 ++ application/views/gridsquares/main.php | 4 +++- application/views/qso/index.php | 2 ++ application/views/statistics/index.php | 2 ++ 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/application/controllers/Activated_grids.php b/application/controllers/Activated_grids.php index aab6ca04..2bbbaf84 100644 --- a/application/controllers/Activated_grids.php +++ b/application/controllers/Activated_grids.php @@ -19,6 +19,7 @@ class Activated_grids extends CI_Controller { public function index() { // if there are no satellite QSOs redirect to band selection directly $this->load->model('logbook_model'); + $this->load->model('bands'); $total_sat = $this->logbook_model->total_sat(); if ($total_sat->num_rows() == 0) { redirect('activated_grids/band/2m'); @@ -26,6 +27,7 @@ class Activated_grids extends CI_Controller { } $data['page_title'] = "Activated Gridsquare Map"; + $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->view('interface_assets/header', $data); $this->load->view('activated_grids/main.php'); diff --git a/application/controllers/Gridsquares.php b/application/controllers/Gridsquares.php index 0034963d..87dbafe0 100644 --- a/application/controllers/Gridsquares.php +++ b/application/controllers/Gridsquares.php @@ -19,6 +19,7 @@ class Gridsquares extends CI_Controller { public function index() { // if there are no satellite QSOs redirect to band selection directly $this->load->model('logbook_model'); + $this->load->model('bands'); $total_sat = $this->logbook_model->total_sat(); if ($total_sat->num_rows() == 0) { redirect('gridsquares/band/2m'); @@ -26,6 +27,7 @@ class Gridsquares extends CI_Controller { } $data['page_title'] = "Gridsquare Map"; + $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->view('interface_assets/header', $data); $this->load->view('gridsquares/main.php'); diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 491da78d..6652b5f7 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -37,7 +37,8 @@ class QSO extends CI_Controller { $data['dxcc'] = $this->logbook_model->fetchDxcc(); $data['iota'] = $this->logbook_model->fetchIota(); $data['modes'] = $this->modes->active(); - $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); + $data['bands'] = $this->bands->get_user_bands_for_qso_entry(); + $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $this->load->library('form_validation'); diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index 4e3a33ec..9d187b13 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -5,6 +5,7 @@ class Statistics extends CI_Controller { public function index() { $this->load->model('user_model'); + $this->load->model('bands'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { if($this->user_model->validate_session()) { $this->user_model->clear_session(); @@ -17,6 +18,7 @@ class Statistics extends CI_Controller { // Set Page Title $data['page_title'] = "Statistics"; + $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); // Load Views $this->load->view('interface_assets/header', $data); diff --git a/application/views/activated_grids/main.php b/application/views/activated_grids/main.php index bb753951..1858097a 100644 --- a/application/views/activated_grids/main.php +++ b/application/views/activated_grids/main.php @@ -12,7 +12,9 @@

diff --git a/application/views/gridsquares/main.php b/application/views/gridsquares/main.php index 6ed99789..511b0fa4 100644 --- a/application/views/gridsquares/main.php +++ b/application/views/gridsquares/main.php @@ -12,7 +12,9 @@

- \ No newline at end of file + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 30e1fe6d..9cdb213d 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -21,9 +21,11 @@ lang->line('general_word_general'); ?> + + + +