Index: lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Attic/NotebookUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.hbm.xml	25 Jul 2006 07:15:34 -0000	1.2
@@ -82,6 +82,14 @@
             />
         </many-to-one>
 
+        <property
+            name="entryUID"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="entry_uid"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-NotebookUser.xml
Index: lams_tool_notebook/db/sql/create_lams_tool_notebook.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/create_lams_tool_notebook.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/db/sql/create_lams_tool_notebook.sql	20 Jul 2006 04:13:18 -0000	1.2
+++ lams_tool_notebook/db/sql/create_lams_tool_notebook.sql	25 Jul 2006 07:15:35 -0000	1.3
@@ -8,7 +8,7 @@
 create table tl_lantbk11_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, notebook_uid bigint, primary key (uid));
 create table tl_lantbk11_notebook (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, primary key (uid));
 create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid));
-create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, primary key (uid));
+create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid);
Index: lams_tool_notebook/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/table-schema.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/db/sql/table-schema.sql	20 Jul 2006 04:13:18 -0000	1.2
+++ lams_tool_notebook/db/sql/table-schema.sql	25 Jul 2006 07:15:35 -0000	1.3
@@ -8,7 +8,7 @@
 create table tl_lantbk11_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, notebook_uid bigint, primary key (uid));
 create table tl_lantbk11_notebook (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, primary key (uid));
 create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid));
-create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, primary key (uid));
+create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	20 Jul 2006 05:41:21 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	25 Jul 2006 07:15:35 -0000	1.3
@@ -38,7 +38,7 @@
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="notebookToolContentHandler"><ref bean="notebookToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
-		   		<property name="journalService"><ref bean="journalService"/></property>
+		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	25 Jul 2006 07:15:35 -0000	1.2
@@ -34,11 +34,33 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
+import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
 
 public class NotebookDTO {
 
 	private static Logger logger = Logger.getLogger(NotebookDTO.class);
 
+	public Long toolContentId;
+
+	public String title;
+
+	public String instructions;
+
+	public String onlineInstructions;
+
+	public String offlineInstructions;
+	
+	public boolean defineLater;
+	
+	public boolean contentInUse;
+	
+	public Set<NotebookAttachmentDTO> onlineInstructionsFiles;
+
+	public Set<NotebookAttachmentDTO> offlineInstructionsFiles;
+
+	public Set<NotebookSessionDTO> sessionDTOs;
+	
+	/* Constructors */
 	public NotebookDTO(){
 		
 	}
@@ -71,32 +93,20 @@
 		}
 		
 		sessionDTOs = new HashSet<NotebookSessionDTO>();
+		
+		for (Iterator iter = notebook.getNotebookSessions().iterator(); iter.hasNext();) {
+			NotebookSession session = (NotebookSession) iter.next();
+			NotebookSessionDTO sessionDTO = new NotebookSessionDTO(session);
+			
+			sessionDTOs.add(sessionDTO);
+		}
 	}
 
-	public Long toolContentId;
-
-	public String title;
-
-	public String instructions;
-
-	public String onlineInstructions;
-
-	public String offlineInstructions;
-	
-	public boolean defineLater;
-	
-	public boolean contentInUse;
-	
-	public Set<NotebookAttachmentDTO> onlineInstructionsFiles;
-
-	public Set<NotebookAttachmentDTO> offlineInstructionsFiles;
-
-	public Set<NotebookSessionDTO> sessionDTOs;
-
+	/* Getters / Setters */
 	public Set<NotebookSessionDTO> getSessionDTOs() {
 		return sessionDTOs;
 	}
-
+	
 	public void setSessionDTOs(Set<NotebookSessionDTO> sessionDTOs) {
 		this.sessionDTOs = sessionDTOs;
 	}
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java	25 Jul 2006 07:15:35 -0000	1.2
@@ -25,11 +25,13 @@
 
 package org.lamsfoundation.lams.tool.notebook.dto;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
+import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 
 public class NotebookSessionDTO implements Comparable {
 	
@@ -44,15 +46,17 @@
 	public NotebookSessionDTO(NotebookSession session) {
 		this.sessionID = session.getSessionId();
 		this.sessionName = session.getSessionName();
-		
+				
 		userDTOs = new TreeSet<NotebookUserDTO>();
-	}
-	
-	public NotebookSessionDTO (NotebookSession session, List messages) {
-		this.sessionID = session.getSessionId();
-		this.sessionName = session.getSessionName();
 		
-		userDTOs = new TreeSet<NotebookUserDTO>();
+		for (Iterator iterator = session.getNotebookUsers().iterator(); iterator.hasNext();) {
+			NotebookUser user = (NotebookUser) iterator.next();
+			NotebookUserDTO userDTO = new NotebookUserDTO(user);
+			
+			userDTOs.add(userDTO);
+		}
+		
+		numberOfLearners = userDTOs.size();
 	}
 	
 	public NotebookSessionDTO() {
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookUser.java	25 Jul 2006 07:15:33 -0000	1.2
@@ -56,6 +56,8 @@
 	private NotebookSession notebookSession;
 	
 	private Boolean finishedActivity;
+	
+	private Long entryUID;
 
 	// Constructors
 
@@ -165,6 +167,17 @@
 	}
 
 	/**
+	 * @hibernate.property column="entry_uid"
+	 */
+	public Long getEntryUID() {
+		return entryUID;
+	}
+
+	public void setEntryUID(Long entryUID) {
+		this.entryUID = entryUID;
+	}
+	
+	/**
 	 * toString
 	 * 
 	 * @return String
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	20 Jul 2006 05:41:21 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	25 Jul 2006 07:15:34 -0000	1.2
@@ -24,7 +24,10 @@
 
 package org.lamsfoundation.lams.tool.notebook.service;
 
+import java.util.List;
+
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
@@ -134,5 +137,32 @@
 	 */
 	public NotebookUser createNotebookUser(UserDTO user,
 			NotebookSession notebookSession);
-
+	
+	/**
+	 * 
+	 * @param id
+	 * @param idType
+	 * @param signature
+	 * @param userID
+	 * @param title
+	 * @param entry
+	 * @return
+	 */
+	Long createNotebookEntry(Long id, Integer idType, String signature,
+			Integer userID, String entry);
+	
+	/**
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	NotebookEntry getEntry(Long uid);
+	
+	/**
+	 * 
+	 * @param uid
+	 * @param title
+	 * @param entry
+	 */
+	void updateEntry(Long uid, String entry);
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	20 Jul 2006 05:41:21 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	25 Jul 2006 07:15:34 -0000	1.2
@@ -44,11 +44,12 @@
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
-import org.lamsfoundation.lams.journal.service.IJournalService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -101,9 +102,9 @@
 	private IAuditService auditService = null;
 
 	private IExportToolContentService exportContentService;
-	
-	private IJournalService journalService;
 
+	private ICoreNotebookService coreNotebookService;
+
 	public NotebookService() {
 		super();
 		// TODO Auto-generated constructor stub
@@ -149,7 +150,7 @@
 	public void removeToolSession(Long toolSessionId)
 			throws DataMissingException, ToolException {
 		notebookSessionDAO.deleteBySessionID(toolSessionId);
-		//TODO check if cascade worked
+		// TODO check if cascade worked
 	}
 
 	/* ************ Methods from ToolContentManager ************************* */
@@ -181,8 +182,9 @@
 	public void setAsDefineLater(Long toolContentId)
 			throws DataMissingException, ToolException {
 		Notebook notebook = notebookDAO.getByContentId(toolContentId);
-		if(notebook == null){
-			throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
+		if (notebook == null) {
+			throw new ToolException("Could not find tool with toolContentID: "
+					+ toolContentId);
 		}
 		notebook.setDefineLater(true);
 		notebookDAO.saveOrUpdate(notebook);
@@ -191,8 +193,9 @@
 	public void setAsRunOffline(Long toolContentId)
 			throws DataMissingException, ToolException {
 		Notebook notebook = notebookDAO.getByContentId(toolContentId);
-		if(notebook == null){
-			throw new ToolException("Could not find tool with toolContentID: " + toolContentId);
+		if (notebook == null) {
+			throw new ToolException("Could not find tool with toolContentID: "
+					+ toolContentId);
 		}
 		notebook.setRunOffline(true);
 		notebookDAO.saveOrUpdate(notebook);
@@ -222,17 +225,18 @@
 
 		// set ResourceToolContentHandler as null to avoid copy file node in
 		// repository again.
-		toolContentObj = Notebook.newInstance(toolContentObj, toolContentId, null);
+		toolContentObj = Notebook.newInstance(toolContentObj, toolContentId,
+				null);
 		toolContentObj.setToolContentHandler(null);
 		toolContentObj.setNotebookSessions(null);
 		Set<NotebookAttachment> atts = toolContentObj.getNotebookAttachments();
 		for (NotebookAttachment att : atts) {
 			att.setNotebook(null);
 		}
 		try {
-			exportContentService
-					.registerFileClassForExport(NotebookAttachment.class.getName(),
-							"fileUuid", "fileVersionId");
+			exportContentService.registerFileClassForExport(
+					NotebookAttachment.class.getName(), "fileUuid",
+					"fileVersionId");
 			exportContentService.exportToolContent(toolContentId,
 					toolContentObj, notebookToolContentHandler, rootPath);
 		} catch (ExportToolContentException e) {
@@ -272,7 +276,21 @@
 		}
 	}
 
-	/* ********** INotebookService Methods ************************************** */
+	/* ********** INotebookService Methods ********************************* */
+
+	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 uid) {
+		return coreNotebookService.getEntry(uid);
+	}
+
+	public void updateEntry(Long uid, String entry) {
+		coreNotebookService.updateEntry(uid, "", entry);
+	}
+	
 	public Long getDefaultContentIdBySignature(String toolSignature) {
 		Long toolContentId = null;
 		toolContentId = new Long(toolService
@@ -315,7 +333,8 @@
 	}
 
 	public Notebook getNotebookByContentId(Long toolContentID) {
-		Notebook notebook = (Notebook) notebookDAO.getByContentId(toolContentID);
+		Notebook notebook = (Notebook) notebookDAO
+				.getByContentId(toolContentID);
 		if (notebook == null) {
 			logger.debug("Could not find the content with toolContentID:"
 					+ toolContentID);
@@ -324,21 +343,25 @@
 	}
 
 	public NotebookSession getSessionBySessionId(Long toolSessionId) {
-		NotebookSession notebookSession = notebookSessionDAO.getBySessionId(toolSessionId);
+		NotebookSession notebookSession = notebookSessionDAO
+				.getBySessionId(toolSessionId);
 		if (notebookSession == null) {
-			logger.debug("Could not find the notebook session with toolSessionID:"
-					+ toolSessionId);
+			logger
+					.debug("Could not find the notebook session with toolSessionID:"
+							+ toolSessionId);
 		}
 		return notebookSession;
 	}
 
-	public NotebookUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) {
+	public NotebookUser getUserByUserIdAndSessionId(Long userId,
+			Long toolSessionId) {
 		return notebookUserDAO.getByUserIdAndSessionId(userId, toolSessionId);
 	}
 
 	public NotebookUser getUserByLoginNameAndSessionId(String loginName,
 			Long toolSessionId) {
-		return notebookUserDAO.getByLoginNameAndSessionId(loginName, toolSessionId);
+		return notebookUserDAO.getByLoginNameAndSessionId(loginName,
+				toolSessionId);
 	}
 
 	public NotebookUser getUserByUID(Long uid) {
@@ -398,7 +421,6 @@
 		return notebookUser;
 	}
 
-
 	public IAuditService getAuditService() {
 		return auditService;
 	}
@@ -407,8 +429,6 @@
 		this.auditService = auditService;
 	}
 
-	
-	
 	private NodeKey processFile(FormFile file, String type) {
 		NodeKey node = null;
 		if (file != null && !StringUtils.isEmpty(file.getFileName())) {
@@ -462,7 +482,8 @@
 			throw new NotebookException("Access Denied to repository."
 					+ ae.getMessage());
 		} catch (WorkspaceNotFoundException we) {
-			throw new NotebookException("Workspace not found." + we.getMessage());
+			throw new NotebookException("Workspace not found."
+					+ we.getMessage());
 		} catch (LoginException e) {
 			throw new NotebookException("Login failed." + e.getMessage());
 		}
@@ -536,11 +557,11 @@
 		this.exportContentService = exportContentService;
 	}
 
-	public IJournalService getJournalService() {
-		return journalService;
+	public ICoreNotebookService getCoreNotebookService() {
+		return coreNotebookService;
 	}
 
-	public void setJournalService(IJournalService journalService) {
-		this.journalService = journalService;
+	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+		this.coreNotebookService = coreNotebookService;
 	}
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java	25 Jul 2006 07:15:33 -0000	1.2
@@ -24,10 +24,6 @@
 
 package org.lamsfoundation.lams.tool.notebook.util;
 
-import java.util.LinkedList;
-
-import org.lamsfoundation.lams.tool.notebook.model.NotebookAttachment;
-
 public interface NotebookConstants {
 	public static final String TOOL_SIGNATURE = "lantbk11";
 	
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	20 Jul 2006 05:41:21 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	25 Jul 2006 07:15:35 -0000	1.3
@@ -28,12 +28,12 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 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;
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 import org.lamsfoundation.lams.tool.notebook.service.INotebookService;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
+import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookException;
 import org.lamsfoundation.lams.tool.notebook.web.forms.LearningForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -56,8 +57,9 @@
  * @author
  * @version
  * 
- * @struts.action path="/learning" parameter="dispatch" scope="request" name="learningForm"
- * @struts.action-forward name="notebook_client" path="tiles:/learning/main"
+ * @struts.action path="/learning" parameter="dispatch" scope="request"
+ *                name="learningForm"
+ * @struts.action-forward name="notebook" path="tiles:/learning/main"
  * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  */
@@ -72,20 +74,21 @@
 	public ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
+
+		LearningForm learningForm = (LearningForm) form;
+
 		// 'toolSessionID' and 'mode' paramters are expected to be present.
 		// TODO need to catch exceptions and handle errors.
 		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,
 				AttributeNames.PARAM_MODE, MODE_OPTIONAL);
-		
-		request.setAttribute("mode", mode.toString());
-		
+
 		Long toolSessionID = WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 
 		// set up notebookService
 		if (notebookService == null) {
-			notebookService = NotebookServiceProxy.getNotebookService(this.getServlet()
-					.getServletContext());
+			notebookService = NotebookServiceProxy.getNotebookService(this
+					.getServlet().getServletContext());
 		}
 
 		// Retrieve the session and content.
@@ -99,51 +102,64 @@
 
 		Notebook notebook = notebookSession.getNotebook();
 
-		// Retrieve the current user
-		NotebookUser notebookUser = getCurrentUser(toolSessionID);
-		
 		// check defineLater
 		if (notebook.getDefineLater()) {
 			return mapping.findForward("defineLater");
 		}
 
-		// check runOffline
-		if (notebook.getRunOffline()) {
-			request.setAttribute("mode", mode.toString());
-			request.setAttribute("USER_UID", notebookUser.getUid());
-			request.setAttribute("SESSION_ID", toolSessionID);
-			
-			
-			return mapping.findForward("runOffline");
-		}
-		
+		// set mode, toolSessionID and NotebookDTO
+		request.setAttribute("mode", mode.toString());
+		learningForm.setToolSessionID(toolSessionID);
+
 		NotebookDTO notebookDTO = new NotebookDTO();
 		notebookDTO.title = notebook.getTitle();
 		notebookDTO.instructions = notebook.getInstructions();
-		
 		request.setAttribute("notebookDTO", notebookDTO);
-		
-		// Ensure that the content is use flag is set.
+
+		// Set the content in use flag.
 		if (!notebook.getContentInUse()) {
 			notebook.setContentInUse(new Boolean(true));
 			notebookService.saveOrUpdateNotebook(notebook);
 		}
+
+		// check runOffline
+		if (notebook.getRunOffline()) {
+			return mapping.findForward("runOffline");
+		}
+
+		NotebookUser notebookUser = getCurrentUser(toolSessionID);
 		
-		return mapping.findForward("notebook_client");
+		// get any existing notebook entry
+		NotebookEntry nbEntry = notebookService.getEntry(notebookUser
+				.getEntryUID());
+		if (nbEntry != null) {
+			learningForm.setEntryText(nbEntry.getEntry());
+		}
+		
+		// set readOnly flag.
+		if (notebook.getLockOnFinished() && notebookUser.getFinishedActivity()) {
+			request.setAttribute("contentEditable", false);
+		} else {
+			request.setAttribute("contentEditable", true);
+		}
+
+		return mapping.findForward("notebook");
 	}
 
 	private NotebookUser getCurrentUser(Long toolSessionId) {
 		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(
 				AttributeNames.USER);
 
 		// attempt to retrieve user using userId and toolSessionId
-		NotebookUser notebookUser = notebookService.getUserByUserIdAndSessionId(new Long(
-				user.getUserID().intValue()), toolSessionId);
+		NotebookUser notebookUser = notebookService
+				.getUserByUserIdAndSessionId(new Long(user.getUserID()
+						.intValue()), toolSessionId);
 
 		if (notebookUser == null) {
 			NotebookSession notebookSession = notebookService
 					.getSessionBySessionId(toolSessionId);
-			notebookUser = notebookService.createNotebookUser(user, notebookSession);
+			notebookUser = notebookService.createNotebookUser(user,
+					notebookSession);
 		}
 
 		return notebookUser;
@@ -152,33 +168,42 @@
 	public ActionForward finishActivity(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		Long notebookUserUID = WebUtil.readLongParam(request, "notebookUserUID");
 		Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
 
-		// set the finished flag
-		NotebookUser notebookUser = notebookService.getUserByUID(notebookUserUID);
+		NotebookUser notebookUser = getCurrentUser(toolSessionID);
+
 		if (notebookUser != null) {
+
+			LearningForm learningForm = (LearningForm) form;
+
+			// TODO fix idType to use real value not 999
+
+			if (notebookUser.getEntryUID() == null) {
+				notebookUser.setEntryUID(notebookService.createNotebookEntry(
+						toolSessionID, 999, NotebookConstants.TOOL_SIGNATURE,
+						notebookUser.getUserId().intValue(), learningForm
+								.getEntryText()));
+			} else {
+				// update existing entry.
+				notebookService.updateEntry(notebookUser.getEntryUID(),
+						learningForm.getEntryText());
+			}
+
 			notebookUser.setFinishedActivity(true);
 			notebookService.saveOrUpdateNotebookUser(notebookUser);
 		} else {
-			log.error("finishActivity(): couldn't find NotebookUser with uid: "
-					+ notebookUserUID);
+			log.error("finishActivity(): couldn't find NotebookUser with id: "
+					+ notebookUser.getUserId() + "and toolSessionID: "
+					+ toolSessionID);
 		}
 
 		ToolSessionManager sessionMgrService = NotebookServiceProxy
 				.getNotebookSessionManager(getServlet().getServletContext());
 
-		// get back login user DTO
-		// get session from shared session.
-
-		HttpSession ss = SessionManager.getSession();
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long userID = new Long(user.getUserID().longValue());
-
 		String nextActivityUrl;
 		try {
 			nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,
-					userID);
+					notebookUser.getUserId());
 			response.sendRedirect(nextActivityUrl);
 		} catch (DataMissingException e) {
 			throw new NotebookException(e);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	20 Jul 2006 05:41:21 -0000	1.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	25 Jul 2006 07:15:35 -0000	1.3
@@ -82,12 +82,14 @@
 		}
 		
 		Notebook notebook = notebookService.getNotebookByContentId(toolContentID);
-		// TODO check for null
 		
+		if (notebook == null) {
+			// TODO need to define error page.
+		}
+		
 		NotebookDTO notebookDT0 = new NotebookDTO(notebook);
-				
-		request.setAttribute("monitoringDTO", notebookDT0);
 		
+		request.setAttribute("notebookDTO", notebookDT0);
 		return mapping.findForward("success");
 	}
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/LearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/LearningForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/LearningForm.java	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/LearningForm.java	25 Jul 2006 07:15:35 -0000	1.2
@@ -41,9 +41,10 @@
 	String instructions;
 	
 	String dispatch;
-	Long notebookUserUID;
 	Long toolSessionID;
 	String mode;
+	
+	String entryText;
 
 	public String getMode() {
 		return mode;
@@ -53,14 +54,6 @@
 		this.mode = mode;
 	}
 
-	public Long getNotebookUserUID() {
-		return notebookUserUID;
-	}
-
-	public void setNotebookUserUID(Long notebookUserUID) {
-		this.notebookUserUID = notebookUserUID;
-	}
-
 	public String getDispatch() {
 		return dispatch;
 	}
@@ -92,4 +85,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_notebook/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/WEB-INF/struts/struts-config.xml	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/WEB-INF/struts/struts-config.xml	25 Jul 2006 07:15:35 -0000	1.2
@@ -14,17 +14,17 @@
   <form-beans>
 
     <form-bean
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm"
+    />
+    <form-bean
       name="authoringForm"
       type="org.lamsfoundation.lams.tool.notebook.web.forms.AuthoringForm"
     />
     <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.notebook.web.forms.LearningForm"
     />
-    <form-bean
-      name="monitoringForm"
-      type="org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm"
-    />
 
   </form-beans>
 
@@ -51,7 +51,7 @@
       validate="true"
     >
       <forward
-        name="notebook_client"
+        name="notebook"
         path="tiles:/learning/main"
         redirect="false"
       />
@@ -67,26 +67,6 @@
       />
     </action>
     <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.notebook.web.actions.AuthoringAction"
-      name="authoringForm"
-      scope="request"
-      parameter="dispatch"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="tiles:/authoring/main"
-        redirect="false"
-      />
-      <forward
-        name="message_page"
-        path="tiles:/generic/message"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/monitoring"
       type="org.lamsfoundation.lams.tool.notebook.web.actions.MonitoringAction"
       name="monitoringForm"
@@ -118,6 +98,26 @@
       validate="false"
     >
     </action>
+    <action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.notebook.web.actions.AuthoringAction"
+      name="authoringForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="tiles:/authoring/main"
+        redirect="false"
+      />
+      <forward
+        name="message_page"
+        path="tiles:/generic/message"
+        redirect="false"
+      />
+    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	20 Jul 2006 01:11:10 -0000	1.1
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	25 Jul 2006 07:15:33 -0000	1.2
@@ -39,11 +39,6 @@
 						<h2>
 							${session.sessionName}
 						</h2>
-						<p>
-						<c:forEach var="message" items="${session.messageDTOs}">
-								${message.from} : ${message.body}<BR>
-						</c:forEach>
-						</p>
 					</div>
 				</c:forEach>
 		
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/learning/notebook.jsp	20 Jul 2006 01:11:08 -0000	1.1
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	25 Jul 2006 07:15:33 -0000	1.2
@@ -1,23 +1,48 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <h1 class="no-tabs-below">
-	<fmt:message key="activity.title" />
+	${notebookDTO.title}
 </h1>
 <div id="header-no-tabs-learner"></div>
 <div id="content-learner">
-This is notebook content.
-	<c:if test="${MODE == 'learner' || MODE == 'author'}">
+	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post">
-			<div class="right-buttons">
-				<html:hidden property="dispatch" value="finishActivity" />
-				<html:hidden property="notebookUserUID" value="${USER_UID}" />
-				<html:hidden property="toolSessionID" value="${SESSION_ID}" />
-				<html:submit styleClass="button">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
-			</div>
+
+			<table>
+				<tr>
+					<td>
+						${notebookDTO.instructions}
+					</td>
+				</tr>
+				
+				<c:if test="${not contentEditable}">
+					<tr>
+						<td>
+							
+						</td>
+					</tr>
+				</c:if>
+
+
+				<tr>
+					<td>
+						<div>
+							<html:textarea property="entryText" readonly="${not contentEditable}" rows="5" cols="66"></html:textarea>
+						</div>
+					</td>
+				</tr>
+
+				<tr>
+					<td class="right-buttons">
+						<html:hidden property="dispatch" value="finishActivity" />
+						<html:hidden property="toolSessionID" />
+						<html:submit styleClass="button">
+							<fmt:message>button.finish</fmt:message>
+						</html:submit>
+					</td>
+				</tr>
+			</table>
 		</html:form>
 	</c:if>
-	<div class="space-bottom"></div>
 </div>
-<div id="footer-learner"></div>
\ No newline at end of file
+<div id="footer-learner"></div>
Index: lams_tool_notebook/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/learning/runOffline.jsp	20 Jul 2006 01:11:08 -0000	1.1
+++ lams_tool_notebook/web/pages/learning/runOffline.jsp	25 Jul 2006 07:15:33 -0000	1.2
@@ -1,30 +1,37 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <h1 class="no-tabs-below">
-	<fmt:message key="activity.title" />
+	${notebookDTO.title}
 </h1>
 <div id="header-no-tabs-learner"></div>
 <div id="content-learner">
-	<table>
-		<tr>
-			<td>
-				<fmt:message key="message.runOfflineSet" />
-			</td>
-		</tr>
-	</table>
-
-	<c:if test="${MODE == 'learner' || MODE == 'author'}">
+	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post">
-			<div class="right-buttons">
-				<html:hidden property="dispatch" value="finishActivity" />
-				<html:hidden property="notebookUserUID" value="${USER_UID}" />
-				<html:hidden property="toolSessionID" value="${SESSION_ID}" />
-				<html:submit styleClass="button">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
-			</div>
+
+			<table>
+				<tr>
+					<td>
+						${notebookDTO.instructions}
+					</td>
+				</tr>
+
+				<tr>
+					<td>
+						<fmt:message key="message.runOfflineSet" />
+					</td>
+				</tr>
+
+				<tr>
+					<td class="right-buttons">
+						<html:hidden property="dispatch" value="finishActivity" />
+						<html:hidden property="toolSessionID" />
+						<html:submit styleClass="button">
+							<fmt:message>button.finish</fmt:message>
+						</html:submit>
+					</td>
+				</tr>
+			</table>
 		</html:form>
 	</c:if>
-	<div class="space-bottom"></div>
 </div>
 <div id="footer-learner"></div>
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	25 Jul 2006 07:15:35 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
+<c:set var="dto" value="${notebookDTO}" />
 
 <table cellspacing="0">
 	<tbody>
Index: lams_tool_notebook/web/pages/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/monitoring/instructions.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/pages/monitoring/instructions.jsp	25 Jul 2006 07:15:35 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
+<c:set var="dto" value="${notebookDTO}" />
 <table>
 	<tbody>
 		<tr>
Index: lams_tool_notebook/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/statistics.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/monitoring/statistics.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/pages/monitoring/statistics.jsp	25 Jul 2006 07:15:35 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
+<c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 	<table cellspacing="0">
 		<tbody>
@@ -18,24 +18,6 @@
 					${session.numberOfLearners}
 				</td>
 			</tr>
-
-			<tr>
-				<td class="field-name" width="30%">
-					<fmt:message>heading.totalMessages</fmt:message>
-				</td>
-				<td>
-					${session.numberOfPosts}
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					<fmt:message>Learner</fmt:message>
-				</th>
-				<th>
-					<fmt:message>No of Posts</fmt:message>
-				</th>
-			</tr>
 		</tbody>
 	</table>
 </c:forEach>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	25 Jul 2006 07:15:35 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
+<c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 	<table cellspacing="0">
 		<tr>
@@ -17,45 +17,5 @@
 				${session.numberOfLearners}
 			</td>
 		</tr>
-
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message>heading.totalMessages</fmt:message>
-			</td>
-			<td>
-				${session.numberOfPosts}
-			</td>
-		</tr>
-
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message>heading.recentMessages</fmt:message>
-			</td>
-			<td>
-				&nbsp;
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div style="background-color: white; padding: 8px;">
-					<c:choose>
-						<c:when test="${empty session.messageDTOs}">
-							<fmt:message>message.noNotebookMessages</fmt:message>
-						</c:when>
-						<c:otherwise>
-
-							<c:forEach var="message" items="${session.messageDTOs}">
-								<div>
-									<span style="font-weight: bold"> ${message.from}</span> ${message.body}
-									<br />
-								</div>
-							</c:forEach>
-
-						</c:otherwise>
-					</c:choose>
-				</div>
-			</td>
-		</tr>
-
 	</table>
 </c:forEach>