From: Mathieu Baudier Date: Mon, 5 May 2008 11:43:06 +0000 (+0000) Subject: Introduce collection management X-Git-Tag: argeo-slc-2.1.7~2915 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4f1055e343320cc4e94161ed3b89c2a39ccaddb4;p=gpl%2Fargeo-slc.git Introduce collection management git-svn-id: https://svn.argeo.org/slc/trunk@1125 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml index 7727629dc..b4be84fa9 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -42,10 +42,25 @@ + + + + + + + + + + + + + diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp new file mode 100644 index 000000000..f1453bdf4 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp @@ -0,0 +1,15 @@ + +<%@ 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"%> + + +
+

Add result to collection

+Result ${param.resultUuid} successfully added to collection ${param.collectionId}. +
+ +<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp index a7cca86de..0abd193d1 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp @@ -9,5 +9,34 @@ Home + + Overview + + + Collections + + + All Results + + + SLC + Executions + + + Collections + + + + ${resultCollection.id} + + + + Technical + + + WSDL + Definition + 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 6e33dc286..d90466931 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 @@ -9,13 +9,6 @@

SLC Home

-

Web

-Results
-SLC Executions - -

Web Services

-WSDL Definition -
<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp new file mode 100644 index 000000000..dd7a77389 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp @@ -0,0 +1,15 @@ + +<%@ 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"%> + + +
+

Remove result from collection

+Result ${param.resultUuid} successfully removed from collection ${param.collectionId}. +
+ +<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp new file mode 100644 index 000000000..7eb19a2eb --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp @@ -0,0 +1,30 @@ + +<%@ 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 Collections

+ + + + + + + + + + + + + +
Id
${resultCollection.id}view
+ +
+ +<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp new file mode 100644 index 000000000..d4aa538b9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp @@ -0,0 +1,40 @@ + +<%@ 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 Collection ${resultCollection.id}

+ + + + + + + + + + + + + + + + + + + + + + + +
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewremove
+ +
+ +<%@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 index 39c701d69..66e63a11d 100644 --- 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 @@ -11,9 +11,15 @@

Result #${result.uuid}

+ +

+Add to staging collection
+Add to official collection +

+ 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 04a66b236..95886aeb0 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 @@ -34,6 +34,30 @@ + + + + + + + + + + + + + + + + + + + + @@ -42,6 +66,16 @@ + + + + + + + + + - +