From 93c009d89ed56bdd3829bd78333bf274b284c299 Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Sun, 10 Feb 2008 14:53:29 +0000 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20du=20CU=20modify=20conference...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/decorators/usermenu.jsp | 2 +- .../controller/AddConferenceController.java | 154 ++++++++++++++---- 2 files changed, 121 insertions(+), 35 deletions(-) diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 6488748..1f878a7 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -18,7 +18,7 @@

diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index e21c2ef..3606f79 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -1,5 +1,7 @@ package org.yacos.web.chairman.controller; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -215,45 +217,129 @@ public class AddConferenceController extends AbstractWizardFormController { protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { logger.info(this.getClass().toString() + " dans le formBackingObject"); - FormConference conference = new FormConference(); - criteria = new HashSet(); - criteriaAll = new HashSet(); - List listCriterion = evaluationManager.getCriterions(); - for (Criterion crit : listCriterion) { - CriterionBean cb = new CriterionBean(); - cb.setId(crit.getId()); - cb.setLabel(crit.getName()); - cb.setMax(crit.getMax_rating()); - cb.setMin(crit.getMin_rating()); - criteriaAll.add(cb); - getNextId(); + String action = request.getParameter("action"); + if (action == null || action.equals("")) + { + // TODO : tester ici si le gars a le droit d'être ici + // a-t-il le droit de créer une conférence ? + + criteria = new HashSet(); + criteriaAll = new HashSet(); + List listCriterion = evaluationManager.getCriterions(); + for (Criterion crit : listCriterion) { + CriterionBean cb = new CriterionBean(); + cb.setId(crit.getId()); + cb.setLabel(crit.getName()); + cb.setMax(crit.getMax_rating()); + cb.setMin(crit.getMin_rating()); + criteriaAll.add(cb); + getNextId(); + } + + listPersonBean = new ArrayList(); + listPersonAdded = new ArrayList(); + listPersonFiltered = listPersonBean; + List listUsers = userManager.getUsers(); + for (User user : listUsers) { + PersonBean pb = new PersonBean(); + pb.setId(getNextPerson()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); + listPersonBean.add(pb); + } + + return conference; } - - listPersonBean = new ArrayList(); - listPersonAdded = new ArrayList(); - listPersonFiltered = listPersonBean; - List listUsers = userManager.getUsers(); - for (User user : listUsers) { - PersonBean pb = new PersonBean(); - pb.setId(getNextPerson()); - pb.setFirstName(user.getFirstName()); - pb.setLastName(user.getLastName()); - pb.setLogin(user.getLogin()); - listPersonBean.add(pb); + else if (action.equals("modify")) { + Conference conf = SessionService.getInstance().getCurrentConference(); + + criteria = new HashSet(); + criteriaAll = new HashSet(); + + List listCriterionForConf = evaluationManager.getCriterions(conf.getId()); + for (Criterion crit : listCriterionForConf) { + CriterionBean cb = new CriterionBean(); + cb.setId(crit.getId()); + cb.setLabel(crit.getName()); + cb.setMax(crit.getMax_rating()); + cb.setMin(crit.getMin_rating()); + criteria.add(cb); + getNextId(); + } + + List listCriterion = evaluationManager.getCriterions(); + for (Criterion crit : listCriterion) { + CriterionBean cb = new CriterionBean(); + cb.setId(crit.getId()); + cb.setLabel(crit.getName()); + cb.setMax(crit.getMax_rating()); + cb.setMin(crit.getMin_rating()); + criteriaAll.add(cb); + getNextId(); + } + + listPersonBean = new ArrayList(); + listPersonAdded = new ArrayList(); + listPersonFiltered = listPersonBean; + List listUsers = userManager.getUsers(); + for (User user : listUsers) { + PersonBean pb = new PersonBean(); + pb.setId(getNextPerson()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); + listPersonBean.add(pb); + } + + + // FIXME : bug here when we remove a person + // and remove the person added from the list above + List listUsersForConf = userManager.getUsers(conf.getId()); + for (User user : listUsersForConf) { + PersonBean pb = new PersonBean(); + pb.setId(getNextPerson()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); + listPersonAdded.add(pb); + } + + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + conference.setTitle(conf.getTitle()); + conference.setDateArticleParsed(conf.getDateArticle()); + conference.setDateArticle(format.format(conf.getDateArticle())); + conference.setDateEndParsed(conf.getDateEnd()); + conference.setDateEnd(format.format(conf.getDateEnd())); + conference.setDateEvaluationParsed(conf.getDateEvaluation()); + conference.setDateEvaluation(format.format(conf.getDateEvaluation())); + conference.setDateStartParsed(conf.getDateStart()); + conference.setDateStart(format.format(conf.getDateStart())); + conference.setDescription(conf.getDescription()); + conference.setOtherInformations(conf.getOtherInformations()); + + // TODO : ajouter ca ds conf ejb... + /*conference.setPageNumber(pageNumber); + conference.setSendInfo(sendInfo); + conference.setTypeLatec(typeLatec); + conference.setTypeODT(typeODT); + conference.setTypePDF(typePDF); + conference.setTypeWord(typeWord);*/ + + return conference; + } - - return conference; - } - - protected void onBindAndValidate(HttpServletRequest request, Object command, BindException errors, int page) { - /*if (page == 0 && request.getParameter("shippingAddressRequired") == null) { - OrderForm orderForm = (OrderForm) command; - orderForm.setShippingAddressRequired(false); - }*/ + else { + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + } + } + + protected void validatePage(Object command, Errors errors, int page) { FormConference conference = (FormConference) command; ConferenceValidator conferenceValidator = (ConferenceValidator) getValidator(); @@ -304,7 +390,7 @@ public class AddConferenceController extends AbstractWizardFormController { conferenceManager.addRole(RoleType.CHAIRMAN, SessionService.getInstance().getCurrentUserLogin(), conf.getId()); - return new ModelAndView("main"/*, model*/); + return new ModelAndView("main"); } }