diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index 4876582..c05c0a3 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -95,7 +95,7 @@ value="org.yacos.web.system.form.FormUser" /> - + @@ -119,21 +119,23 @@ - + + class="org.yacos.web.chairman.controller.DispatchArticleController"> - - + + + + - + - + - + - + - + - + @@ -278,13 +280,13 @@ - + - diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index 6d67e0e..d4dcc76 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -97,12 +97,12 @@ public class ChoosePreferenceController extends SimpleFormController { this.articleManager = articleManager; } - public IUserManager getUsersManager() { + public IUserManager getUserManager() { return userManager; } - public void setUsersManager(IUserManager usersManager) { - this.userManager = usersManager; + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; } public IConferenceManager getConferenceManager() { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index 0f1d268..142dbe0 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -125,12 +125,12 @@ public class EvaluationController extends SimpleFormController { this.articleManager = articleManager; } - public IUserManager getUsersManager() { + public IUserManager getUserManager() { return userManager; } - public void setUsersManager(IUserManager usersManager) { - this.userManager = usersManager; + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; } public IConferenceManager getConferenceManager() { diff --git a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java index e4185ac..e4cff07 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java @@ -20,9 +20,8 @@ public class MainController extends SimpleFormController { // FIXME : this is no longer necessary request.getSession().setAttribute("user","toto"); - request.getSession().setAttribute("conference",1); + request.getSession().setAttribute("idCurrentConference",1); //FIXME return new ModelAndView("main"); } - } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 86279a7..576be6a 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -29,13 +29,13 @@ public class AddConferenceController extends AbstractWizardFormController { private IConferenceManager conferenceManager; - private IUserManager usersManager; + private IUserManager userManager; - public IUserManager getUsersManager() { - return usersManager; + public IUserManager getUserManager() { + return userManager; } - public void setUsersManager(IUserManager usersManager) { - this.usersManager = usersManager; + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; } public IConferenceManager getConferenceManager() { return conferenceManager; @@ -45,8 +45,6 @@ public class AddConferenceController extends AbstractWizardFormController { } - - // ########################################################### private static int nextPerson = 1; @@ -57,7 +55,7 @@ public class AddConferenceController extends AbstractWizardFormController { public void initPerson() { listPersonBean = new ArrayList(); listPersonAdded = new ArrayList(); - List listUsers = usersManager.getUsers(); + List listUsers = userManager.getUsers(); for (Iterator i = listUsers.iterator(); i.hasNext();) { User user = (User) i.next(); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java new file mode 100644 index 0000000..66acb25 --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java @@ -0,0 +1,79 @@ +package org.yacos.web.chairman.controller; + +import java.util.ArrayList; +import java.util.Collection; + +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.yacos.core.article.Article; +import org.yacos.core.article.IArticleManager; +import org.yacos.core.conferences.Conference; +import org.yacos.core.conferences.IConferenceManager; +import org.yacos.core.exceptions.ConferenceDoesntExistException; +import org.yacos.core.users.IUserManager; +import org.yacos.core.users.Role.RoleType; +import org.yacos.core.users.User; +import org.yacos.web.PCmember.form.FormDispatcher; + +public class DispatchArticleController extends SimpleFormController{ + + protected final Log logger = LogFactory.getLog(getClass()); + + private IArticleManager articleManager; + public IArticleManager getArticleManager() { + return articleManager; + } + public void setArticleManager(IArticleManager articleManager) { + this.articleManager = articleManager; + } + + private IUserManager userManager; + public IUserManager getUserManager() { + return userManager; + } + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; + } + + private IConferenceManager conferenceManager; + public IConferenceManager getConferenceManager() { + return conferenceManager; + } + public void setConferenceManager(IConferenceManager conferenceManager) { + this.conferenceManager = conferenceManager; + } + + + protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException { + logger.info("Returning dispatcher view"); + + //on recupere l'id de conference + int conf_id = Integer.parseInt(request.getSession().getAttribute("idCurrentConference").toString()); + Collection members = userManager.getUsers(RoleType.PCMEMBER); + + request.getSession().setAttribute("members",members); + request.getSession().setAttribute("articles",articleManager.getArticles(conf_id)); + + return new FormDispatcher(); + } + + protected ModelAndView onSubmit(HttpServletRequest request, + HttpServletResponse response, + Object formDispatcher, BindException errors) throws Exception { + + //on recupere l'id de conference + Conference conf = (Conference)request.getSession().getAttribute("idCurrentConference"); + + FormDispatcher fd = (FormDispatcher)formDispatcher; + Article article = articleManager.getArticle(fd.getIdArticle()); + + return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId())); + } + +} diff --git a/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java b/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java index d634dff..ded8a16 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java @@ -23,7 +23,7 @@ import org.yacos.web.system.form.FormUser; * */ public class SUserRegistrationController extends SimpleFormController { - private IUserManager usersManager; + private IUserManager userManager; private SessionService sessionService; @@ -47,13 +47,13 @@ public class SUserRegistrationController extends SimpleFormController { // Tries to retrieve the current user : case of user modification User user = sessionService.getCurrentUser(request); - if( (userCommand.getIsNew()) && (usersManager.getUser(userCommand.getLogin()) != null)){ + if( (userCommand.getIsNew()) && (userManager.getUser(userCommand.getLogin()) != null)){ errors.rejectValue("login", "form.register.error.alreadyExists"); return new ModelAndView(new RedirectView(getFormView())); } if( userCommand.getIsNew() ){ - usersManager.addUser( + userManager.addUser( userCommand.getLogin(), userCommand.getPassword(), userCommand.getFirstName(), @@ -102,11 +102,11 @@ public class SUserRegistrationController extends SimpleFormController { return user; } - public void setUsersManager(IUserManager usersManager) { - this.usersManager = usersManager; + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; } - public IUserManager getUsersManager() { - return usersManager; + public IUserManager getUserManager() { + return userManager; } }