kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #2766 from int2001/visitordatetime
commit
a85dc88159
|
@ -167,6 +167,7 @@ class Visitor extends CI_Controller {
|
||||||
$count = 1;
|
$count = 1;
|
||||||
foreach ($qsos->result() as $row) {
|
foreach ($qsos->result() as $row) {
|
||||||
//print_r($row);
|
//print_r($row);
|
||||||
|
$begindate=date('d/m/y', strtotime($row->COL_TIME_ON));
|
||||||
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);
|
||||||
if($count != 1) {
|
if($count != 1) {
|
||||||
|
@ -174,11 +175,11 @@ class Visitor 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: ";
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date: ".$begindate."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ";
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "\",\"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: ";
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date: ".$begindate."<br />Band: ".$row->COL_BAND."<br />Mode: ";
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
}
|
}
|
||||||
|
@ -215,11 +216,11 @@ class Visitor 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: ";
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date: ".$begindate."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ";
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "\",\"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: ";
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date: ".$begindate."<br />Band: ".$row->COL_BAND."<br />Mode: ";
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
}
|
}
|
||||||
|
@ -236,7 +237,7 @@ class Visitor extends CI_Controller {
|
||||||
$lng = $row->long;
|
$lng = $row->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: ";
|
echo "{\"lat\":\"".$lat."\",\"lng\":\"".$lng."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date: ".$begindate."<br />Band: ".$row->COL_BAND."<br />Mode: ";
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
$count++;
|
$count++;
|
||||||
|
|
Ładowanie…
Reference in New Issue