added station profile check to bearing as well (used on change of

callsign, not on change of grid locator)

application/controllers/Logbook.php

@@ -73,7 +73,7 @@ class Logbook extends CI_Controller {
         echo json_encode($return, JSON_PRETTY_PRINT);
     }
 
-	function json($callsign, $type, $band, $mode)
+	function json($callsign, $type, $band, $mode, $station_id = null)
 	{
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
@@ -104,8 +104,6 @@ class Logbook extends CI_Controller {
 			$lotw_member = "not found";
 		}
 
-
-
 		// Check Database for all other data
 		$this->load->model('logbook_model');
 
@@ -131,8 +129,7 @@ class Logbook extends CI_Controller {
 		{
 			if ($this->session->userdata('user_measurement_base') == NULL) {
 				$measurement_base = $this->config->item('measurement_base');
-        }
+			} else {
-        else {
 				$measurement_base = $this->session->userdata('user_measurement_base');
 			}
 
@@ -142,7 +139,7 @@ class Logbook extends CI_Controller {
 			$return['callsign_iota'] = $this->logbook_model->call_iota($callsign);
 			$return['qsl_manager'] = $this->logbook_model->call_qslvia($callsign);
 			$return['callsign_state'] = $this->logbook_model->call_state($callsign);
-		$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base);
+			$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id);
 			$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
 
 			if ($return['callsign_qra'] != "") {
@@ -153,10 +150,8 @@ class Logbook extends CI_Controller {
 			return;
 		}
 
-
 		$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname'));
 
-
 		if (isset($callbook))
 		{
 			$return['callsign_name'] = $callbook['name'];
@@ -177,12 +172,11 @@ class Logbook extends CI_Controller {
 
 		if ($this->session->userdata('user_measurement_base') == NULL) {
 			$measurement_base = $this->config->item('measurement_base');
-    }
+		} else {
-    else {
 			$measurement_base = $this->session->userdata('user_measurement_base');
 		}
 
-	$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base);
+		$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id);
 
 		echo json_encode($return, JSON_PRETTY_PRINT);
 
@@ -691,19 +685,28 @@ class Logbook extends CI_Controller {
 	}
 
 	/* return station bearing */
-	function bearing($locator, $unit = 'M') {
+	function bearing($locator, $unit = 'M', $station_id = null) {
 			$this->load->library('Qra');
 
-
 			if($locator != null) {
-				if($this->session->userdata('user_locator') != null){
+				if (isset($station_id)) {
+					// be sure that station belongs to user
+					$this->load->model('Stations');
+					if (!$this->Stations->check_station_is_accessible($station_id)) {
+						return "";
+					}
+
+					// get station profile
+					$station_profile = $this->Stations->profile_clean($station_id);
+
+					// get locator
+					$mylocator = $station_profile->station_gridsquare;
+				} else if($this->session->userdata('user_locator') != null){
 					$mylocator = $this->session->userdata('user_locator');
 				} else {
 					$mylocator = $this->config->item('locator');
 				}
 
-
-
 				$bearing = $this->qra->bearing($mylocator, $locator, $unit);
 
 				return $bearing;

assets/js/sections/qso.js

@@ -296,7 +296,7 @@ $("#callsign").focusout(function() {
 		find_callsign.replace(/\//g, "-");
 
 		// Replace / in a callsign with - to stop urls breaking
-		$.getJSON('logbook/json/' + find_callsign.replace(/\//g, "-") + '/' + sat_type + '/' + json_band + '/' + json_mode, function(result)
+		$.getJSON('logbook/json/' + find_callsign.replace(/\//g, "-") + '/' + sat_type + '/' + json_band + '/' + json_mode + '/' + $('#stationProfile').val(), function(result)
 		{
 			// Make sure the typed callsign and temp callsign match
 			if($('#callsign').val = temp_callsign){