Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r97170f7f8d0dd45abce21f7adfe73d93f40cb78f -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 97170f7f8d0dd45abce21f7adfe73d93f40cb78f)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -184,6 +184,7 @@
 msg.no.lessons  =No lessons
 label.return.to.myprofile  =Return to My Profile
 label.help  =Help?
+label.completed = Completed!
 
 
 #======= End labels: Exported 178 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r97170f7f8d0dd45abce21f7adfe73d93f40cb78f -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 97170f7f8d0dd45abce21f7adfe73d93f40cb78f)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -184,6 +184,7 @@
 msg.no.lessons  =No lessons
 label.return.to.myprofile  =Return to My Profile
 label.help  =Help?
+label.completed = Completed!
 
 
 #======= End labels: Exported 178 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 07578aaa7f526c0c1b537c127cf5f88e0410d472)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -308,8 +308,10 @@
 	// get lesson beans where user is learner (if isStaff=true, gets lessons where user is staff)
 	private Map<Long, IndexLessonBean> getLessonsByOrgAndUser(Integer userId, Integer orgId, boolean isStaff) 
 		throws SQLException, NamingException {
-		String learnerQuery = "select l.lesson_id, l.name, l.description, l.lesson_state_id "
-			+ " from lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi"
+		// TODO refactor using hibernate named query
+		String learnerQuery = "select l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag "
+			+ " from (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)"
+			+ " left join lams_learner_progress lp on lp.user_id=ug.user_id and lp.lesson_id=l.lesson_id"
 			+ " where l.learning_design_id=ld.learning_design_id"
 			+ " and ld.copy_type_id!=" + LearningDesign.COPY_TYPE_PREVIEW
 			+ " and l.organisation_id=?"
@@ -339,8 +341,9 @@
 				String name = rs.getString(2);
 				String description = rs.getString(3);
 				int state = rs.getInt(4);
+				boolean lessonCompleted = rs.getBoolean(5);
 				IndexLessonBean bean = new IndexLessonBean(
-					new Long(id), name, description, new Integer(state)
+					new Long(id), name, description, new Integer(state), lessonCompleted
 				);
 				map.put(new Long(id), bean);
 			}
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java
===================================================================
diff -u -r97336c15381a6a96013b087b0844f173d1ddedd7 -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java	(.../IndexLessonBean.java)	(revision 97336c15381a6a96013b087b0844f173d1ddedd7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java	(.../IndexLessonBean.java)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -41,26 +41,29 @@
 	private String description;
 	private String url;
 	private Integer state;
+	private boolean completed;
 	private List<IndexLinkBean> links;
 
 	public IndexLessonBean(String name, String url) {
 		this.name = name;
 		this.url = url;
 	}
 	
-	public IndexLessonBean(Long id, String name, String description, Integer state) {
+	public IndexLessonBean(Long id, String name, String description, Integer state, boolean completed) {
 		this.id = id;
 		this.name = name;
 		this.description = description;
 		this.state = state;
+		this.completed = completed;
 	}
 	
-	public IndexLessonBean(Long id, String name, String description, String url, Integer state, List<IndexLinkBean> links) {
+	public IndexLessonBean(Long id, String name, String description, String url, Integer state, boolean completed, List<IndexLinkBean> links) {
 		this.id = id;
 		this.name = name;
 		this.description = description;
 		this.url = url;
 		this.state = state;
+		this.completed = completed;
 		this.links = links;
 	}
 	/**
@@ -114,4 +117,10 @@
 	public void setState(Integer state) {
 		this.state = state;
 	}
+	public boolean getCompleted() {
+		return completed;
+	}
+	public void setCompleted(boolean completed) {
+		this.completed = completed;
+	}
 }
Index: lams_central/web/css/defaultHTML.css
===================================================================
diff -u -re99f2a23689fd7b7311fedb74b6d2c475d402cc4 -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision e99f2a23689fd7b7311fedb74b6d2c475d402cc4)
+++ lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -1198,10 +1198,18 @@
 .mycourses-addlesson-img {background: url('../images/css/mycourses_addlesson.jpg') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px;
 }
 
+/*
+	TODO replace background images for stop and completed with different symbols
+*/
+.mycourses-stop-img {background: url('../images/css/mycourses_monitor.jpg') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
+}
 
+.mycourses-completed-img {background: url('../images/css/mycourses_monitor.jpg') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; 
+}
 
 
 
+
 /*IE style workarounds */
 
 * html  #header { /*layout of the header */
Index: lams_central/web/groupContents.jsp
===================================================================
diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -r59bfecd711928c0ac9acfb15c64156bfa38bf216
--- lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 07578aaa7f526c0c1b537c127cf5f88e0410d472)
+++ lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 59bfecd711928c0ac9acfb15c64156bfa38bf216)
@@ -10,12 +10,13 @@
 			<p id="<c:out value="${lesson.id}"/>" class="j-single-lesson">
 				<c:if test="${empty lesson.url}">
 					<a title="<c:out value="${lesson.description}"/>" class="disabled-sequence-name-link"> <c:out value="${lesson.name}" /></a> 
-					<c:if test="${lesson.state eq 4}">&nbsp;(<fmt:message key="label.disabled"/>)</c:if>
-					<c:if test="${lesson.state eq 6}">&nbsp;(<fmt:message key="label.archived"/>)</c:if>
 				</c:if>
 				<c:if test="${not empty lesson.url}">
 					<a title="<c:out value="${lesson.description}"/>" href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" /></a> 
 				</c:if>
+				<c:if test="${lesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" ></span> </c:if>
+				<c:if test="${lesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" ></span> </c:if>
+				<c:if test="${lesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" ></span> </c:if>
 				<c:forEach var="lessonlink" items="${lesson.links}">
 					<a href="<c:out value='${lessonlink.url}'/>" class="sequence-action-link"> 
 						<span class="mycourses-monitor-img"> 
@@ -48,12 +49,13 @@
 				<p id="<c:out value="${childLesson.id}"/>" class="j-single-subgroup-lesson">
 					<c:if test="${empty childLesson.url}">
 						<a title="<c:out value="${childLesson.description}"/>" class="disabled-sequence-name-link"> <c:out value="${childLesson.name}" /></a>
-						<c:if test="${childLesson.state eq 4}">&nbsp;(<fmt:message key="label.disabled"/>)</c:if>
-						<c:if test="${childLesson.state eq 6}">&nbsp;(<fmt:message key="label.archived"/>)</c:if>
 					</c:if>
 					<c:if test="${not empty childLesson.url}">
 						<a title="<c:out value="${childLesson.description}"/>" href="<c:out value='${childLesson.url}'/>" class="sequence-name-link"> <c:out value="${childLesson.name}" /></a> 
 					</c:if>
+					<c:if test="${childLesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" ></span> </c:if>
+					<c:if test="${childLesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" ></span> </c:if>
+					<c:if test="${childLesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" ></span> </c:if>
 					<c:forEach var="childlessonlink" items="${childLesson.links}">
 					<a href="<c:out value='${childlessonlink.url}'/>" class="sequence-action-link"> 
 						<span class="mycourses-monitor-img">