git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
1. Fix problem with slow servlets (wrong forming CVS line)
[proteocache.git] / webapp / view / reports / Sequences.jsp
diff --git a/webapp/view/reports/Sequences.jsp b/webapp/view/reports/Sequences.jsp
index 0bb4b7a..b0f384a 100644 (file)
--- 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" />
@@ -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>