Index: lams_monitoring/web/complexProgress.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/complexProgress.jsp,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/complexProgress.jsp	14 Jan 2008 23:33:33 -0000	1.1
+++ lams_monitoring/web/complexProgress.jsp	15 Feb 2008 07:13:30 -0000	1.2
@@ -9,34 +9,49 @@
 <c:if test="${!hasSequenceActivity}">
 <table class="alternative-color" cellspacing="0">
 <c:forEach items="${subActivities}" var="subActivity">
-	<c:set var="id" value="${subActivity.activityId}"/>
+	<c:set var="id" value="${subActivity.activityID}"/>
 	<tr>
-		<td><c:out value="${subActivity.title}"/></td>
-		<td><c:if test="${startedMap[id]}"><fmt:message key="label.started" /></c:if>
-			<c:if test="${!startedMap[id]}"><fmt:message key="label.not.started" /></c:if>
-		</td>
+		<c:choose>
+			<c:when test="${statusMap[id] == 1}">
+				<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
+				<td><fmt:message key="label.completed" /></td>
+			</c:when>
+			<c:when test="${statusMap[id] == 2}">
+				<td><a href="<lams:LAMSURL />/<c:out value="${urlMap[id]}" />"><c:out value="${subActivity.title}"/></a></td>
+				<td><fmt:message key="label.started" /></td>
+			</c:when>
+			<c:otherwise>
+				<td><c:out value="${subActivity.title}"/></td>
+				<td><fmt:message key="label.not.started" /></td>
+			</c:otherwise>
+		</c:choose>
 	</tr>
 </c:forEach>
 </table>
 </c:if>
 
 <c:if test="${hasSequenceActivity}">
 <c:forEach items="${subActivities}" var="subActivity">
-	<c:set var="id" value="${subActivity.activityId}" />
-	<h2><c:out value="${subActivity.title}" />
-		<c:if test="${startedMap[id]}"> - <fmt:message key="label.started" /></c:if>
-		<c:if test="${!startedMap[id]}"> - <fmt:message key="label.not.started" /></c:if>
+	<c:set var="id" value="${subActivity.activityID}" />
+	<h2><c:out value="${subActivity.title}" /> -
+	<c:choose>
+		<c:when test="${statusMap[id] == 1}"><fmt:message key="label.completed" /></c:when>
+		<c:when test="${statusMap[id] == 2}"><fmt:message key="label.started" /></c:when>
+		<c:otherwise><fmt:message key="label.not.started" /></c:otherwise>
+	</c:choose>
 	</h2>
 	<ul>
-		<c:forEach items="${subActivity.activities}" var="child">
-			<c:set var="childId" value="${child.activityId}"/>
+		<c:forEach items="${subActivity.childActivities}" var="child">
+			<c:set var="childId" value="${child.activityID}"/>
 			<li>
-				<c:if test="${startedMap[id]}">
+			<c:choose>
+				<c:when test="${statusMap[childId] == 1 or statusMap[childId] == 2}">
 				<a href="<lams:LAMSURL />/<c:out value="${urlMap[childId]}" />"><c:out value="${child.title}"/></a>
-				</c:if>
-				<c:if test="${!startedMap[id]}">
+				</c:when>
+				<c:otherwise>
 				<c:out value="${child.title}"/>
-				</c:if>
+				</c:otherwise>
+			</c:choose>
 			</li>
 		</c:forEach>
 	</ul>