-<%@ page language="java" contentType="text/html; charset=UTF-8"
- pageEncoding="UTF-8"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
<%@ 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"%>
<html>
<jsp:include page="fragments/header.jsp" />
<body>
<div class="container">
<jsp:include page="fragments/mainmenu.jsp" />
- <spring:url value="/joblog/query" var="jobqueryservlet" />
+ <spring:url value="/job/results" var="jobqueryservlet" />
<div class="panel panel-default">
<div class="panel-heading">
</tr>
</thead>
<tbody>
- <c:forEach items="${results}" var="res" varStatus="status">
+ <c:forEach items="${results.mainInfo}" var="res" varStatus="status">
<tr>
- <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>
+ <td><a href="${jobqueryservlet}?IdJob=${res.key}&Search=Search">${res.key}</a></td>
+
+ <c:forEach items="${res.value}" var="info" varStatus="status">
+ <c:if test="${status.first}">
+ <td style="text-align: left; border-buttom: dotted; font-family: monospace">${info}</td>
+ </c:if>
+ <c:if test="${!status.first}">
+ <c:choose>
+ <c:when test="${info==''}">
+ <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">${info}</td>
+ </c:otherwise>
+ </c:choose>
+ </c:if>
+ </c:forEach>
</tr>
</c:forEach>
</tbody>
</div>
</div>
-
<jsp:include page="fragments/footer.jsp" />
</div>
</body>