create DateBean, UserBean, TotalBean

[proteocache.git] / webapp / view / reportIP.jsp

diff --git a/webapp/view/reportIP.jsp b/webapp/view/reportIP.jsp
index e224de5..dce9db8 100644 (file)
--- a/webapp/view/reportIP.jsp
+++ b/webapp/view/reportIP.jsp
@@ -34,20 +34,25 @@
                                                        </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>