From 9d4c40e44c3195e4884a061123ff5b372de44ab1 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Mon, 14 Sep 2020 20:24:57 +0200
Subject: [PATCH] Measurement_base in config is now fallback if not set in user
 profile.

---
 application/controllers/Logbook.php           | 36 ++++++++++++++++---
 .../049_add_users_measurement_base.php        |  2 +-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 2598459f..f922fa16 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -94,12 +94,19 @@ class Logbook extends CI_Controller {
 	// Do we have local data for the Callsign?
 	if($this->logbook_model->call_name($callsign) != null)
 	{
+        if ($this->session->userdata('user_measurement_base') == NULL) {
+             $measurement_base = $this->config->item('measurement_base');
+        }
+        else {
+            $measurement_base = $this->session->userdata('user_measurement_base');
+        }
+
 		$return['callsign_name'] = $this->logbook_model->call_name($callsign);
 		$return['callsign_qra'] = $this->logbook_model->call_qra($callsign);
 		$return['callsign_qth'] = $this->logbook_model->call_qth($callsign);
 		$return['callsign_iota'] = $this->logbook_model->call_iota($callsign);
 		$return['qsl_manager'] = $this->logbook_model->call_qslvia($callsign);
-		$return['bearing'] = $this->bearing($return['callsign_qra'], $this->session->userdata('user_measurement_base'));
+		$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base);
 		$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
 
 		if ($return['callsign_qra'] != "") {
@@ -161,7 +168,15 @@ class Logbook extends CI_Controller {
 		}
 		$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
 	}
-	$return['bearing'] = $this->bearing($return['callsign_qra'], $this->session->userdata('user_measurement_base'));
+
+    if ($this->session->userdata('user_measurement_base') == NULL) {
+        $measurement_base = $this->config->item('measurement_base');
+    }
+    else {
+        $measurement_base = $this->session->userdata('user_measurement_base');
+    }
+
+	$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base);
 
 	echo json_encode($return, JSON_PRETTY_PRINT);
 
@@ -367,7 +382,13 @@ class Logbook extends CI_Controller {
 
 		$this->load->model('logbook_model');
 		$data['query'] = $this->logbook_model->get_qso($id);
-		$data['measurement_base'] = $this->session->userdata('user_measurement_base');
+
+        if ($this->session->userdata('user_measurement_base') == NULL) {
+            $data['measurement_base'] = $this->config->item('measurement_base');
+        }
+        else {
+            $data['measurement_base'] = $this->session->userdata('user_measurement_base');
+        }
 
 		$this->load->view('interface_assets/mini_header', $data);
 		$this->load->view('view_log/qso');
@@ -591,7 +612,14 @@ class Logbook extends CI_Controller {
 					$mylocator = $this->config->item('locator');
 				}
 
-				$bearing = $this->qra->bearing($mylocator, $locator, $this->session->userdata('user_measurement_base'));
+                if ($this->session->userdata('user_measurement_base') == NULL) {
+                    $measurement_base = $this->config->item('measurement_base');
+                }
+                else {
+                    $measurement_base = $this->session->userdata('user_measurement_base');
+                }
+
+				$bearing = $this->qra->bearing($mylocator, $locator, $measurement_base);
 
 				echo $bearing;
 			}
diff --git a/application/migrations/049_add_users_measurement_base.php b/application/migrations/049_add_users_measurement_base.php
index 34c5a7ee..3dec9eb6 100644
--- a/application/migrations/049_add_users_measurement_base.php
+++ b/application/migrations/049_add_users_measurement_base.php
@@ -7,7 +7,7 @@ class Migration_add_stationprofile_measurement_base extends CI_Migration {
     public function up()
     {
         $fields = array(
-            'user_measurement_base varchar(1) DEFAULT "K"',
+            'user_measurement_base varchar(1)',
         );
 
         $this->dbforge->add_column('users', $fields);