kopia lustrzana https://github.com/magicbug/Cloudlog
Cleaned up code a bit
rodzic
0025c9a4ac
commit
b4da6386e0
|
@ -172,7 +172,6 @@ class Logbook extends CI_Controller {
|
|||
echo "{\"markers\": [";
|
||||
$count = 1;
|
||||
foreach ($data['qsos']->result() as $row) {
|
||||
//print_r($row);
|
||||
if($row->COL_GRIDSQUARE != null) {
|
||||
$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
|
||||
if($count != 1) {
|
||||
|
|
|
@ -92,5 +92,4 @@ function qra2latlong($strQRA)
|
|||
return($arLatLong);
|
||||
|
||||
}
|
||||
|
||||
/* End of file Qra.php */
|
|
@ -434,7 +434,7 @@ class Logbook_model extends CI_Model {
|
|||
|
||||
|
||||
function get_qsos($num, $offset) {
|
||||
$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX_STRING, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD');
|
||||
$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX_STRING, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD, COL_VUCC_GRIDS');
|
||||
$this->db->order_by("COL_TIME_ON", "desc");
|
||||
|
||||
$query = $this->db->get($this->config->item('table_name'), $num, $offset);
|
||||
|
|
|
@ -163,6 +163,8 @@
|
|||
}
|
||||
?>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
var lat = <?php echo $lat; ?>;
|
||||
var long = <?php echo $lng; ?>;
|
||||
|
|
Ładowanie…
Reference in New Issue