Merge branch 'DAO'

[proteocache.git] / webapp / view / reports / Job.jsp

diff --git a/webapp/view/reports/Job.jsp b/webapp/view/reports/Job.jsp
index 64d7896..03be890 100644 (file)
--- a/webapp/view/reports/Job.jsp
+++ b/webapp/view/reports/Job.jsp
@@ -21,6 +21,18 @@
                <div class="panel-body">
                        <p>Start timestamp : ${result.dateStart}</p>
                        <p>End timestamp : ${result.dateEnd}</p>
+                       <c:if test='${result.programName != null}'>
+                               <c:choose>
+                               <c:when test="${result.programLink != ''}">
+                                       <p style="font-weight:bold;">
+                                       Program: <a href="${result.programLink}">${result.programName}</a> (version : ${result.programVersion})
+                                       </p>
+                               </c:when>
+                               <c:otherwise>
+                                       <p style="font-weight:bold;">Program : ${result.programName} (version : ${result.programVersion})</p>
+                               </c:otherwise>
+                               </c:choose>
+                       </c:if>
 <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>
@@ -28,6 +40,9 @@
                                <spring:url value="../${jobarchive}" var="jobarchivefile" />
                                <p>Job archive: <a title="Click to get the file" href="${jobarchivefile}">download</a></p>
                        </c:if>
+                       <c:if test='${jobremotelink != null}'>
+                               <p>Original job link: <a title="Click to go to original job" href="${jobremotelink}">view</a></p>
+                       </c:if>
                        <div class="grid-wrapper-div">
                        <table class="table table-striped table-hover table-bordered">
                        <tbody>