Ajout d'un report lors de la création de la conf, ce report pourra être utilisé pour avoir les infos de la conf.
--> A finir
This commit is contained in:
58
YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
Normal file
58
YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
Normal file
@@ -0,0 +1,58 @@
|
||||
<%@ include file="/WEB-INF/decorators/include.jsp"%>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
</head>
|
||||
<body>
|
||||
<h4 class="title">Conference created</h4>
|
||||
|
||||
<p class="formOk">
|
||||
Your conference has been successfully created.<br/>
|
||||
Here is a report of the conference's informations.<br/><br/>
|
||||
Any moment you can edit the configuration of the conference using the item menu "Modify this conference".<br/>
|
||||
If you want to modify it now, just click <a href="addConference.htm?action=modify" title="Modify the conference">here</a><br/>
|
||||
</p>
|
||||
|
||||
<div id="account_data">
|
||||
|
||||
<fieldset>
|
||||
${conferenceReport.title}<br />
|
||||
${conferenceReport.description}<br />
|
||||
${conferenceReport.otherInformations}<br />
|
||||
|
||||
<br />
|
||||
|
||||
Chairman: <b>${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}</b><br />
|
||||
<br />
|
||||
<b>Important dates</b>
|
||||
|
||||
${conferenceReport.dateArticle}<br />
|
||||
${conferenceReport.dateEvaluation}<br />
|
||||
${conferenceReport.dateStart}<br />
|
||||
${conferenceReport.dateEnd}<br />
|
||||
|
||||
<br />
|
||||
<c:if test="${not empty criterionReport}">
|
||||
<b>Criterion's list </b><br />
|
||||
</c:if>
|
||||
<c:forEach items="${criterionReport}" var="crit">
|
||||
${crit.name} ${crit.min_rating} ${crit.max_rating}<br />
|
||||
</c:forEach>
|
||||
|
||||
|
||||
<c:if test="${not empty userReport}">
|
||||
<b>PCmember's list </b><br />
|
||||
</c:if>
|
||||
<c:forEach items="${userReport}" var="user">
|
||||
<b>${user.firstName} ${user.lastName}</b><br />
|
||||
</c:forEach>
|
||||
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<a href="<c:url value="main.htm"/>">Home</a>
|
||||
</body>
|
||||
</html>
|
||||
@@ -30,6 +30,7 @@
|
||||
<prop key="/dispatchArticleList.htm">DispatchArticleListController</prop>
|
||||
<prop key="/dispatchArticle.htm">DispatchArticleController</prop>
|
||||
<prop key="/addConference.htm">AddConferenceController</prop>
|
||||
<prop key="/reportConfCreate.htm">ReportConfCreateController</prop>
|
||||
<prop key="/evaluation.htm">EvaluationController</prop>
|
||||
<prop key="/createReport.htm">CreateReportController</prop>
|
||||
<prop key="/listConference.htm">ListConferenceController</prop>
|
||||
@@ -164,6 +165,12 @@
|
||||
<property name="evaluationManager" ref="evaluationManager" />
|
||||
<property name="validator" ref="ConferenceValidator" />
|
||||
</bean>
|
||||
<bean id="ReportConfCreateController"
|
||||
class="org.yacos.web.chairman.controller.ReportConfCreateController">
|
||||
<property name="conferenceManager" ref="conferenceManager" />
|
||||
<property name="evaluationManager" ref="evaluationManager" />
|
||||
<property name="userManager" ref="userManager" />
|
||||
</bean>
|
||||
|
||||
<bean id="ConferenceValidator"
|
||||
class="org.yacos.web.chairman.validation.ConferenceValidator">
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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<Criterion> listCriterionForConf = evaluationManager.getCriterions(conf.getId());
|
||||
List<User> listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER);
|
||||
|
||||
Map<String, Object> model = new HashMap<String, Object>();
|
||||
model.put("conferenceReport", conf);
|
||||
model.put("criterionReport", listCriterionForConf);
|
||||
model.put("userReport", listUsersForConf);
|
||||
|
||||
return new ModelAndView("reportConfCreate", model);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user