From 93aa7144810d0a17116ab15b1bc3dda125b77a14 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 4 May 2008 10:52:10 +0000 Subject: [PATCH] Introduce result reporting git-svn-id: https://svn.argeo.org/slc/trunk@1099 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/webapp/WEB-INF/jsp/home.jsp | 1 + .../main/webapp/WEB-INF/jsp/resultList.jsp | 29 +++++++++++++ .../main/webapp/WEB-INF/jsp/resultView.jsp | 43 +++++++++++++++++++ .../webapp/WEB-INF/jsp/slcExecutionList.jsp | 17 ++++---- .../webapp/WEB-INF/jsp/slcExecutionView.jsp | 32 +++++--------- .../main/webapp/WEB-INF/slc-web-servlet.xml | 12 ++++++ .../main/webapp/WEB-INF/slc-ws-servlet.xml | 12 ++++++ .../src/main/webapp/style.css | 11 +++++ 8 files changed, 128 insertions(+), 29 deletions(-) create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp index 1dcb0db6a..6e33dc286 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp @@ -10,6 +10,7 @@

SLC Home

Web

+Results
SLC Executions

Web Services

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 index 000000000..0743ac38d --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp @@ -0,0 +1,29 @@ + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + +<%@include file="header.txt"%> + + +
+

Results

+ + + + + + + + + + + + + +
Id
${result.uuid}view
+ +
+ +<%@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 index 000000000..621212682 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp @@ -0,0 +1,43 @@ + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + +<%@include file="header.txt"%> + + +
+

Result #${result.uuid}

+ + + + + + + + + + + +
${tocEntry.key.name }
+ + + + +

<%=describedPaths.get(resultPartEntry.getKey())%>

+ + + + + + +
+ ${part.message}
+ +
+ +<%@include file="footer.txt"%> \ No newline at end of file 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 9123e22ba..fb70e50a1 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,20 +10,21 @@

SLC Execution List

- - - - - - - + + + + + + + + - +
UUIDSTATUSHOSTTYPE
UUIDSTATUSHOSTTYPE
View details ${slcExecution.uuid} ${slcExecution.status} ${slcExecution.host} ${slcExecution.type}view
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 index ee5e40ca3..bffcd4d63 100644 --- 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 @@ -11,28 +11,18 @@

Uuid = ${slcExecution.uuid}


Execution Steps

+ + +

${slcExecutionStep.begin} - ${slcExecutionStep.uuid} + (${slcExecutionStep.type})

- - - - - - - - - - - - - - - + + + + - - - - -
UUIDTYPEBEGIN
${slcExecutionStep.uuid}${slcExecutionStep.type}${slcExecutionStep.begin}
- ${slcExecutionStepLog}
${slcExecutionStepLogLine}
- + + <%@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 498b8d76b..a403a8020 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 @@ -22,6 +22,18 @@ + + + + + + + + + + diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml index fd1397e2a..7f2c521be 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml @@ -32,6 +32,14 @@ ref="slcDefault.castor.marshaller" /> + + + + + + @@ -49,6 +57,10 @@ key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request"> createTreeTestResultRequestEp + + resultPartRequestEp + diff --git a/org.argeo.slc.webapp/src/main/webapp/style.css b/org.argeo.slc.webapp/src/main/webapp/style.css index 828612e53..a5631934a 100644 --- a/org.argeo.slc.webapp/src/main/webapp/style.css +++ b/org.argeo.slc.webapp/src/main/webapp/style.css @@ -29,6 +29,17 @@ h2 { margin-top: 5px; } +/* Special titles */ +h3.executionStep{ + font-family: sans-serif; + font-size: 10px; + font-style: italic; + color: #000000; + padding: 5px 0px 5px 0px; + margin: 0px; + margin-top: 5px; +} + table,form { margin: 0px; } -- 2.39.5