X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=website%2FReportSequenceProtein.jsp;fp=website%2FReportSequenceProtein.jsp;h=c7473a259a2cd40918a9eae49035d5ce71d792b2;hb=1835d87d090291da1db317c27c7463191bfb54c4;hp=88cd29f88c0f23fd8febf3c008c42533f1c78812;hpb=34b63209df068b7671e40e5b298eb184785c83ac;p=proteocache.git

diff --git a/website/ReportSequenceProtein.jsp b/website/ReportSequenceProtein.jsp
index 88cd29f..c7473a2 100644
--- a/website/ReportSequenceProtein.jsp
+++ b/website/ReportSequenceProtein.jsp
@@ -1,28 +1,28 @@
 <%@page import="java.util.ArrayList"%>
-<%@ page trimDirectiveWhitespaces="true"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt"%>
+
 <c:choose>
 	<c:when test="${search == 'Search counter'}">
-		<h3>Dundee ProteoCache query result for jobs more than ${counter} </h3>
+		<h3>Dundee ProteoCache query results for jobs more than ${counter} </h3>
 	</c:when>
 	<c:otherwise>
-		<h3>Dundee ProteoCache query result</h3>
+		<h3>Dundee ProteoCache query results</h3>
 	</c:otherwise>
 </c:choose>
 <h3>Time execution: ${timeExecution} ms</h3>
 <c:choose>
 
-	<c:when test="${result == null}">
-		<h3>No jobs for sequence ${prot} </h3>
-	</c:when>
-	<c:otherwise>
-	
-	
+<c:when test="${results == null}">
+	<h3>No jobs for sequence ${prot} </h3>
+</c:when>
+<c:otherwise>
+
 <table border="1" style="border-collapse: collapse; white-space: nowrap">
 	<c:choose>
+
 		<c:when test="${search == 'Search counter'}">
 			<thead>
 				<tr>
@@ -31,32 +31,35 @@
 				</tr>
 			</thead>
 			<tbody>
-				<c:forEach items="${result}" var="res">
+				<c:forEach items="${results}" var="res">
 					<tr>
 						<td>${res.totalId}</td>
-						<td
-							style="text-align: left; border-buttom: dotted; font-family: monospace"><a
-							title="Click to view predictions"
-							href="ServletSequenceProtein?prot=${res.prot}&protein=whole&Search=Search+sequence&counterJob=${counter}">${res.prot}</a>
+						<td style="text-align: left; border-buttom: dotted; font-family: monospace">
+							<a title="Click to view all jobs" href="ServletSequenceProtein?prot=${res.prot}&protein=whole&Search=Search+sequence&counterJob=${counter}">${res.prot}</a>
 						</td>
 					</tr>
 				</c:forEach>
 		</c:when>
+
 		<c:otherwise>
 			<thead>
 				<tr>
-					<th style="text-align: centre">ID</th>
-					<th style="text-align: centre">Predictions</th>
+					<th style="text-align: centre">Job ID</th>
+					<th style="text-align: centre">annotation</th>
+					<th style="text-align: centre">Sequence</th>
 				</tr>
 			</thead>
 			<tbody>
-				<c:forEach items="${result}" var="res" varStatus="status">
+				<c:forEach items="${results}" var="res" varStatus="status">
+					<c:set var="ann" value="${res.predictions}"/>
 					<tr>
-						<td rowspan="2"><a href="ServletLogInfo?IdJob=${res.id}">${res.id}</a></td>
+						<th rowspan="${ann.mapsize + 2}"><a title="Click to view the job log" href="ServletLogInfo?IdJob=${res.id}">${res.id}</a></th>
+					</tr>
+					<tr>
+						<td style="text-align: center; font-weight: bold; font-family: monospace" >Protein Sequence</td>
+						<!--  <td style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out value="${res.prot}" /></td> -->
 						<c:if test="${flag == 'whole'}">
-							<td
-								style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out
-									value="${res.prot}" /></td>
+							<td style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out value="${res.prot}" /></td>
 						</c:if>
 						<c:if test="${flag == 'part'}">
 							<td
@@ -72,15 +75,17 @@
 							</td>
 						</c:if>
 					</tr>
-					<tr>
-						<td
-							style="text-align: left; border-top: hidden; font-family: monospace"><c:out
-								value="${res.jpred}" /></td>
-					</tr>
+					<c:forEach items="${ann.predictions}" var="seq" varStatus="status">
+						<tr>
+							<td style="text-align: center; font-weight: bold; font-family: monospace"><c:out value="${seq.key}"/></td>
+							<td style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out value="${seq.value}"/></td>
+						</tr>
+					</c:forEach>
 				</c:forEach>
 		</c:otherwise>
 	</c:choose>
 	</tbody>
 </table>
 </c:otherwise>
+
 </c:choose>
\ No newline at end of file