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

Revert "Merge pull request #706 from ofadam/patch-1"

浏览代码 
This reverts commit 9647fa917e, reversing
changes made to e7d0d00e89.
这个提交包含在：
Peter Goodhall 2020-11-17 17:40:55 +00:00
父节点 9647fa917e
当前提交 388bfb848a
共有 2 个文件被更改，包括 9 次插入 和 9 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -101,9 +101,9 @@ class Dashboard extends CI_Controller {
} }
if($row->COL_SAT_NAME != null) { if($row->COL_SAT_NAME != null) {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
} else { } else {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"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++;
@ -121,7 +121,7 @@ class Dashboard extends CI_Controller {
if($count != 1) { if($count != 1) {
echo ","; echo ",";
} }
echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"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++;
} }
} }
@ -146,7 +146,7 @@ class Dashboard extends CI_Controller {
//print_r($row); //print_r($row);
if($row->COL_GRIDSQUARE != null) { if($row->COL_GRIDSQUARE != null) {
$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE); $stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},"; echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"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."\"},";
} else { } else {
$query = $this->db->query(' $query = $this->db->query('
SELECT * SELECT *
@ -157,7 +157,7 @@ class Dashboard extends CI_Controller {
'); ');
foreach ($query->result() as $dxcc) { foreach ($query->result() as $dxcc) {
echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},"; echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"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."\"},";
} }
} }

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

@ -365,9 +365,9 @@ class Logbook extends CI_Controller {
} }
if($row->COL_SAT_NAME != null) { if($row->COL_SAT_NAME != null) {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
} else { } else {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"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++;
@ -385,7 +385,7 @@ class Logbook extends CI_Controller {
if($count != 1) { if($count != 1) {
echo ","; echo ",";
} }
echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}"; echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"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++;
} }
} }
@ -697,4 +697,4 @@ class Logbook extends CI_Controller {
} }
} }