git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add the "Reload" and "CSV" buttons
[proteocache.git] / webapp / view / reportJobLog.jsp
diff --git a/webapp/view/reportJobLog.jsp b/webapp/view/reportJobLog.jsp
index 91b7b8f..115f9af 100644 (file)
--- a/webapp/view/reportJobLog.jsp
+++ b/webapp/view/reportJobLog.jsp
@@ -4,15 +4,15 @@
 <%@ 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" />
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
-               <spring:url value="/sequence/querysequence" var="searchquery" />
-               <spring:url value="/ip/query" var="ipquery" />
+               <spring:url value="/sequence/sequence/results" var="sequence_query" />
+               <spring:url value="/admin/ip/results" var="ip_query" />
 
                <div class="panel panel-default">
                <div class="panel-heading">
@@ -21,26 +21,37 @@
                <div class="panel-body">
                        <p>Start timestamp : ${result.dateStart}</p>
                        <p>End timestamp : ${result.dateEnd}</p>
-                       <p>IP: <a title="Click to view other jobs" href="${ipquery}?ip=${result.ip}&Search=Search">${result.ip}</a></p>
-
+<sec:authorize access="hasRole('ROLE_ADMIN')">
+                       <p>IP: <a title="Click to view other jobs" href="${ip_query}?ip=${result.ip}">${result.ip}</a></p>
+</sec:authorize>
+                       <c:if test='${jobarchive != null}'>
+                               <spring:url value="../${jobarchive}" var="jobarchivefile" />
+                               <p>Job archive: <a title="Click to get the file" href="${jobarchivefile}">download</a></p>
+                       </c:if>
+                       <div class="grid-wrapper-div">
                        <table class="table table-striped table-hover table-bordered">
                        <tbody>
+                               <thead>
+                                       <tr>
+                                               <th>ID</th>
+                                               <th >Sequence</th>
+                                       </tr>
+                               </thead>
                                <tr>
-                                       <td>Sequence</td>
-                                       <td style="text-align: left; border-buttom: dotted; font-family: monospace">
-                                               <a title="Click to view other jobs" href="${searchquery}?sequence=${result.sequence}&protein=whole&Search=Search">${result.sequence}</a>
+                                       <td>Protein</td>
+                                       <td >
+                                               <a title="Click to view other jobs" href="${sequence_query}?sequence=${result.sequence}&searchtype=whole">${result.sequence}</a>
                                        </td>
                                </tr>
                                <c:forEach items="${result.prediction}" var="pred">
                                        <tr>
                                                <td>${pred.key}</td>
-                                               <td
-                                                       style="text-align: left; border-buttom: dotted; font-family: monospace">
-                                                       ${pred.value}</td>
+                                               <td style="text-align: left; border-buttom: dotted; font-family: monospace">${pred.value}</td>
                                        </tr>
                                </c:forEach>
                        </tbody>
                        </table>
+                       </div>
                </div>
                </div>