diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp new file mode 100644 index 0000000..f413aa5 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp @@ -0,0 +1,58 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + + +

Conference created

+ +

+ Your conference has been successfully created.
+ Here is a report of the conference's informations.

+ Any moment you can edit the configuration of the conference using the item menu "Modify this conference".
+ If you want to modify it now, just click here
+

+ +
+ +
+ ${conferenceReport.title}
+ ${conferenceReport.description}
+ ${conferenceReport.otherInformations}
+ +
+ + Chairman: ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}
+
+ Important dates + + ${conferenceReport.dateArticle}
+ ${conferenceReport.dateEvaluation}
+ ${conferenceReport.dateStart}
+ ${conferenceReport.dateEnd}
+ +
+ + Criterion's list
+ + + ${crit.name} ${crit.min_rating} ${crit.max_rating}
+ + + + + PCmember's list
+ + + ${user.firstName} ${user.lastName}
+ + +
+ +
+ + + + ">Home + + diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index b520d1f..1af4e12 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -30,6 +30,7 @@ DispatchArticleListController DispatchArticleController AddConferenceController + ReportConfCreateController EvaluationController CreateReportController ListConferenceController @@ -164,6 +165,12 @@ + + + + + diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 9638dd9..72fdc6d 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -186,7 +186,7 @@ public class SArticleController extends SimpleFormController { myArticle.setAbstractText(a.getAbstractText()); myArticle.setTitle(a.getTitle()); - myArticle.setListe(a.getSecondaryAuthors()); + //myArticle.setListe(a.getSecondaryAuthors()); myArticle.setTheme(a.getTopic()); request.getSession().setAttribute("listSecondaryAuthors", a.getSecondaryAuthors()); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 791087f..8a03526 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -20,6 +20,7 @@ import org.springframework.validation.Errors; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndViewDefiningException; import org.springframework.web.servlet.mvc.AbstractWizardFormController; +import org.springframework.web.servlet.view.RedirectView; import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.evaluation.Criterion; @@ -515,7 +516,7 @@ public class AddConferenceController extends AbstractWizardFormController { } } - return new ModelAndView("main"); + return new ModelAndView(new RedirectView("reportConfCreate.htm")); } } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/ReportConfCreateController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/ReportConfCreateController.java new file mode 100644 index 0000000..1ecda5c --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/ReportConfCreateController.java @@ -0,0 +1,63 @@ +package org.yacos.web.chairman.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.Controller; +import org.yacos.core.conferences.Conference; +import org.yacos.core.conferences.IConferenceManager; +import org.yacos.core.evaluation.Criterion; +import org.yacos.core.evaluation.IEvaluationManager; +import org.yacos.core.users.IUserManager; +import org.yacos.core.users.User; +import org.yacos.core.users.Role.RoleType; +import org.yacos.web.system.session.SessionService; + +public class ReportConfCreateController implements Controller { + + private IConferenceManager conferenceManager; + + private IUserManager userManager; + + private IEvaluationManager evaluationManager; + + public IEvaluationManager getEvaluationManager() { + return evaluationManager; + } + public void setEvaluationManager(IEvaluationManager evaluationManager) { + this.evaluationManager = evaluationManager; + } + public IUserManager getUserManager() { + return userManager; + } + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; + } + public IConferenceManager getConferenceManager() { + return conferenceManager; + } + public void setConferenceManager(IConferenceManager conferenceManager) { + this.conferenceManager = conferenceManager; + } + + public ModelAndView handleRequest(HttpServletRequest request, + HttpServletResponse response) throws Exception { + + Conference conf = SessionService.getInstance().getCurrentConference(); + List listCriterionForConf = evaluationManager.getCriterions(conf.getId()); + List listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER); + + Map model = new HashMap(); + model.put("conferenceReport", conf); + model.put("criterionReport", listCriterionForConf); + model.put("userReport", listUsersForConf); + + return new ModelAndView("reportConfCreate", model); + } + +}