Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -291,6 +291,33 @@
             length="20"
         />
 
+        <property
+            name="reflectOnActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="reflect_on_activity"
+            length="1"
+        />
+
+        <property
+            name="reflectInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="reflect_instructions"
+            length="65535"
+        />
+
+        <property
+            name="defaultGeocoderAddress"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="default_geocoder_address"
+            length="255"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Gmap.xml
Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd697a4de98c3915e665e06207c1e382f24a7ff79 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d697a4de98c3915e665e06207c1e382f24a7ff79)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -107,5 +107,6 @@
 label.off=Off
 label.unsavedMarkers  =You have unsaved markers, they will be lost if you choose to continue. Do you want to continue anyway?
 button.refresh  =Refresh Map
+button.Continue  =Continue
 
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rd697a4de98c3915e665e06207c1e382f24a7ff79 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d697a4de98c3915e665e06207c1e382f24a7ff79)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -107,4 +107,6 @@
 label.off=Off
 label.unsavedMarkers  =You have unsaved markers, they will be lost if you choose to continue. Do you want to continue anyway?
 button.refresh  =Refresh Map
+button.Continue  =Continue
+
 #======= End labels: Exported 76 labels for en AU =====
Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
===================================================================
diff -u -r08cb71ed4bc1b09147f989091ba599e92e8091d0 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 08cb71ed4bc1b09147f989091ba599e92e8091d0)
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -7,7 +7,7 @@
 drop table if exists tl_lagmap10_session;
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid))TYPE=InnoDB;
-create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), primary key (uid))TYPE=InnoDB;
+create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), reflect_on_activity bit, reflect_instructions text, default_geocoder_address varchar(255), primary key (uid))TYPE=InnoDB;
 create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid bigint, primary key (uid))TYPE=InnoDB;
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid))TYPE=InnoDB;
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, primary key (uid))TYPE=InnoDB;
@@ -40,7 +40,10 @@
 	map_center_latitude,
 	map_center_longitude, 
 	map_zoom,
-	map_type
+	map_type,
+	reflect_on_activity, 
+	reflect_instructions, 
+	default_geocoder_address
 ) 
 VALUES(
 	"Gmap",
@@ -63,7 +66,10 @@
 	-33.774322,
 	151.111988,
 	13,
-	"G_NORMAL_MAP"
+	"G_NORMAL_MAP",
+	0,
+	"",
+	"Macquarie University, Sydney NSW"
 );
 
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
diff -u -rfb0eec778efbbc27bfbd1fb926b91bc2f10e6860 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision fb0eec778efbbc27bfbd1fb926b91bc2f10e6860)
+++ lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -11,7 +11,7 @@
 drop table if exists tl_lagmap10_session;
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid));
-create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), primary key (uid));
+create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), reflect_on_activity bit, reflect_instructions text, default_geocoder_address varchar(255), primary key (uid));
 create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid bigint, primary key (uid));
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, primary key (uid));
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
diff -u -r8d948637c07e80c47907f3b3a2994feeb07dab93 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 8d948637c07e80c47907f3b3a2994feeb07dab93)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -89,6 +89,12 @@
 	
 	public String mapType;
 	
+	public boolean reflectOnActivity;
+	
+	public String reflectInstructions;
+	
+	String defaultGeocoderAddress;
+	
 	public Set<GmapMarkerDTO> gmapMarkers = new HashSet<GmapMarkerDTO>();
 	
 	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
@@ -121,7 +127,10 @@
 		mapCenterLongitude = gmap.getMapCenterLongitude();		
 		mapZoom = gmap.getMapZoom();
 		mapType = gmap.getMapType();
-
+		reflectOnActivity = gmap.isReflectOnActivity();
+		reflectInstructions = gmap.getReflectInstructions();
+		defaultGeocoderAddress = gmap.getDefaultGeocoderAddress();
+		
 		onlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
 
@@ -355,4 +364,28 @@
 	public void setGmapMarkers(Set<GmapMarkerDTO> gmapMarkers) {
 		this.gmapMarkers = gmapMarkers;
 	}
+
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
+
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+
+	public String getDefaultGeocoderAddress() {
+		return defaultGeocoderAddress;
+	}
+
+	public void setDefaultGeocoderAddress(String defaultGeocoderAddress) {
+		this.defaultGeocoderAddress = defaultGeocoderAddress;
+	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
===================================================================
diff -u -rfb0eec778efbbc27bfbd1fb926b91bc2f10e6860 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	(.../GmapUserDTO.java)	(revision fb0eec778efbbc27bfbd1fb926b91bc2f10e6860)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	(.../GmapUserDTO.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -37,11 +37,16 @@
 	
 	public String lastName;
 	
+	public String notebookEntry;
+	
+	public boolean finishedActivity;
+	
 	public GmapUserDTO(GmapUser user) {
 		this.uid = user.getUid();
 		this.loginName = user.getLoginName();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
+		this.finishedActivity = user.isFinishedActivity();
 	}
 
 	public int compareTo(Object o) {
@@ -85,4 +90,22 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
+	
+	public String getNotebookEntry() {
+		return notebookEntry;
+	}
+
+	public void setNotebookEntry(String notebookEntry) {
+		this.notebookEntry = notebookEntry;
+	}
+
+	public boolean isFinishedActivity() {
+		return finishedActivity;
+	}
+
+	public void setFinishedActivity(boolean finishedActivity) {
+		this.finishedActivity = finishedActivity;
+	}
+	
+	
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
===================================================================
diff -u -r71dee7d765407942d4d1d88cba29319277e40b20 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 71dee7d765407942d4d1d88cba29319277e40b20)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -117,6 +117,15 @@
 
 	// tool content id
 	private Long toolContentId;
+	
+	// Add notebook at the end of activity
+	boolean reflectOnActivity;
+	
+	// instructions for notebook
+	String reflectInstructions;
+	
+	// default Geocoder Address (Set to "Macquarie University, Sydney NSW" by default)
+	String defaultGeocoderAddress;
 
 	// list of attached files for the gmap
 	private Set<GmapAttachment> gmapAttachments;
@@ -130,8 +139,6 @@
 	//*********** NON Persist fields
 	private IToolContentHandler toolContentHandler;
 	
-	
-
 	// Constructors
 
 	/** default constructor */
@@ -144,6 +151,7 @@
 			boolean filteringEnabled, String filterKeywords,
 			String onlineInstructions, String offlineInstructions,
 			boolean contentInUse, boolean defineLater, Long toolContentId,
+			boolean reflectOnActivity, String reflectInstructions, String defaultGeocoderAddress,
 			Set<GmapAttachment> gmapAttachments, Set<GmapSession> gmapSessions, Set<GmapMarker> markers) {
 		this.createDate = createDate;
 		this.updateDate = updateDate;
@@ -160,6 +168,9 @@
 		this.gmapAttachments = gmapAttachments;
 		this.gmapSessions = gmapSessions;
 		this.gmapMarkers = markers;
+		this.reflectOnActivity = reflectOnActivity;
+		this.reflectInstructions = reflectInstructions;
+		this.defaultGeocoderAddress = defaultGeocoderAddress;
 	}
 
 	// Property accessors
@@ -678,4 +689,38 @@
 		this.mapType = mapType;
 	}
 
+	/**
+	 * @hibernate.property column="reflect_on_activity" length="1"
+	 */
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
+
+	/**
+	 * @hibernate.property column="reflect_instructions" length="65535"
+	 */
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+
+	/**
+	 * @hibernate.property column="default_geocoder_address" length="255"
+	 * 
+	 */
+	public String getDefaultGeocoderAddress() {
+		return defaultGeocoderAddress;
+	}
+
+	public void setDefaultGeocoderAddress(String defaultGeocoderAddress) {
+		this.defaultGeocoderAddress = defaultGeocoderAddress;
+	}
+
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -r6bbcf865d7e5052640ba82ffc379f6b92d8bc96f -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 6bbcf865d7e5052640ba82ffc379f6b92d8bc96f)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -60,6 +60,7 @@
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -554,60 +555,68 @@
 	 */
 	public void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, boolean isAuthored, GmapSession session)
 	{
-		try 
+		
+		if (markerXML != null && !markerXML.equals(""))
 		{
-			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			Document document = db.parse(new InputSource(new StringReader(markerXML)));
-			NodeList list = document.getElementsByTagName("marker");
-			
-			for (int i =0; i<list.getLength(); i++)
-			{
-				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
+			try 
+				{
+				DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+				DocumentBuilder db = dbf.newDocumentBuilder();
+				Document document = db.parse(new InputSource(new StringReader(markerXML)));
+				NodeList list = document.getElementsByTagName("marker");
 				
-				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
-				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
-				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
-				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
-				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
-
-				String markerState = markerNode.getNamedItem("state").getNodeValue();
-				
-				if (markerState.equals("remove"))
+				for (int i =0; i<list.getLength(); i++)
 				{
-					gmap.removeMarker(uid);
-					continue;
+					NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
+					
+					Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
+					String markerTitle = markerNode.getNamedItem("title").getNodeValue();
+					String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
+					Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
+					Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
+	
+					String markerState = markerNode.getNamedItem("state").getNodeValue();
+					
+					if (markerState.equals("remove"))
+					{
+						gmap.removeMarker(uid);
+						continue;
+					}
+	
+					GmapMarker marker = null;
+					if (markerState.equals("save"))
+					{
+						marker = new GmapMarker();
+						marker.setCreatedBy(guser);
+						marker.setCreated(new Date());
+						marker.setAuthored(isAuthored);
+					}
+					else if (markerState.equals("update"))
+					{
+						marker = gmap.getMarkerByUid(uid);
+					}
+					
+					marker.setGmapSession(session);
+					marker.setTitle(markerTitle);
+					marker.setInfoWindowMessage(infoMessage);
+					marker.setLatitude(latitude);
+					marker.setLongitude(longitude);
+					marker.setGmap(gmap);
+					marker.setUpdated(new Date());
+					marker.setUpdatedBy(guser);
+					saveOrUpdateGmapMarker(marker);
 				}
-
-				GmapMarker marker = null;
-				if (markerState.equals("save"))
-				{
-					marker = new GmapMarker();
-					marker.setCreatedBy(guser);
-					marker.setCreated(new Date());
-					marker.setAuthored(isAuthored);
-				}
-				else if (markerState.equals("update"))
-				{
-					marker = gmap.getMarkerByUid(uid);
-				}
-				
-				marker.setGmapSession(session);
-				marker.setTitle(markerTitle);
-				marker.setInfoWindowMessage(infoMessage);
-				marker.setLatitude(latitude);
-				marker.setLongitude(longitude);
-				marker.setGmap(gmap);
-				marker.setUpdated(new Date());
-				marker.setUpdatedBy(guser);
-				saveOrUpdateGmapMarker(marker);
 			}
+			catch (Exception e)
+			{
+				// TODO: improve error handling
+				logger.error("Could not get marker xml object to update", e);
+				throw new GmapException("Could not get marker xml object to update", e);
+			}
 		}
-		catch (Exception e)
+		else
 		{
-			// TODO: improve error handling
-			logger.error("Could not get marker xml object to update", e);
-			throw new GmapException("Could not get marker xml object to update", e);
+			logger.debug("MarkerXML string was empty");
 		}
 	}
 
@@ -768,4 +777,23 @@
 	}
 	
 	
+	public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
+		return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
+	}
+
+	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID){
+		List<NotebookEntry> list = coreNotebookService.getEntry(sessionId, idType, signature, userID);
+		if (list == null || list.isEmpty()) {
+			return null;
+		} else {
+			return list.get(0);
+		}
+	}
+
+	/**
+	 * @param notebookEntry
+	 */
+	public void updateEntry(NotebookEntry notebookEntry) {
+		coreNotebookService.updateEntry(notebookEntry);
+	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
diff -u -rfb0eec778efbbc27bfbd1fb926b91bc2f10e6860 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision fb0eec778efbbc27bfbd1fb926b91bc2f10e6860)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -34,6 +34,7 @@
 import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.util.GmapException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 
 /**
  * Defines the services available to the web layer from the Gmap Service
@@ -162,4 +163,28 @@
 	 * @param session
 	 */
 	void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser, boolean isAuthored, GmapSession session);
+	
+	/**
+	 * Creates a core notebook entry
+	 * 
+	 * @param id
+	 * @param idType
+	 * @param signature
+	 * @param userID
+	 * @param entry
+	 * @return
+	 */
+	Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry);
+
+	/**
+	 * Gets the entry from the database
+	 * 
+	 */
+	NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
+
+	/**
+	 * Updates an existing notebook entry
+	 * 
+	 */
+	void updateEntry(NotebookEntry notebookEntry);
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r721de07c220226331fc64a5c89e267e2eceba377 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 721de07c220226331fc64a5c89e267e2eceba377)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -432,6 +432,9 @@
 			gmap.setMapZoom(authForm.getMapZoom());
 			gmap.setMapCenterLatitude(authForm.getMapCenterLatitude());
 			gmap.setMapCenterLongitude(authForm.getMapCenterLongitude());
+			gmap.setReflectOnActivity(authForm.isReflectOnActivity());
+			gmap.setReflectInstructions(authForm.getReflectInstructions());
+			gmap.setDefaultGeocoderAddress(authForm.getDefaultGeocoderAddress());
 		}
 	}
 
@@ -461,6 +464,9 @@
 		authForm.setMapZoom(gmap.getMapZoom());
 		authForm.setMapCenterLatitude(gmap.getMapCenterLatitude());
 		authForm.setMapCenterLongitude(gmap.getMapCenterLongitude());
+		authForm.setReflectOnActivity(gmap.isReflectOnActivity());
+		authForm.setReflectInstructions(gmap.getReflectInstructions());
+		authForm.setDefaultGeocoderAddress(gmap.getDefaultGeocoderAddress());
 	}
 
 	/**
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -r2e5708a7cd242f72aecf91251e52dde68a72017f -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 2e5708a7cd242f72aecf91251e52dde68a72017f)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -25,14 +25,15 @@
 package org.lamsfoundation.lams.tool.gmap.web.actions;
 
 import java.io.IOException;
-
+import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -48,6 +49,7 @@
 import org.lamsfoundation.lams.tool.gmap.util.GmapConstants;
 import org.lamsfoundation.lams.tool.gmap.util.GmapException;
 import org.lamsfoundation.lams.tool.gmap.web.forms.LearningForm;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -63,6 +65,7 @@
  * @struts.action-forward name="gmap" path="tiles:/learning/main"
  * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
+ * @struts.action-forward name="notebook" path="tiles:/learning/notebook"
  */
 public class LearningAction extends LamsDispatchAction {
 
@@ -132,7 +135,17 @@
 		} else {
 			gmapUser = getCurrentUser(toolSessionID);
 		}
+		
 		GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser);
+		if (gmapUser.isFinishedActivity()) {
+			// get the notebook entry.
+			NotebookEntry notebookEntry = gmapService.getEntry(toolSessionID,
+					CoreNotebookConstants.NOTEBOOK_TOOL,
+					GmapConstants.TOOL_SIGNATURE, gmapUser.getUserId().intValue());
+			if (notebookEntry != null) {
+				gmapUserDTO.notebookEntry = notebookEntry.getEntry();
+			}
+		}
 		request.setAttribute(GmapConstants.ATTR_USER_DTO, gmapUserDTO);
 		
 		
@@ -199,7 +212,7 @@
 			
 			// update the marker list
 			Gmap gmap = gmapSession.getGmap();
-			gmapService.updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, true, gmapSession);
+			gmapService.updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, false, gmapSession);
 			
 			// Set the user finished flag
 			gmapUser.setFinishedActivity(true);
@@ -267,4 +280,60 @@
 
 		return unspecified(mapping, form, request, response);
 	}
+	
+	public ActionForward openNotebook(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+
+		LearningForm lrnForm = (LearningForm) form;
+		
+		// set the finished flag
+		GmapUser gmapUser = this.getCurrentUser(lrnForm.getToolSessionID());
+		GmapDTO gmapDTO = new GmapDTO(gmapUser.getGmapSession().getGmap());
+
+		request.setAttribute("gmapDTO", gmapDTO);
+
+		NotebookEntry notebookEntry = gmapService.getEntry(gmapUser.getGmapSession().getSessionId(),
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				GmapConstants.TOOL_SIGNATURE, gmapUser.getUserId().intValue());
+
+		if (notebookEntry != null) {
+			lrnForm.setEntryText(notebookEntry.getEntry());
+		}
+
+		return mapping.findForward("notebook");
+	}
+	
+	public ActionForward submitReflection(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
+		// save the reflection entry and call the notebook.
+
+		LearningForm lrnForm = (LearningForm) form;
+
+		GmapUser gmapUser = this.getCurrentUser(lrnForm.getToolSessionID());
+		Long toolSessionID = gmapUser.getGmapSession().getSessionId();
+		Integer userID = gmapUser.getUserId().intValue();
+
+		// check for existing notebook entry
+		NotebookEntry entry = gmapService.getEntry(toolSessionID,
+				CoreNotebookConstants.NOTEBOOK_TOOL,
+				GmapConstants.TOOL_SIGNATURE, userID);
+
+		if (entry == null) {
+			// create new entry
+			gmapService.createNotebookEntry(toolSessionID,
+					CoreNotebookConstants.NOTEBOOK_TOOL,
+					GmapConstants.TOOL_SIGNATURE, userID, lrnForm
+							.getEntryText());
+		} else {
+			// update existing entry
+			entry.setEntry(lrnForm.getEntryText());
+			entry.setLastModified(new Date());
+			gmapService.updateEntry(entry);
+		}
+
+		return finishActivity(mapping, form, request, response);
+	}
+	
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
===================================================================
diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -97,6 +97,12 @@
 	Gmap gmap;
 	
 	String markersXML;
+	
+	boolean reflectOnActivity;
+	
+	String reflectInstructions;
+	
+	String defaultGeocoderAddress;
 
 	public String getMarkersXML() {
 		return markersXML;
@@ -313,4 +319,28 @@
 	public void setMapType(String mapType) {
 		this.mapType = mapType;
 	}
+
+	public boolean isReflectOnActivity() {
+		return reflectOnActivity;
+	}
+
+	public void setReflectOnActivity(boolean reflectOnActivity) {
+		this.reflectOnActivity = reflectOnActivity;
+	}
+
+	public String getReflectInstructions() {
+		return reflectInstructions;
+	}
+
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
+	}
+
+	public String getDefaultGeocoderAddress() {
+		return defaultGeocoderAddress;
+	}
+
+	public void setDefaultGeocoderAddress(String defaultGeocoderAddress) {
+		this.defaultGeocoderAddress = defaultGeocoderAddress;
+	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java
===================================================================
diff -u -rfb0eec778efbbc27bfbd1fb926b91bc2f10e6860 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	(.../LearningForm.java)	(revision fb0eec778efbbc27bfbd1fb926b91bc2f10e6860)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -43,7 +43,7 @@
 	String dispatch;
 	Long toolSessionID;
 	String mode;
-	
+	String entryText;
 	String markersXML;
 
 	public String getMarkersXML() {
@@ -93,4 +93,12 @@
 	public void setTitle(String title) {
 		this.title = title;
 	}
+
+	public String getEntryText() {
+		return entryText;
+	}
+
+	public void setEntryText(String entryText) {
+		this.entryText = entryText;
+	}
 }
Index: lams_tool_gmap/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -85,6 +85,11 @@
         path="tiles:/learning/defineLater"
         redirect="false"
       />
+      <forward
+        name="notebook"
+        path="tiles:/learning/notebook"
+        redirect="false"
+      />
     </action>
     <action
       path="/monitoring"
Index: lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -94,6 +94,10 @@
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
 	</definition>
+	
+	<definition name="tiles:/learning/notebook" extends="tiles:/layout:learning">
+		<put name="body" value="/pages/learning/notebook.jsp" />
+	</definition>	
 	<!-- End: Learning -->
 
 
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -rb0a923d1380f2cfe4c0dae6afae313726edd88c0 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision b0a923d1380f2cfe4c0dae6afae313726edd88c0)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -401,8 +401,8 @@
 	}	
 }
 
-// refreshes the page
-function refresh()
+
+function confirmLeavePage()
 {
 	var i =0;
 	for (;i<markers.length;i++)
@@ -413,15 +413,21 @@
 			var ans = confirm('<fmt:message key="label.unsavedMarkers" />');
 			if (ans)
 			{
-				location.reload(true);
-				return;
+				return true;
 			}
 			else
 			{
-				return;
+				return false;
 			}
 		}
 	}
+	return true;
+}
+
+
+// refreshes the page
+function refresh()
+{
 	location.reload(true);
 }
 
Index: lams_tool_gmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -105,3 +105,35 @@
 	</label>
 </p>
 
+<p>
+	<html:checkbox property="reflectOnActivity" value="1"
+		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
+
+	<label for="reflectOnActivity">
+		<fmt:message key="advanced.reflectOnActivity" />
+	</label>
+</p>
+<p>
+	<html:textarea property="reflectInstructions" cols="30" rows="3" styleId="reflectInstructions"/>
+</p>
+
+<script type="text/javascript">
+<!--
+//automatically turn on refect option if there are text input in refect instruction area
+	var ra = document.getElementById("reflectInstructions");
+	var rao = document.getElementById("reflectOnActivity");
+	function turnOnRefect(){
+		if(isEmpty(ra.value)){
+		//turn off	
+			rao.checked = false;
+		}else{
+		//turn on
+			rao.checked = true;		
+		}
+	}
+
+	ra.onkeyup=turnOnRefect;
+//-->
+</script>
+
+
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
diff -u -rd697a4de98c3915e665e06207c1e382f24a7ff79 -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision d697a4de98c3915e665e06207c1e382f24a7ff79)
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -16,56 +16,47 @@
 		${gmapDTO.title}
 	</h1>
 
-	<html:form action="/learning" method="post" onsubmit="return validateForm();">
-		<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-		<html:hidden property="markersXML" value="" styleId="markersXML" />
-		<html:hidden property="mode" value="${mode}" />
-		<p>
-			${gmapDTO.instructions}
-		</p>
+	
+	<p>
+		${gmapDTO.instructions}
+	</p>
 
-		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-		<br />
-		
-		<table>
-			<tr>
-				<td>
-					<div id="map_legend" style="width:100%;" >
-						<iframe marginwidth="0" align="left" height="60px" width="100%" frameborder="0" src="${tool}/common/mapLegend.jsp"></iframe>
-					</div>
-					<div id="map_canvas" style="float: left; width:80%; height:400px"><fmt:message key="error.cantLoadMap"></fmt:message></div>
-					<div id="usersidebar" style="float: right; width:20%; overflow:auto; height:400px; background:WhiteSmoke; "></div>		
-				</td>
-			</tr>
-			<tr>
-				<td>	
-					<c:choose>
-						<c:when test="${contentEditable}">
-					<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
-						</c:when>
-					</c:choose>
-					<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
-					<a href="javascript:refresh()" class="button"/><fmt:message key="button.refresh"/></a>
-				</td>
-			</tr>
-		</table>
-		<p />
-		
-		<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
-	    			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
-		
-		<div class="space-bottom-top align-right">
-			<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'saveMarkers';">
-				<fmt:message>button.save</fmt:message>
-			</html:submit>
-			
-			<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'finishActivity';">
-				<fmt:message>button.finish</fmt:message>
-			</html:submit>
-		</div>
-	</html:form>
+	<br />
+	
+	<table>
+		<tr>
+			<td>
+				<div id="map_legend" style="width:100%;" >
+					<iframe marginwidth="0" align="left" height="60px" width="100%" frameborder="0" src="${tool}/common/mapLegend.jsp"></iframe>
+				</div>
+				<div id="map_canvas" style="float: left; width:80%; height:400px"><fmt:message key="error.cantLoadMap"></fmt:message></div>
+				<div id="usersidebar" style="float: right; width:20%; overflow:auto; height:400px; background:WhiteSmoke; "></div>		
+			</td>
+		</tr>
+		<tr>
+			<td>	
+				<c:choose>
+					<c:when test="${contentEditable}">
+				<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
+					</c:when>
+				</c:choose>
+				<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
+				<a href="javascript:if(confirmLeavePage()){refresh();}" class="button"/><fmt:message key="button.refresh"/></a>
+			</td>
+		</tr>
+	</table>
+	<p />
+	
+	<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+    			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
+	
+	
+	<c:if test="${mode == 'learner' || mode == 'author'}">
+		<%@ include file="parts/finishButton.jsp"%>
+	</c:if>
+	
 </div>
 
 
Index: lams_tool_gmap/web/pages/learning/notebook.jsp
===================================================================
diff -u
--- lams_tool_gmap/web/pages/learning/notebook.jsp	(revision 0)
+++ lams_tool_gmap/web/pages/learning/notebook.jsp	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -0,0 +1,38 @@
+<%@ include file="/common/taglibs.jsp"%>
+<%
+	//String EMPTYMARKERS = "&lt;?xml version=\"1.0\"?&gt;&lt;markers&gt;&lt;/markers&gt;";
+	String EMPTYMARKERS = "<?xml version=\"1.0\"?><markers></markers>";
+	
+%>
+<script type="text/javascript">
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+</script>
+
+<div id="content">
+	<h1>
+		${gmapDTO.title}
+	</h1>
+
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+		<html:hidden property="markersXML" />
+		<html:hidden property="mode" value="${mode}" />
+		
+		<p class="small-space-top">
+			<lams:out value="${gmapDTO.reflectInstructions}" />
+		</p>
+
+		<html:textarea cols="60" rows="8" property="entryText"
+			styleClass="text-area"></html:textarea>
+
+		<div class="space-bottom-top align-right">
+			<html:hidden property="dispatch" value="submitReflection" />
+			<html:submit styleClass="button" styleId="finishButton">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+		</div>
+	</html:form>
+</div>
+
Index: lams_tool_gmap/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u
--- lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(revision 0)
+++ lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -0,0 +1,73 @@
+<%@ include file="/common/taglibs.jsp"%>
+<script type="text/javascript">
+	function disableFinishButton() {
+		var finishButton = document.getElementById("finishButton");
+		if (finishButton != null) {
+			finishButton.disabled = true;
+		}
+	}
+</script>
+
+
+<c:if test="${gmapUserDTO.finishedActivity and gmapDTO.reflectOnActivity}">
+<html:form action="/learning" method="post" styleId="reflectEditForm">
+	<html:hidden property="dispatch" value="openNotebook" />
+	<html:hidden property="mode" value="${mode}" />	
+	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+	<html:hidden property="markersXML" value="" />
+		<div class="space-top">
+			<h2>
+				${gmapDTO.reflectInstructions}
+			</h2>
+
+			<p>
+				<c:choose>
+					<c:when test="${not empty gmapUserDTO.notebookEntry}">
+						<lams:out escapeHtml="true" value="${gmapUserDTO.notebookEntry}" />
+					</c:when>
+
+					<c:otherwise>
+						<em><fmt:message key="message.no.reflection.available" /> </em>
+					</c:otherwise>
+				</c:choose>
+			</p>
+
+			<html:submit styleClass="button" onclick="javascript:return confirmLeavePage();">
+				<fmt:message key="button.edit" />
+			</html:submit>
+		</div>
+	
+</html:form>
+</c:if>
+
+<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningForm">
+	<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
+	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+	<html:hidden property="markersXML" value="" styleId="markersXML" />
+	<html:hidden property="mode" value="${mode}" />	
+	<div class="space-bottom-top align-right">
+		<html:submit styleClass="button" styleId="saveButton" onclick="javascript:document.getElementById('dispatch').value = 'saveMarkers'; return serialiseMarkers();;">
+			<fmt:message>button.save</fmt:message>
+		</html:submit>
+		<c:choose>
+			<c:when test="${!gmapUserDTO.finishedActivity and gmapDTO.reflectOnActivity}">
+				<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook'; return serialiseMarkers();">
+					<fmt:message key="button.continue" />
+				</html:submit>
+			</c:when>
+			<c:otherwise>
+				<html:hidden property="dispatch" value="finishActivity" />
+				<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity'; return serialiseMarkers();">
+					<fmt:message key="button.finish" />
+				</html:submit>
+			</c:otherwise>
+		</c:choose>
+	</div>
+</html:form>
+
+
+
+
+
+
+
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2e5708a7cd242f72aecf91251e52dde68a72017f -r3813117828096a5d4063e220506bbc6357be2683
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2e5708a7cd242f72aecf91251e52dde68a72017f)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
@@ -205,7 +205,7 @@
 			<td>
 			<a href="javascript:addMarkerToCenterMonitoring()" class="button"/><fmt:message key="button.addMarker"/></a>
 			<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
-			<a href="javascript:refresh()" class="button"/><fmt:message key="button.refresh"/></a>
+			<a href=javascript:if(confirmLeavePage()){refresh();}" class="button"/><fmt:message key="button.refresh"/></a>
 			</td>
 		</tr>
 	</table>