Display submode if available
This looks for submode first on the "MODE:" display fields – matching how the logbook itself functions.
这个提交包含在:
父节点
2b5a424a78
当前提交
6128c2a3ef
共有 1 个文件被更改,包括 4 次插入 和 4 次删除
|
|
@ -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: ".$row->COL_MODE."\",\"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: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"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_MODE."\",\"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: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"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: ".$row->COL_MODE."\",\"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: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
$count++;
|
$count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用