goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

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

浏览代码 
callsign, not on change of grid locator)
这个提交包含在：
Thomas Werzmirzowsky 2021-12-31 17:49:44 +01:00
父节点 451fd1e943
当前提交 ea1cf0141a
共有 2 个文件被更改，包括 85 次插入 和 82 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

165
application/controllers/Logbook.php
查看文件

@ -73,7 +73,7 @@ class Logbook extends CI_Controller {
echo json_encode($return, JSON_PRETTY_PRINT); 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'); $this->load->model('user_model');
if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
@ -82,29 +82,27 @@ class Logbook extends CI_Controller {
$callsign = str_replace("-","/",$callsign); $callsign = str_replace("-","/",$callsign);
// Check if callsign is an LOTW User // Check if callsign is an LOTW User
$lotw_member = ""; $lotw_member = "";
$lotw_file_name = "./updates/lotw_users.csv"; $lotw_file_name = "./updates/lotw_users.csv";
if (file_exists($lotw_file_name)) { if (file_exists($lotw_file_name)) {
$f = fopen($lotw_file_name, "r"); $f = fopen($lotw_file_name, "r");
$result = false; $result = false;
while ($row = fgetcsv($f)) { while ($row = fgetcsv($f)) {
if ($row[0] == strtoupper($callsign)) { if ($row[0] == strtoupper($callsign)) {
$result = $row[0]; $result = $row[0];
$lotw_member = "active"; $lotw_member = "active";
break; break;
} }
}
if($lotw_member != "active") {
$lotw_member = "not found";
}
fclose($f);
} else {
$lotw_member = "not found";
} }
if($lotw_member != "active") {
$lotw_member = "not found";
}
fclose($f);
} else {
$lotw_member = "not found";
}
// Check Database for all other data // Check Database for all other data
$this->load->model('logbook_model'); $this->load->model('logbook_model');
@ -126,69 +124,65 @@ class Logbook extends CI_Controller {
$return['dxcc'] = $this->dxcheck($callsign); $return['dxcc'] = $this->dxcheck($callsign);
$return['partial'] = $this->partial($callsign); $return['partial'] = $this->partial($callsign);
// Do we have local data for the Callsign? // Do we have local data for the Callsign?
if($this->logbook_model->call_name($callsign) != null) if($this->logbook_model->call_name($callsign) != null)
{ {
if ($this->session->userdata('user_measurement_base') == NULL) { if ($this->session->userdata('user_measurement_base') == NULL) {
$measurement_base = $this->config->item('measurement_base'); $measurement_base = $this->config->item('measurement_base');
} } else {
else { $measurement_base = $this->session->userdata('user_measurement_base');
$measurement_base = $this->session->userdata('user_measurement_base'); }
}
$return['callsign_name'] = $this->logbook_model->call_name($callsign); $return['callsign_name'] = $this->logbook_model->call_name($callsign);
$return['callsign_qra'] = $this->logbook_model->call_qra($callsign); $return['callsign_qra'] = $this->logbook_model->call_qra($callsign);
$return['callsign_qth'] = $this->logbook_model->call_qth($callsign); $return['callsign_qth'] = $this->logbook_model->call_qth($callsign);
$return['callsign_iota'] = $this->logbook_model->call_iota($callsign); $return['callsign_iota'] = $this->logbook_model->call_iota($callsign);
$return['qsl_manager'] = $this->logbook_model->call_qslvia($callsign); $return['qsl_manager'] = $this->logbook_model->call_qslvia($callsign);
$return['callsign_state'] = $this->logbook_model->call_state($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); $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
if ($return['callsign_qra'] != "") { if ($return['callsign_qra'] != "") {
$return['latlng'] = $this->qralatlng($return['callsign_qra']); $return['latlng'] = $this->qralatlng($return['callsign_qra']);
}
echo json_encode($return, JSON_PRETTY_PRINT);
return;
} }
$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname'));
if (isset($callbook))
{
$return['callsign_name'] = $callbook['name'];
$return['callsign_qra'] = $callbook['gridsquare'];
$return['callsign_qth'] = $callbook['city'];
$return['callsign_iota'] = $callbook['iota'];
$return['callsign_state'] = $callbook['state'];
$return['callsign_us_county'] = $callbook['us_county'];
if(isset($callbook['qslmgr'])) {
$return['qsl_manager'] = $callbook['qslmgr'];
}
if ($return['callsign_qra'] != "") {
$return['latlng'] = $this->qralatlng($return['callsign_qra']);
}
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
}
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, $station_id);
echo json_encode($return, JSON_PRETTY_PRINT); echo json_encode($return, JSON_PRETTY_PRINT);
return; return;
} }
$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname'));
if (isset($callbook))
{
$return['callsign_name'] = $callbook['name'];
$return['callsign_qra'] = $callbook['gridsquare'];
$return['callsign_qth'] = $callbook['city'];
$return['callsign_iota'] = $callbook['iota'];
$return['callsign_state'] = $callbook['state'];
$return['callsign_us_county'] = $callbook['us_county'];
if(isset($callbook['qslmgr'])) {
$return['qsl_manager'] = $callbook['qslmgr'];
}
if ($return['callsign_qra'] != "") {
$return['latlng'] = $this->qralatlng($return['callsign_qra']);
}
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
}
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);
return;
}
function worked_grid_before($gridsquare, $type, $band, $mode) function worked_grid_before($gridsquare, $type, $band, $mode)
{ {
if (strlen($gridsquare) < 4) if (strlen($gridsquare) < 4)
@ -691,19 +685,28 @@ class Logbook extends CI_Controller {
} }
/* return station bearing */ /* return station bearing */
function bearing($locator, $unit = 'M') { function bearing($locator, $unit = 'M', $station_id = null) {
$this->load->library('Qra'); $this->load->library('Qra');
if($locator != null) { 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'); $mylocator = $this->session->userdata('user_locator');
} else { } else {
$mylocator = $this->config->item('locator'); $mylocator = $this->config->item('locator');
} }
$bearing = $this->qra->bearing($mylocator, $locator, $unit); $bearing = $this->qra->bearing($mylocator, $locator, $unit);
return $bearing; return $bearing;

2
assets/js/sections/qso.js
查看文件

@ -296,7 +296,7 @@ $("#callsign").focusout(function() {
find_callsign.replace(/\//g, "-"); find_callsign.replace(/\//g, "-");
// Replace / in a callsign with - to stop urls breaking // 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 // Make sure the typed callsign and temp callsign match
if($('#callsign').val = temp_callsign){ if($('#callsign').val = temp_callsign){