Index: lams_tool_sbmt/web/export/exportportfolio.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r43348178ae9a52078019a87ff9d83cb80d6ff578
--- lams_tool_sbmt/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_sbmt/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 43348178ae9a52078019a87ff9d83cb80d6ff578)
@@ -25,99 +25,111 @@
 			<c:when test="${empty report}">
 				<h3>
 					<fmt:message key="label.learner.noUpload" />
-					:
 				</h3>
 			</c:when>
 			<c:otherwise>
 				<table>
 					<c:forEach items="${report}" var="mapElement">
+					
+						<!--  Start user entry -->
 						<c:set var="user" value="${mapElement.key}" />
 						<c:set var="submissionList" value="${mapElement.value}" />
-						<c:set var="first" value="true" />
-						<c:forEach items="${submissionList}" var="submission">
-							<c:if test="${first}">
-								<c:set var="first" value="false" />
+						
+						<tr>
+							<td colspan="2">
+								<c:out value="${user.firstName}" />
+								<c:out value="${user.lastName}" />
+								(
+								<c:out value="${user.login}" />
+								) , 
+								<fmt:message key="label.submit.file.suffix"/>:
+							</td>
+						</tr>
+						
+						<c:choose>
+						<c:when test="${empty submissionList}">
+							<tr>
+								<td colspan="2">
+									<fmt:message key="label.learner.noUpload" />
+							</td>
+						</tr>
+						</c:when>
+						<c:otherwise>
+							<c:forEach items="${submissionList}" var="submission">
 								<tr>
-									<td colspan="2">
-										<c:out value="${user.firstName}" />
-										<c:out value="${user.lastName}" />
-										(
-										<c:out value="${user.login}" />
-										) , 
-										<fmt:message key="label.submit.file.suffix"/>:
+									<td>
+										<fmt:message key="label.learner.filePath" />
+										:
 									</td>
+									<td>
+										<a href='<c:out value="${submission.exportedURL}"/>'> <c:out value="${submission.filePath}" /> </a>
+									</td>
+	
 								</tr>
-							</c:if>
-							<tr>
-								<td>
-									<fmt:message key="label.learner.filePath" />
-									:
-								</td>
-								<td>
-									<a href='<c:out value="${submission.exportedURL}"/>'> <c:out value="${submission.filePath}" /> </a>
-								</td>
+								<tr>
+									<td>
+										<fmt:message key="label.learner.fileDescription" />
+										:
+									</td>
+									<td>
+										<c:out value="${submission.fileDescription}" escapeXml="false" />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<fmt:message key="label.learner.dateOfSubmission" />
+										:
+									</td>
+									<td>
+										<c:out value="${submission.dateOfSubmission}" />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<fmt:message key="label.learner.marks" />
+										:
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${empty submission.marks}">
+												<fmt:message key="label.learner.notAvailable" />
+											</c:when>
+											<c:otherwise>
+												<c:out value="${submission.marks}" escapeXml="false" />
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<fmt:message key="label.learner.comments" />
+										:
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${empty submission.comments}">
+												<fmt:message key="label.learner.notAvailable" />
+											</c:when>
+											<c:otherwise>
+												<c:out value="${submission.comments}" escapeXml="false" />
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;
+									</td>
+									<td>
+										&nbsp;
+									</td>
+								</tr>
 
-							</tr>
-							<tr>
-								<td>
-									<fmt:message key="label.learner.fileDescription" />
-									:
-								</td>
-								<td>
-									<c:out value="${submission.fileDescription}" escapeXml="false" />
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<fmt:message key="label.learner.dateOfSubmission" />
-									:
-								</td>
-								<td>
-									<c:out value="${submission.dateOfSubmission}" />
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<fmt:message key="label.learner.marks" />
-									:
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty submission.marks}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${submission.marks}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<fmt:message key="label.learner.comments" />
-									:
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty submission.comments}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${submission.comments}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									&nbsp;
-								</td>
-								<td>
-									&nbsp;
-								</td>
-							</tr>
-
-						</c:forEach>
+							</c:forEach>
+						</c:otherwise>
+						</c:choose>
+						<!--  End user entry -->
+						
 					</c:forEach>
 				</table>
 			</c:otherwise>