git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improve visibility of the website
[proteocache.git] / webapp / view / reportIP.jsp
diff --git a/webapp/view/reportIP.jsp b/webapp/view/reportIP.jsp
index b2dc4fd..69d7aa2 100644 (file)
--- a/webapp/view/reportIP.jsp
+++ b/webapp/view/reportIP.jsp
@@ -13,11 +13,13 @@
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
-               <spring:url value="/sequence/querysequence" var="searchquery" />
-               <spring:url value="/joblog/query" var="jobquery" />
+               <spring:url value="/joblog/query" var="jobqueryservlet" />
 
-               <p style="font-weight:bold;">Job statistics for ${res.ip}</p>
-               <!-- <h3>Time execution: ${timeExecution} ms</h3>-->
+       <div class="panel panel-default">
+       <div class="panel-heading">
+               <p style="font-weight:bold;">Jobs executed from ${ip}</p>
+       </div>
+       <div class="panel-body">
 
                <c:choose>
                        <c:when test="${results == null}">
@@ -30,16 +32,25 @@
                                                <thead>
                                                        <tr>
                                                                <th style="text-align: centre">ID</th>
-                                                               <th style="text-align: left">IP</th>
+                                                               <th style="text-align: left">Date</th>
                                                                <th style="text-align: left">Sequence</th>
                                                        </tr>
                                                </thead>
                                                <tbody>
                                                        <c:forEach items="${results}" var="res" varStatus="status">
                                                                <tr>
-                                                                       <td><a href="{jobquery}?IdJob=${res.id}">${res.id}</a></td>
-                                                                       <td style="text-align: left; border-buttom: dotted; font-family: monospace">${res.ip}</td>
-                                                                       <td style="text-align: left; border-buttom: dotted; font-family: monospace">${res.prot}</td>
+                                                                       <td><a href="${jobqueryservlet}?IdJob=${res.id}&Search=Search">${res.id}</a></td>
+                                                                       <!-- <td style="text-align: left; border-buttom: dotted; font-family: monospace">${res.logInfo.dateStart}</td>-->
+                                                                       <td style="text-align: left; border-buttom: dotted; font-family: monospace">${res.date}</td>
+
+                                                                       <c:choose>
+                                                                       <c:when test="${res.prot==''}">
+                                                                               <td style="text-align: left; border-buttom: dotted; font-family: monospace">Alignment job</td>
+                                                                       </c:when>
+                                                                       <c:otherwise>
+                                                                               <td style="text-align: left; border-buttom: dotted; font-family: monospace">${res.prot}</td>
+                                                                       </c:otherwise>
+                                                                       </c:choose>
                                                                </tr>
                                                        </c:forEach>
                                                </tbody>
@@ -48,6 +59,10 @@
                        </c:otherwise>
                </c:choose>
 
+       </div>
+       </div>
+
+
                <jsp:include page="fragments/footer.jsp" />
        </div>
 </body>