diff --git a/application/config/config.php b/application/config/config.php
index 6738ad6c..23626c73 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -5,7 +5,6 @@
$config['table_name'] = "table_hrd_contacts_v01";
$config['locator'] = "IO91JS";
$config['display_freq'] = false; // hide and display freq input on Add QSO
-$config['google_maps_api'] = "ABQIAAAA74tY2H5PTGpzLdnwXQmLXxTAaiXfF7TN3brq2P-N4wxlXpK9XRR0YWnumNpDAv2MVqJhk4dDpznb9A";
/* User options */
// Use authentication?
diff --git a/application/controllers/dashboard.php b/application/controllers/dashboard.php
index 0d8872c7..076794a9 100644
--- a/application/controllers/dashboard.php
+++ b/application/controllers/dashboard.php
@@ -63,12 +63,19 @@ class Dashboard extends CI_Controller {
$qsos = $this->logbook_model->map_week_qsos($mon, $sun);
echo "{\"markers\": [";
-
+ $count = 1;
foreach ($qsos->result() as $row) {
//print_r($row);
if($row->COL_GRIDSQUARE != null) {
$stn_loc = qra2latlong($row->COL_GRIDSQUARE);
- echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
+ if($count != 1) {
+ echo ",";
+ }
+
+ echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+
+ $count++;
+
} else {
$query = $this->db->query('
SELECT *
@@ -79,7 +86,11 @@ class Dashboard extends CI_Controller {
');
foreach ($query->result() as $dxcc) {
- echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
+ if($count != 1) {
+ echo ",";
+ }
+ echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+ $count++;
}
}
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 09283baf..db98ff01 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -72,6 +72,51 @@
}
+
+
+
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>