Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.79.2.1 -r1.79.2.2
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	16 Apr 2009 06:46:26 -0000	1.79.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	20 Apr 2009 04:13:32 -0000	1.79.2.2
@@ -42,8 +42,8 @@
 				<value>classpath:org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
-				<value>classpath:org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>		
-				<value>classpath:org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml</value>			
+				<value>classpath:org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>
+				<value>classpath:org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml</value>
 				<value>classpath:org/lamsfoundation/lams/learningdesign/Competence.hbm.xml</value>
@@ -241,40 +241,14 @@
     	
     <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
 	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" singleton="false">
-	</bean>
-			
-	<!--  Core Notebook Service -->
-	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="userManagementService"><ref local="userManagementService"/></property>
-		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
-	</bean>
+	</bean>	
 	
 	<!--  Presence Chat Service -->
 	<bean id="presenceChatLoggerService" class="org.lamsfoundation.lams.presence.service.PresenceChatLoggerService">
 		<property name="messageService"><ref bean="commonMessageService"/></property>
 		<property name="presenceChatMessageDAO"><ref bean="presenceChatMessageDAO" /></property>
 	</bean>
 	
-	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
-		
-		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
-		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
-		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
-		<property name="proxyTargetClass"><value>true</value></property>     
-		
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
 	<!-- Event notification Service -->
 
 	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
@@ -314,6 +288,33 @@
 		</property>
 	</bean>
 	
+	<!--  Core Notebook Service -->
+	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="userManagementService"><ref local="userManagementService"/></property>
+		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
+		<property name="baseDAO"><ref bean="baseDAO" /></property>
+	</bean>
+	
+	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
+		
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
 	<!--  Configuration service -->
 	<bean id="configurationService" class="org.lamsfoundation.lams.util.Configuration">
 		<property name="configurationDAO"><ref bean="configurationDAO" /></property>
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java,v
diff -u -r1.8 -r1.8.16.1
--- lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java	4 Oct 2006 07:57:00 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java	20 Apr 2009 04:13:33 -0000	1.8.16.1
@@ -54,6 +54,8 @@
 	
 	private Date lastModified;
 	
+	private String lessonName;
+	
 	public NotebookEntry() {}
 	
 	public NotebookEntry(Long externalID, Integer externalIDType, String externalSignature, User user, String title, String entry, Date createDate) {
@@ -167,4 +169,12 @@
 	public void setLastModified(Date lastModified) {
 		this.lastModified = lastModified;
 	}
+	
+	public void setLessonName(String name) {
+		this.lessonName = name;
+	}
+	
+	public String getLessonName() {
+		return this.lessonName;
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java,v
diff -u -r1.10 -r1.10.16.1
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	4 Oct 2006 07:56:51 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	20 Apr 2009 04:13:33 -0000	1.10.16.1
@@ -27,21 +27,28 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.ArrayList;
+import java.util.TreeMap;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.notebook.dao.INotebookEntryDAO;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
 
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.Role;
 
 
 public class CoreNotebookService implements ICoreNotebookService, IExtendedCoreNotebookService{
 
 	private static Logger log = Logger.getLogger(CoreNotebookService.class);
 
 	private INotebookEntryDAO notebookEntryDAO;
+	
+    private IBaseDAO baseDAO;
 
 	protected IUserManagementService userManagementService;
 	
@@ -55,6 +62,29 @@
 		saveOrUpdateNotebookEntry(notebookEntry);
 		return notebookEntry.getUid();
 	}
+	
+	public TreeMap<Long, List<NotebookEntry>> getEntryByLesson(Integer userID, Integer idType) {
+		TreeMap<Long, List<NotebookEntry>> entryMap = new TreeMap<Long, List<NotebookEntry>>();
+		List<NotebookEntry> list = getEntry(userID, idType);
+		
+		for (NotebookEntry entry : list) {
+			if(entryMap.containsKey(entry.getExternalID())) {
+				String lessonName = (String) entryMap.get(entry.getExternalID()).get(0).getLessonName();
+				entry.setLessonName(lessonName);
+				entryMap.get(entry.getExternalID()).add(entry);
+			} else {
+				Lesson lesson = (Lesson) baseDAO.find(Lesson.class, entry.getExternalID());
+				List<NotebookEntry> newEntryList = new ArrayList<NotebookEntry>();
+				
+				entry.setLessonName(lesson.getLessonName());
+				newEntryList.add(entry);
+				
+				entryMap.put(entry.getExternalID(), newEntryList);
+			}
+		}
+		
+		return entryMap;
+	}
 
 	public List<NotebookEntry> getEntry(Long id, Integer idType, String signature, Integer userID) {
 		return notebookEntryDAO.get(id, idType, signature, userID);
@@ -111,6 +141,10 @@
 		this.notebookEntryDAO = notebookEntryDAO;
 	}
 	
+	public void setBaseDAO(IBaseDAO baseDAO) {
+		this.baseDAO = baseDAO;
+	}
+	
 	/**
      * 
      * @param IUserManagementService The userManagementService to set.
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java,v
diff -u -r1.7 -r1.7.16.1
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	4 Oct 2006 07:56:51 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	20 Apr 2009 04:13:33 -0000	1.7.16.1
@@ -26,6 +26,7 @@
 package org.lamsfoundation.lams.notebook.service;
 
 import java.util.List;
+import java.util.TreeMap;
 
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -37,6 +38,8 @@
 	Long createNotebookEntry(Long id, Integer idType, String signature,
 			Integer userID, String title, String entry);
 
+	TreeMap<Long, List<NotebookEntry>> getEntryByLesson(Integer userID, Integer idType);
+	
 	List<NotebookEntry> getEntry(Long id, Integer idType, String signature, Integer userID);
 	
 	List<NotebookEntry> getEntry(Long id, Integer idType, String signature);
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.38 -r1.38.4.1
--- lams_learning/conf/language/lams/ApplicationResources.properties	8 Mar 2009 02:54:28 -0000	1.38
+++ lams_learning/conf/language/lams/ApplicationResources.properties	20 Apr 2009 04:13:32 -0000	1.38.4.1
@@ -102,6 +102,6 @@
 export.portfolio.generated.date.label  =Portfolio generated:
 export.portfolio.generating.message  =Your portfolio might take a while to generate. Once it's ready, your browser will begin downloading the file.
 label.view.groups.learners  =Learners in group
+mynotes.signature.unknown.heading  =Unknown
 
-
 #======= End labels: Exported 96 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.37 -r1.37.4.1
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	8 Mar 2009 02:54:28 -0000	1.37
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	20 Apr 2009 04:13:32 -0000	1.37.4.1
@@ -102,6 +102,6 @@
 export.portfolio.generated.date.label  =Portfolio generated:
 export.portfolio.generating.message  =Your portfolio might take a while to generate. Once it's ready, your browser will begin downloading the file.
 label.view.groups.learners  =Learners in group
+mynotes.signature.unknown.heading  =Unknown
 
-
 #======= End labels: Exported 96 labels for en AU =====
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java,v
diff -u -r1.5 -r1.5.10.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	4 Oct 2006 07:57:03 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	20 Apr 2009 04:13:32 -0000	1.5.10.1
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.util.List;
+import java.util.TreeMap;
 import java.lang.Integer;
 
 import java.io.IOException;
@@ -123,9 +124,11 @@
 		Long lessonID = (Long) notebookForm.get(AttributeNames.PARAM_LESSON_ID);
 		
 		// get all notebook entries for the learner
-		List<NotebookEntry> entries = notebookService.getEntry(learnerID, CoreNotebookConstants.SCRATCH_PAD);
 		
-		request.getSession().setAttribute("entries", entries);
+		
+		TreeMap<Long, List<NotebookEntry>> entries = notebookService.getEntryByLesson(learnerID, CoreNotebookConstants.SCRATCH_PAD);
+		
+		request.getSession().setAttribute("entries", entries.values());
 		request.setAttribute("lessonID", lessonID);
 		
         return mapping.findForward(VIEW_ALL);
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/notebook/viewall.jsp,v
diff -u -r1.7 -r1.7.10.1
--- lams_learning/web/notebook/viewall.jsp	17 Nov 2006 07:30:10 -0000	1.7
+++ lams_learning/web/notebook/viewall.jsp	20 Apr 2009 04:13:32 -0000	1.7.10.1
@@ -32,76 +32,102 @@
 	
 		<h2><fmt:message key="mynotes.view.all.button"/></h2>
 		<p>&nbsp;</p>
-		<table class="alternative-color" cellspacing="0">		
-			<c:forEach var="entry" items="${entries}" varStatus="status">
-				
-				<!-- set sig check flag -->
-				<c:if test="${status.first}">
-					<c:set var="sigToCheck" value="${entry.externalSignature}"/>
-					<h2><fmt:message key="mynotes.signature.${sigToCheck}.heading"/></h2>
-						<tr>
-							<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
-						</tr>
-				</c:if>
-				
-				<c:if test="${!empty sigToCheck && sigToCheck != entry.externalSignature}">
-					<!-- do segment separator -->
-					</table>
+		<c:forEach var="entryList" items="${entries}" varStatus="list_status">
+			
+			<table class="alternative-color" cellspacing="0">
+			<c:forEach var="entry" items="${entryList}" varStatus="entry_status">
+					<html:link href="#" linkName="lesson${entry.externalID}" />
 					
-					<table>
-						<tr>
-							<td>
-								<div class="right-buttons">
-									<a href="${addnote}" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
-								</div>
-							</td>
-						</tr>
-					</table>
+					<!-- set sig check flag -->
+					<c:if test="${entry_status.first}">
+						<c:set var="sigToCheck">
+							<c:if test="${entry.externalSignature != ''}">
+								<c:out value="${entry.externalSignature}"/>
+							</c:if>
+						</c:set>
+						
+						<c:set var="addnote">
+							<html:rewrite page="/notebook/add.do?lessonID=" /><c:out value="${entry.externalID}"/>
+						</c:set> 
+						
+						<h2>
+						<c:choose>
+							<c:when test="${!empty sigToCheck}">
+								<fmt:message key="mynotes.signature.${sigToCheck}.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="mynotes.signature.unknown.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
+							</c:otherwise>
+						</c:choose>
+						</h2>	
+						
+							<tr>
+								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
+							</tr>
+					</c:if>
 					
-					<c:set var="sigToCheck" value="${entry.externalSignature}"/>
-					<h2><fmt:message key="mynotes.signature.${sigToCheck}.heading"/></h2>
-					
-					<table class="alternative-color" cellspacing="0">
-						<tr>
-							<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
-							<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
-						</tr>
-				</c:if>
+					<c:if test="${!empty sigToCheck && sigToCheck != entry.externalSignature}">
+						<!-- do segment separator -->
+						</table>
+						
+						<c:set var="sigToCheck" value="${entry.externalSignature}"/>
+						
+						<h2>
+						<c:choose>
+							<c:when test="${!empty sigToCheck}">
+								<fmt:message key="mynotes.signature.${sigToCheck}.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="mynotes.signature.unknown.heading"/> - <c:out value="${entry.lessonName}" escapeXml="false" />
+							</c:otherwise>
+						</c:choose>
+						</h2>		
+								
+						<table class="alternative-color" cellspacing="0">
+							<tr>
+								<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label"/></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label"/></th>
+								<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.last.modified.label"/></th>
+							</tr>
+					</c:if>
+						
+					<tr>
+						<td class="align-left" width="28%">
+							<c:set var="viewnote">
+								<html:rewrite page="/notebook.do?method=viewEntry&uid=" /><c:out value="${entry.uid}"/>
+							</c:set> 
+							<html:link href="${viewnote}">
+								<c:choose>
+									<c:when test="${empty entry.title}">
+										<fmt:message key="mynotes.entry.no.title.label"/>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${entry.title}" escapeXml="false"/>
+									</c:otherwise>
+								</c:choose>
+							</html:link>
+						</td><td>&nbsp;</td>
+						<td><lams:Date value="${entry.createDate}"/></td>
+						<td><lams:Date value="${entry.lastModified}"/></td>
+					</tr>
+				</c:forEach>
 				
-				<tr>
-					<td class="align-left" width="28%">
-						<c:set var="viewnote">
-							<html:rewrite page="/notebook.do?method=viewEntry&uid=" /><c:out value="${entry.uid}"/>
-						</c:set> 
-						<html:link href="${viewnote}">
-							<c:choose>
-								<c:when test="${empty entry.title}">
-									<fmt:message key="mynotes.entry.no.title.label"/>
-								</c:when>
-								<c:otherwise>
-									<c:out value="${entry.title}" escapeXml="false"/>
-								</c:otherwise>
-							</c:choose>
-						</html:link>
-					</td><td>&nbsp;</td>
-					<td><lams:Date value="${entry.createDate}"/></td>
-					<td><lams:Date value="${entry.lastModified}"/></td>
-				</tr>
-			</c:forEach>
+				<!--  new add button for lesson -->
+				<table>
+					<tr>
+						<td>
+							<div class="right-buttons">
+								<a href="${addnote}" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
+							</div>
+						</td>
+					</tr>
+				</table>
+				
+			</table>
+		</c:forEach>
 		
-		</table>
-		<table>
-			<tr>
-				<td>
-				<div class="right-buttons">
-					<a href="${addnote}" class="button" id="addNewBtn"><fmt:message key="mynotes.add.new.button"/></a>
-				</div>
-				</td>
-			</tr>
-		</table>
 	</div>  <!--closes content-->