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

Merge pull request #1521 from AndreasK79/dashboard_map_fix

浏览代码 
[Dashboard map] Fix lookup for dashboard QSOs plotted on the map
这个提交包含在：
Peter Goodhall 2022-07-07 16:20:36 +01:00 提交者 GitHub
当前提交 eed8fe91c9
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 4 次插入 和 6 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

8
application/controllers/Dashboard.php
查看文件

@ -163,11 +163,9 @@ class Dashboard extends CI_Controller {
echo ","; echo ",";
} }
$result = $this->logbook_model->dxcc_lookup($row->COL_CALL, $row->COL_TIME_ON); if(isset($row->lat) && isset($row->long)) {
$lat = $row->lat;
if(isset($result)) { $lng = $row->long;
$lat = $result['lat'];
$lng = $result['long'];
} }
echo "{\"lat\":\"".$lat."\",\"lng\":\"".$lng."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$lat."\",\"lng\":\"".$lng."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
$count++; $count++;

2
application/models/Logbook_model.php
查看文件

@ -1101,9 +1101,9 @@ class Logbook_model extends CI_Model {
} }
if ($logbooks_locations_array) { if ($logbooks_locations_array) {
//$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_STX_STRING, COL_SRX_STRING, COL_IOTA, COL_STATE, COL_GRIDSQUARE');
$this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array); $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
$this->db->order_by("COL_TIME_ON", "desc"); $this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit($num); $this->db->limit($num);
$query = $this->db->get($this->config->item('table_name')); $query = $this->db->get($this->config->item('table_name'));