From e02c92f28e56a705b48781f37ef9575ea0a74b50 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 4 Oct 2011 16:09:21 +0100
Subject: [PATCH] Logbook: QSOs for each page displayed on map

---
 application/models/logbook_model.php |   2 +-
 application/views/view_log/index.php |  46 +++++++++++
 cloudlog.sublime-workspace           | 115 ++-------------------------
 3 files changed, 55 insertions(+), 108 deletions(-)

diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index 2eca6ce40..1503ce513 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -160,7 +160,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');
+  $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');
   $this->db->order_by("COL_TIME_ON", "desc"); 
 	$query = $this->db->get($this->config->item('table_name'), $num, $offset);	
 	return $query;
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index b7c31fca4..99658c9d5 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -17,6 +17,50 @@
 		});
 	</script>
 	
+	<script type="text/javascript">
+	  function create_map() {
+	    var latlng = new google.maps.LatLng(40.313043, -32.695312);
+	    var myOptions = {
+	      zoom: 3,
+	      center: latlng,
+	      mapTypeId: google.maps.MapTypeId.ROADMAP
+	    };
+	    var infowindow = new google.maps.InfoWindow();
+
+	    var marker, i;
+
+	    /* Get QSO points via json*/
+		 $.getJSON("/logbook/index.php/logbook/qso_map/25/<?php echo $this->uri->segment(3); ?>", function(data) {
+		 	
+			$.each(data.markers, function(i, val) {
+				/* Create Markers */
+			    marker = new google.maps.Marker({
+		        	position: new google.maps.LatLng(this.lat, this.lng),
+		        	map: map
+		   		});
+		   		
+		   		/* Store Popup Text */
+		   		var content = this.html;
+		   	
+		   		/* Create Popups */
+		   		google.maps.event.addListener(marker, 'click', (function(marker, i) {
+		        	return function() {
+		        		infowindow.setContent(content);
+		          		infowindow.open(map, marker);
+		        	}
+				})(marker, i));
+			});
+		 });
+
+	    var map = new google.maps.Map(document.getElementById("map"),
+	        myOptions);
+	  }
+
+	    $(document).ready(function(){
+			create_map();
+	  });
+	</script>
+
 <h2>Logbook</h2>
 <?php if($this->session->flashdata('notice')) { ?>
 <div id="message" >
@@ -26,6 +70,8 @@
 
 <div class="wrap_content">
 
+<div id="map" style="width: 100%; height: 300px"></div> 
+
 
 <table class="logbook" width="100%">
 	<tr class="log_title titles">
diff --git a/cloudlog.sublime-workspace b/cloudlog.sublime-workspace
index c66494e13..2ffca8cab 100644
--- a/cloudlog.sublime-workspace
+++ b/cloudlog.sublime-workspace
@@ -11,30 +11,6 @@
 	},
 	"buffers":
 	[
-		{
-			"file": "application/controllers/backup.php",
-			"settings":
-			{
-				"buffer_size": 879,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "application/views/backup/main.php",
-			"settings":
-			{
-				"buffer_size": 79,
-				"line_ending": "Windows"
-			}
-		},
-		{
-			"file": "application/views/layout/header.php",
-			"settings":
-			{
-				"buffer_size": 10575,
-				"line_ending": "Windows"
-			}
-		}
 	],
 	"build_system": "",
 	"command_palette":
@@ -68,13 +44,19 @@
 	},
 	"file_history":
 	[
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/backup.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/notes_view.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/adif_view.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/notes.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/kml.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/exportall.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/models/note.php",
+		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/main.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/user.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/welcome.php",
-		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/exportall.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/adif.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/config/config.php",
-		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/kml.php",
 		"/C/Users/Peter/Desktop/log.kml",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php",
@@ -85,7 +67,6 @@
 		"/C/Users/Peter/AppData/Roaming/Sublime Text 2/Packages/User/Default (Windows).sublime-keymap",
 		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dashboard/index.php",
 		"/C/wamp/www/m3php/data.html",
-		"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
 		"/C/Users/Peter/git/HRD-Web-Frontend/index.php",
 		"/C/Users/Peter/AppData/Roaming/Sublime Text 2/Packages/Default/Base File.sublime-settings",
 		"/C/Users/Peter/AppData/Roaming/Sublime Text 2/Packages/User/Base File.sublime-settings"
@@ -128,88 +109,8 @@
 	"groups":
 	[
 		{
-			"selected": 0,
 			"sheets":
 			[
-				{
-					"buffer": 0,
-					"file": "application/controllers/backup.php",
-					"settings":
-					{
-						"buffer_size": 879,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								719,
-								719
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/PHP/PHP.tmLanguage"
-						},
-						"translation.x": 0.0,
-						"translation.y": 0.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 1,
-					"file": "application/views/backup/main.php",
-					"settings":
-					{
-						"buffer_size": 79,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								71,
-								71
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/PHP/PHP.tmLanguage"
-						},
-						"translation.x": 0.0,
-						"translation.y": 0.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 2,
-					"file": "application/views/layout/header.php",
-					"settings":
-					{
-						"buffer_size": 10575,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								9245,
-								9245
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/PHP/PHP.tmLanguage",
-							"translate_tabs_to_spaces": false
-						},
-						"translation.x": 0.0,
-						"translation.y": 3540.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				}
 			]
 		}
 	],