X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webapp%2Fview%2Freports%2FSequences.jsp;h=3ba5d1095c51aba6ba807ab0b3ad39fed973880b;hb=2f8bfe58e2047682c3a66f6b2709a80ad6027c39;hp=0bb4b7a4e341697be73bf5669aabfa4cf17f1f30;hpb=32cb93e5d1032189360155cbeedd45adadebfd46;p=proteocache.git

diff --git a/webapp/view/reports/Sequences.jsp b/webapp/view/reports/Sequences.jsp
index 0bb4b7a..3ba5d10 100644
--- a/webapp/view/reports/Sequences.jsp
+++ b/webapp/view/reports/Sequences.jsp
@@ -4,7 +4,7 @@
 <%@ 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"%>
-<%@page import="java.util.ArrayList"%>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 
 <html>
 <jsp:include page="../fragments/header.jsp" />
@@ -12,7 +12,7 @@
 	<div class="container">
 		<jsp:include page="../fragments/mainmenu.jsp" />
 		<spring:url value="/job/results" var="job_query" />
-		<spring:url value="/sequence/sequence/results?sequence=${prot}&searchtype=${searchtype}" var="the_query"/>
+		<spring:url value="/sequence/results?sequence=${prot}&searchtype=${searchtype}" var="the_query"/>
 		<c:set var="shortensequencelength" value="108"/>
 
 		<!-- reload and CSV buttons  -->
@@ -46,6 +46,9 @@
 	</div>
 
 	<div class="panel-body">
+<sec:authorize access="hasRole('ROLE_ADMIN')">
+			<p>Servlet execution time: ${timeExecution} milliseconds</p>
+</sec:authorize>
 		<c:choose>
 			<c:when test="${njobs == 0}">
 				<p>No jobs found</p>
@@ -66,41 +69,36 @@
 							<c:forEach items="${results}" var="res" varStatus="status">
 								<c:forEach items="${res.jobid}" var="id" varStatus="status">
 								<tr>
-									<th rowspan="${res.size + 2}"><a
+									<th rowspan="3"><a
 										title="Click to view the job log"
 										href="${job_query}?IdJob=${id}">${id}</a></th>
 								</tr>
 								<tr>
 									<td style="text-align: center; font-weight: bold; font-family: monospace">Sequence</td>
 									<c:if test="${searchtype == 'whole'}">
-										<td
-											style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out
-												value="${res.sequence}" /></td>
+										<td style="text-align: left; font-family: monospace">
+												${res.sequence}</td>
 									</c:if>
 									<c:if test="${searchtype == 'partial'}">
-										<td
-											style="text-align: left; border-buttom: dotted; font-family: monospace">
+										<td style="text-align: left; border-buttom: dotted; font-family: monospace">
 											<c:forEach items="${res.subProt}" var="seq">
 												<c:choose>
-							<c:when test="${fn:contains(seq, prot)}">
-							<span style="background-color: blue">${seq}</span></c:when>
-							<c:otherwise>${seq}</c:otherwise>
+												<c:when test="${fn:contains(seq, prot)}">
+												<span style="background-color: blue">${seq}</span></c:when>
+												<c:otherwise>${seq}</c:otherwise>
 												</c:choose>
 											</c:forEach>
 										</td>
 									</c:if>
 								</tr>
-								<c:forEach items="${res.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>
+								<tr>
+									<td style="text-align: center; font-weight: bold; font-family: monospace">
+										Jnetpred
+									</td>
+									<td style="text-align: left; border-buttom: dotted; font-family: monospace">
+										${res.jnetpred}
+									</td>
+								</tr>
 							</c:forEach>
 							</c:forEach>
 						</tbody>
@@ -116,4 +114,4 @@
 		<jsp:include page="../fragments/footer.jsp" />
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
