Introduce PDF/Excel views

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml
new file mode 100644 (file)
index 0000000..3b1714f
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+       <import
+               resource="classpath:/org/argeo/slc/server/spring/slc-doc-servlet.xml" />
+
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
index e4e516a8b83273b872093f02ac77315e1630eace..2bfd1a3a3b4f8c1072fe54a2d7a91ae10c8f754b 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp
@@ -1,29 +1,32 @@
-<div id="main">\r
-<h1>Results</h1>\r
-\r
-<table cellspacing="0">\r
-       <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 style="padding-right: 5px"><a href="resultView.web?uuid=${result.uuid}">view</a></td>\r
+<div id="main">
+<h1>Results</h1>
+
+<table cellspacing="0">
+       <thead>
+               <tr>
+                       <th>Id</th>
+                       <th>Status</th>
+               </tr>
+       </thead>
+       <c:forEach items="${results}" var="result">
+               <tr>
+                       <td>${result.uuid}</td>
+                       <c:choose>
+                               <c:when test="${result.closeDate != null}">
+                                       <td>${result.closeDate}</td>
+                               </c:when>
+                               <c:otherwise>
+                                       <td>NOT CLOSED</td>
+                               </c:otherwise>
+                       </c:choose>
+                       <td style="padding-right: 5px"><a
+                               href="resultView.web?uuid=${result.uuid}">view</a></td>
                        <td><a href="resultView.xslt?uuid=${result.uuid}">xsl</a></td>
                        <td><a href="resultViewXml.xslt?uuid=${result.uuid}">xml</a></td>
-               </tr>\r
-       </c:forEach>\r
-</table>\r
-\r
-</div>\r
+                       <td><a href="resultView.xls?uuid=${result.uuid}">xls</a></td>
+                       <td><a href="resultView.pdf?uuid=${result.uuid}">pdf</a></td>
+               </tr>
+       </c:forEach>
+</table>
+
+</div>

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index 963139a325b71b38816e8ccb557e8c9048c93329..abde0c29951b9b95d79a29c364e178f96ab98f05 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -42,6 +42,22 @@
                <url-pattern>*.xslt</url-pattern>
        </servlet-mapping>
 
+       <servlet>
+               <servlet-name>doc</servlet-name>
+               <servlet-class>
+                       org.springframework.web.servlet.DispatcherServlet
+               </servlet-class>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>doc</servlet-name>
+               <url-pattern>*.xls</url-pattern>
+       </servlet-mapping>
+       <servlet-mapping>
+               <servlet-name>doc</servlet-name>
+               <url-pattern>*.pdf</url-pattern>
+       </servlet-mapping>
+
        <context-param>
                <param-name>contextConfigLocation</param-name>
                <param-value>/WEB-INF/applicationContext.xml</param-value>