From 2f8b18b713e45a45501b75ac88db76d56eb82a7b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gwenael=20Pri=C3=A9?= <gwenael.prie@gmail.com>
Date: Thu, 24 Apr 2008 20:29:27 +0000
Subject: [PATCH] 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
---
 .../webapp/WEB-INF/jsp/slcExecutionList.jsp   | 10 +++++
 .../webapp/WEB-INF/jsp/slcExecutionView.jsp   | 38 +++++++++++++++++++
 .../main/webapp/WEB-INF/slc-web-servlet.xml   |  5 +++
 3 files changed, 53 insertions(+)
 create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp

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 16ec29560..9123e22ba 100644
--- 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>
 
 <table>
+	<tr>
+		<td></td>
+		<td>UUID</td>
+		<td>STATUS</td>
+		<td>HOST</td>
+		<td>TYPE</td>		
+	</tr>
 	<c:forEach items="${slcExecutions}" var="slcExecution">
 		<tr>
+			<td><a href="slcExecutionView.web?uuid=${slcExecution.uuid}">View details</a></td>
 			<td>${slcExecution.uuid}</td>
 			<td>${slcExecution.status}</td>
+			<td>${slcExecution.host}</td>
+			<td>${slcExecution.type}</td>
 		</tr>
 	</c:forEach>
 </table>
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
index 000000000..ee5e40ca3
--- /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" ?>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<%@include file="header.txt"%>
+<jsp:include page="common.jsp" />
+
+<div id="main">
+<h1>SLC Execution Details</h1>
+<h2>Uuid = ${slcExecution.uuid}</h2>
+<br>
+<h2>Execution Steps</h2>
+<table>
+	<tr>
+		<td>UUID</td>
+		<td>TYPE</td>
+		<td>BEGIN</td>
+	</tr>
+	<c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">
+		<tr>
+			<td>${slcExecutionStep.uuid}</td>
+			<td>${slcExecutionStep.type}</td>
+			<td>${slcExecutionStep.begin}</td>
+		</tr>
+		<c:forEach items="${slcExecutionStep.logLines}" var="slcExecutionStepLog">
+		<tr>
+			<td colspan="3">- <em>${slcExecutionStepLog}</em></td>
+		</tr>
+		</c:forEach>
+		<tr>
+		</tr>
+	</c:forEach>
+
+</table>
+</div>
+
+<%@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 6b5b425d6..9f8a58442 100644
--- 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" />
 	</bean>
 
+	<bean name="/slcExecutionView.web"
+		class="org.argeo.slc.web.mvc.process.SlcExecutionViewController">
+		<constructor-arg ref="slcExecutionDao" />
+		<property name="viewName" value="slcExecutionView" />
+	</bean>
 
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-- 
2.39.2