Introduce close tree test result request

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

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
index 0743ac38d007b26cdd6dbbb91c8261e6b08b9e88..a5e2fef8622b4fe26e788418ab3ca3839c8d91be 100644 (file)
--- 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
@@ -14,11 +14,20 @@
        <thead>\r
                <tr>\r
                        <th>Id</th>\r
+                       <th>Status</th>\r
                </tr>\r
        </thead>\r
        <c:forEach items="${results}" var="result">\r
                <tr>\r
                        <td>${result.uuid}</td>\r
+                       <c:choose>\r
+                               <c:when test="${result.closeDate != null}">\r
+                                       <td>${result.closeDate}</td>\r
+                               </c:when>\r
+                               <c:otherwise>\r
+                                       <td>NOT CLOSED</td>\r
+                               </c:otherwise>\r
+                       </c:choose>\r
                        <td><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
                </tr>\r
        </c:forEach>\r

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 7f2c521be0cab22f415a6a7dc1bf86dd75764b34..00c110d14f5afe21c28619262ddd6d0ecee3942a 100644 (file)
--- 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
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <beans xmlns="http://www.springframework.org/schema/beans"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" default-lazy-init="true">\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
+       default-lazy-init="true">\r
 \r
        <import\r
                resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
@@ -32,6 +33,14 @@
                        ref="slcDefault.castor.marshaller" />\r
        </bean>\r
 \r
+       <bean name="closeTreeTestResultRequestEp"\r
+               class="org.argeo.slc.ws.test.tree.CloseTreeTestResultRequestEp">\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 name="resultPartRequestEp"\r
                class="org.argeo.slc.ws.test.tree.ResultPartRequestEp">\r
                <constructor-arg ref="testResultDao" />\r
@@ -57,6 +66,10 @@
                                        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}close-tree-test-result-request">\r
+                                       closeTreeTestResultRequestEp\r
+                               </prop>\r
                                <prop\r
                                        key="{http://argeo.org/projects/slc/schemas}result-part-request">\r
                                        resultPartRequestEp\r