diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp index 604662d..09c1d11 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp @@ -14,7 +14,7 @@ function doSubmit() { var form = document.monForm; -form.action = 'main.htm'; +form.action = 'addConference.htm'; form.submit(); } @@ -38,13 +38,14 @@ form.submit(); Formulaire ici - " /> -

- Test + Next - ">Home + + + +">Home
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp index 96475e4..59432e6 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -7,6 +7,23 @@ <fmt:message key="title" /> + + + @@ -21,15 +38,18 @@

Add new conference

- + Formulaire ici - " />
+ Next
+ Back - ">Home + + +">Home
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp new file mode 100644 index 0000000..871c36c --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + +Haha conf 3 + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index 71f6144..29e8209 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -53,7 +53,16 @@ - + + + + + + + + + + diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 2507d75..d2ceef8 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -29,7 +29,8 @@ public class AddConferenceController extends SimpleFormController{ HttpServletResponse response, Object command, BindException errors) throws Exception { - return new ModelAndView(new RedirectView(getSuccessView())); + logger.info("Returning addConference view"); + return new ModelAndView(new RedirectView("addConference2.htm")); } protected Object formBackingObject(HttpServletRequest request) throws Exception diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java index 68138ee..7810d81 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java @@ -1,28 +1,45 @@ package org.yacos.web.chairman.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.validation.BindException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.springframework.web.servlet.view.RedirectView; +import org.yacos.core.conferences.IConferenceManager; +import org.yacos.web.chairman.form.FormConference; -import java.io.IOException; -import java.util.Date; +public class AddConferenceController2 extends SimpleFormController{ -public class AddConferenceController2 extends SimpleFormController { + protected final Log logger = LogFactory.getLog(getClass()); - protected final Log logger = LogFactory.getLog(getClass()); + private IConferenceManager conferenceManager; - public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + public IConferenceManager getConferenceManager() { + return conferenceManager; + } + public void setConferenceManager(IConferenceManager conferenceManager) { + this.conferenceManager = conferenceManager; + } - logger.info("Returning addConference2 view"); + protected ModelAndView onSubmit(HttpServletRequest request, + HttpServletResponse response, Object command, BindException errors) + throws Exception + { + logger.info("Returning addConference2 view"); + return new ModelAndView(new RedirectView("addConference3.htm")); + } - return new ModelAndView("addConference2"); - } + protected Object formBackingObject(HttpServletRequest request) throws Exception + { + FormConference conference = null; + conference = new FormConference(); + + return conference; + + } } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController3.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController3.java new file mode 100644 index 0000000..5a8dc6e --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController3.java @@ -0,0 +1,28 @@ +package org.yacos.web.chairman.controller; + +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.IOException; +import java.util.Date; + +public class AddConferenceController3 extends SimpleFormController { + + protected final Log logger = LogFactory.getLog(getClass()); + + public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + logger.info("Returning addConference3 view"); + + return new ModelAndView("addConference3"); + } + +} \ No newline at end of file