Added the slcExecutionView controller and modified slcExecutionList with links to it.

git-svn-id: https://svn.argeo.org/slc/trunk@1066 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
index 16ec29560a4e0dd40f313bed05abc7b8e3f48bb8..9123e22bacd1be529e1130634791dbecfc926f34 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
@@ -10,10 +10,20 @@
 <h1>SLC Execution List</h1>\r
 \r
 <table>\r
+       <tr>\r
+               <td></td>\r
+               <td>UUID</td>\r
+               <td>STATUS</td>\r
+               <td>HOST</td>\r
+               <td>TYPE</td>           \r
+       </tr>\r
        <c:forEach items="${slcExecutions}" var="slcExecution">\r
                <tr>\r
+                       <td><a href="slcExecutionView.web?uuid=${slcExecution.uuid}">View details</a></td>\r
                        <td>${slcExecution.uuid}</td>\r
                        <td>${slcExecution.status}</td>\r
+                       <td>${slcExecution.host}</td>\r
+                       <td>${slcExecution.type}</td>\r
                </tr>\r
        </c:forEach>\r
 </table>\r

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
new file mode 100644 (file)
index 0000000..ee5e40c
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
+       pageEncoding="ISO-8859-1"%>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
+\r
+<%@include file="header.txt"%>\r
+<jsp:include page="common.jsp" />\r
+\r
+<div id="main">\r
+<h1>SLC Execution Details</h1>\r
+<h2>Uuid = ${slcExecution.uuid}</h2>\r
+<br>\r
+<h2>Execution Steps</h2>\r
+<table>\r
+       <tr>\r
+               <td>UUID</td>\r
+               <td>TYPE</td>\r
+               <td>BEGIN</td>\r
+       </tr>\r
+       <c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">\r
+               <tr>\r
+                       <td>${slcExecutionStep.uuid}</td>\r
+                       <td>${slcExecutionStep.type}</td>\r
+                       <td>${slcExecutionStep.begin}</td>\r
+               </tr>\r
+               <c:forEach items="${slcExecutionStep.logLines}" var="slcExecutionStepLog">\r
+               <tr>\r
+                       <td colspan="3">- <em>${slcExecutionStepLog}</em></td>\r
+               </tr>\r
+               </c:forEach>\r
+               <tr>\r
+               </tr>\r
+       </c:forEach>\r
+\r
+</table>\r
+</div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
index 6b5b425d62fbb3cef0c1c3dac5ee521d629ef0ba..9f8a584426e9359c117e52c170fd00b9e6f9c4ce 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
@@ -16,6 +16,11 @@
                <property name="viewName" value="slcExecutionList" />\r
        </bean>\r
 \r
+       <bean name="/slcExecutionView.web"\r
+               class="org.argeo.slc.web.mvc.process.SlcExecutionViewController">\r
+               <constructor-arg ref="slcExecutionDao" />\r
+               <property name="viewName" value="slcExecutionView" />\r
+       </bean>\r
 \r
        <bean id="handlerMapping"\r
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r