Introduce result reporting
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 4 May 2008 10:52:10 +0000 (10:52 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 4 May 2008 10:52:10 +0000 (10:52 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1099 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
org.argeo.slc.webapp/src/main/webapp/style.css

index 1dcb0db6abb031ab0d5adc471304012280350841..6e33dc286e26c9d24aa13947215fe268918518bc 100644 (file)
@@ -10,6 +10,7 @@
 <h1>SLC Home</h1>\r
 \r
 <h2>Web</h2>\r
+<a href="resultList.web">Results</a><br/>\r
 <a href="slcExecutionList.web">SLC Executions</a>\r
 \r
 <h2>Web Services</h2>\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp
new file mode 100644 (file)
index 0000000..0743ac3
--- /dev/null
@@ -0,0 +1,29 @@
+<?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="form" uri="http://www.springframework.org/tags/form"%>\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>Results</h1>\r
+\r
+<table cellspacing="0">\r
+       <thead>\r
+               <tr>\r
+                       <th>Id</th>\r
+               </tr>\r
+       </thead>\r
+       <c:forEach items="${results}" var="result">\r
+               <tr>\r
+                       <td>${result.uuid}</td>\r
+                       <td><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
+               </tr>\r
+       </c:forEach>\r
+</table>\r
+\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/jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
new file mode 100644 (file)
index 0000000..6212126
--- /dev/null
@@ -0,0 +1,43 @@
+<?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="form" uri="http://www.springframework.org/tags/form"%>\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>Result #${result.uuid}</h1>\r
+\r
+<jsp:useBean id="describedPaths" type="java.util.SortedMap"\r
+       scope="request" /> \r
+<jsp:useBean id="toc" type="java.util.SortedMap"\r
+       scope="request" />\r
+\r
+<table>\r
+       <c:forEach items="${toc}" var="tocEntry">\r
+               <jsp:useBean id="tocEntry" type="java.util.Map.Entry" />\r
+               <tr>\r
+                       <td style="padding-left: ${tocEntry.key.depth}0px"\r
+                               class="${tocEntry.value}">${tocEntry.key.name }</td>\r
+               </tr>\r
+       </c:forEach>\r
+</table>\r
+\r
+<c:forEach items="${result.resultParts}" var="resultPartEntry">\r
+       <jsp:useBean id="resultPartEntry" type="java.util.Map.Entry" />\r
+\r
+       <h2><%=describedPaths.get(resultPartEntry.getKey())%></h2>\r
+       <table>\r
+               <c:forEach items="${resultPartEntry.value.parts}" var="part">\r
+                       <tr>\r
+                               <td class="${part.status == 0 ? 'passed' : 'failed'}">\r
+                               ${part.message}</td>\r
+                       </tr>\r
+               </c:forEach>\r
+       </table>\r
+\r
+</c:forEach></div>\r
+\r
+<%@include file="footer.txt"%>
\ No newline at end of file
index 9123e22bacd1be529e1130634791dbecfc926f34..fb70e50a111a21cc7d6a46ebda1b1f4d1dc37a9e 100644 (file)
 <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
+       <thead>\r
+               <tr>\r
+                       <td>UUID</td>\r
+                       <td>STATUS</td>\r
+                       <td>HOST</td>\r
+                       <td>TYPE</td>\r
+               </tr>\r
+       </thead>\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
+                       <td><a href="slcExecutionView.web?uuid=${slcExecution.uuid}">view</a></td>\r
                </tr>\r
        </c:forEach>\r
 </table>\r
index ee5e40ca38d78bfa7b973a512168701492cc8d0d..bffcd4d630c9539a156d01db281af6ef96cb2f38 100644 (file)
 <h2>Uuid = ${slcExecution.uuid}</h2>\r
 <br>\r
 <h2>Execution Steps</h2>\r
+<c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">\r
+       <a name="step_${slcExecutionStep.uuid}"></a>\r
+       <h3 class="executionStep">${slcExecutionStep.begin} - ${slcExecutionStep.uuid}\r
+       (${slcExecutionStep.type})</h3>\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 items="${slcExecutionStep.logLines}"\r
+                       var="slcExecutionStepLogLine">\r
+                       <tr>\r
+                               <td colspan="3">${slcExecutionStepLogLine}</td>\r
+                       </tr>\r
                </c:forEach>\r
-               <tr>\r
-               </tr>\r
-       </c:forEach>\r
-\r
-</table>\r
-</div>\r
+       </table>\r
+</c:forEach></div>\r
 \r
 <%@include file="footer.txt"%>
\ No newline at end of file
index 498b8d76b96428e9774116b4900aa74f077f7a9a..a403a80201342635fa69fb634dc07e6a29a5f219 100644 (file)
                <property name="viewName" value="slcExecutionView" />\r
        </bean>\r
 \r
+       <bean name="/resultList.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultListController">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="viewName" value="resultList" />\r
+       </bean>\r
+\r
+       <bean name="/resultView.web"\r
+               class="org.argeo.slc.web.mvc.result.ResultViewController">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="viewName" value="resultView" />\r
+       </bean>\r
+\r
        <bean id="handlerMapping"\r
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">\r
        </bean>\r
index fd1397e2ad835e7dc3d82b04713b889d1687c5f8..7f2c521be0cab22f415a6a7dc1bf86dd75764b34 100644 (file)
                        ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
+       <bean name="resultPartRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
+               <constructor-arg ref="testResultDao" />\r
+               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
+               <property name="unmarshaller"\r
+                       ref="slcDefault.castor.marshaller" />\r
+       </bean>\r
+\r
        <bean id="endPointMapping"\r
                class="org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping">\r
                <property name="mappings">\r
                                        key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">\r
                                        createTreeTestResultRequestEp\r
                                </prop>\r
+                               <prop\r
+                                       key="{http://argeo.org/projects/slc/schemas}result-part-request">\r
+                                       resultPartRequestEp\r
+                               </prop>\r
                        </props>\r
                </property>\r
 \r
index 828612e53ad8308cc8f6956daae018c1072c8282..a5631934a56c4dd4e742a279c959276e8d06dedf 100644 (file)
@@ -29,6 +29,17 @@ h2 {
        margin-top: 5px;\r
 }\r
 \r
+/* Special titles */\r
+h3.executionStep{\r
+       font-family: sans-serif;\r
+       font-size: 10px;\r
+       font-style: italic;\r
+       color: #000000;\r
+       padding: 5px 0px 5px 0px;\r
+       margin: 0px;\r
+       margin-top: 5px;\r
+}\r
+\r
 table,form {\r
        margin: 0px;\r
 }\r