git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into PROT-9-webservice
[proteocache.git] / webapp / view / reports / IP.jsp
diff --git a/webapp/view/reportIP.jsp b/webapp/view/reports/IP.jsp
similarity index 63%
rename from webapp/view/reportIP.jsp
rename to webapp/view/reports/IP.jsp
index 0d87c6e..83f0f30 100644 (file)
--- a/webapp/view/reportIP.jsp
+++ b/webapp/view/reports/IP.jsp
@@ -6,12 +6,44 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="../fragments/header.jsp" />
 <body>
        <div class="container">
-               <jsp:include page="fragments/mainmenu.jsp" />
+               <jsp:include page="../fragments/mainmenu.jsp" />
                <spring:url value="/job/results" var="jobqueryservlet" />
 
+               <c:set var="csv" value="\'Job ID\', \'Date\', \'Sequence\'"/>
+               <c:forEach items="${results.mainInfo}" var="res" varStatus="status">
+                       <c:set var="csv" value="${csv}%0A'${res.key}"/>
+                       <c:forEach items="${res.value}" var="info" varStatus="status">
+                               <c:if test="${status.first}">
+                                       <c:set var="csv" value="${csv}\',\'${info}"/>
+                               </c:if>
+                               <c:if test="${!status.first}">
+                                       <c:choose>
+                                               <c:when test="${info==''}">
+                                                       <c:set var="csv" value="${csv}\',\'Alignment job"/>
+                                               </c:when>
+                                               <c:otherwise>
+                                                       <c:set var="csv" value="${csv}\',\'${info}"/>
+                                               </c:otherwise>
+                                       </c:choose>
+                               </c:if>
+                       </c:forEach>
+                       <c:set var="csv" value="${csv}\'"/>
+               </c:forEach>
+
+               <!-- reload and CSV buttons  -->
+               <ul class="nav navbar-nav navbar-right">
+                       <li>
+                       <a href="${the_query}" class="btn btn-default active">Reload</a>
+                       </li>
+                       <li>
+                       <a id="forCSVfile" download="data.csv" href="data:application/csv;charset=utf-8,${csv}" class="btn btn-default active">CSV</a>
+                       </li>
+               </ul>
+
+
        <div class="panel panel-default">
        <div class="panel-heading">
                <p style="font-weight:bold;">Jobs executed from ${ip}</p>
@@ -25,6 +57,7 @@
                        <c:otherwise>
                                <p>${njobs} jobs found:</p>
                                <div class="table-responsive">
+                                       <div class="grid-wrapper-div">
                                        <table class="table table-striped table-hover table-bordered">
                                                <thead>
                                                        <tr>
@@ -57,6 +90,7 @@
                                                        </c:forEach>
                                                </tbody>
                                        </table>
+                                       </div>
                                </div>
                        </c:otherwise>
                </c:choose>
@@ -64,7 +98,7 @@
        </div>
        </div>
 
-               <jsp:include page="fragments/footer.jsp" />
+               <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file