From ff25d804aa0f1eadfedcf15952cf7ab8dd101f49 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 28 May 2024 10:04:01 +0200
Subject: [PATCH] Reduces same db calls
---
application/controllers/Dashboard.php | 1 +
application/views/dashboard/index.php | 10 +++++-----
application/views/interface_assets/header.php | 8 +++++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 1ee7e8bc6..2968cbcf6 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -50,6 +50,7 @@ class Dashboard extends CI_Controller {
$data['current_active'] = $this->stations->find_active();
$data['themesWithoutMode'] = $this->setup_model->checkThemesWithoutMode();
+ $data['dashboard_map'] = $this->optionslib->get_option('dashboard_map');
$setup_required = false;
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index a00b5d49a..5dca5035a 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -30,12 +30,12 @@ function echo_table_col($row, $name) {
case 'SOTA': echo '| ' . ($row->COL_SOTA_REF) . ' | '; break;
case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ' | '; break;
case 'POTA': echo '' . ($row->COL_POTA_REF) . ' | '; break;
- case 'Grid':
+ case 'Grid':
$ci->load->library('qra');
echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Distance': echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { echo strtolower($row->COL_BAND); } echo ''; break;
- case 'Frequency':
+ case 'Frequency':
$ci->load->library('frequency');
echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
@@ -114,7 +114,7 @@ function echo_table_col($row, $name) {
-optionslib->get_option('dashboard_map') != "false" && $this->optionslib->get_option('dashboard_map') != "map_at_right") { ?>
+
@@ -184,7 +184,7 @@ function echo_table_col($row, $name) {
- optionslib->get_option('dashboard_map') == "map_at_right") { ?>
+
@@ -192,7 +192,7 @@ function echo_table_col($row, $name) {
-
+
| |
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 43313e8b7..d45796570 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -15,12 +15,14 @@
- optionslib->get_theme()) { ?>
-
+ optionslib->get_theme();
+ if ($theme) { ?>
+
-
+