Dispatch: ca plante pu mais ca fait rien de spécial pr l'instant
This commit is contained in:
@@ -4,6 +4,8 @@
|
|||||||
<head></head>
|
<head></head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
||||||
|
<form:form commandName="formDispatcher">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<th>articles to dispatch</th><th>members</th><th>members associate to the article</th>
|
<th>articles to dispatch</th><th>members</th><th>members associate to the article</th>
|
||||||
@@ -20,7 +22,8 @@
|
|||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<form:form commandName="formDispatcher">
|
|
||||||
|
|
||||||
|
|
||||||
<input name="idArticle" type="hidden" value="${article.id}" />
|
<input name="idArticle" type="hidden" value="${article.id}" />
|
||||||
|
|
||||||
@@ -33,7 +36,8 @@
|
|||||||
</form:select>
|
</form:select>
|
||||||
|
|
||||||
<input type="submit" value="add" />
|
<input type="submit" value="add" />
|
||||||
</form:form>
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<center>list is empty !</center>
|
<center>list is empty !</center>
|
||||||
@@ -47,7 +51,7 @@
|
|||||||
</c:forEach>
|
</c:forEach>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
</form:form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|||||||
@@ -57,11 +57,9 @@
|
|||||||
ValidateArticleController
|
ValidateArticleController
|
||||||
</prop>
|
</prop>
|
||||||
<prop key="/valideOrReject.htm">
|
<prop key="/valideOrReject.htm">
|
||||||
ValideOrRejectController
|
ValideOrRejectController
|
||||||
</prop>
|
|
||||||
<prop key="/login.htm">
|
|
||||||
LogonController
|
|
||||||
</prop>
|
</prop>
|
||||||
|
<prop key="/login.htm">LogonController</prop>
|
||||||
</props>
|
</props>
|
||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
@@ -81,7 +79,8 @@
|
|||||||
class="org.yacos.web.system.controller.SUserRegistrationController">
|
class="org.yacos.web.system.controller.SUserRegistrationController">
|
||||||
<property name="sessionForm" value="true" />
|
<property name="sessionForm" value="true" />
|
||||||
<property name="commandName" value="registerUser" />
|
<property name="commandName" value="registerUser" />
|
||||||
<property name="commandClass" value="org.yacos.web.system.form.FormUser" />
|
<property name="commandClass"
|
||||||
|
value="org.yacos.web.system.form.FormUser" />
|
||||||
<property name="formView" value="registerUser" />
|
<property name="formView" value="registerUser" />
|
||||||
<property name="successView" value="listArticle.htm" />
|
<property name="successView" value="listArticle.htm" />
|
||||||
<property name="userManager" ref="userManager" />
|
<property name="userManager" ref="userManager" />
|
||||||
@@ -96,11 +95,12 @@
|
|||||||
<property name="formView" value="submissionArticle" />
|
<property name="formView" value="submissionArticle" />
|
||||||
<property name="successView" value="listArticle.htm" />
|
<property name="successView" value="listArticle.htm" />
|
||||||
<property name="articleManager" ref="articleManager" />
|
<property name="articleManager" ref="articleManager" />
|
||||||
<property name="validator" ref="submissionCheck"/>
|
<property name="validator" ref="submissionCheck" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="submissionCheck" class="org.yacos.web.author.validator.ValidateSubmission">
|
<bean id="submissionCheck"
|
||||||
</bean>
|
class="org.yacos.web.author.validator.ValidateSubmission">
|
||||||
|
</bean>
|
||||||
|
|
||||||
<bean id="ChoosePreferenceController"
|
<bean id="ChoosePreferenceController"
|
||||||
class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
|
class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
|
||||||
@@ -119,12 +119,13 @@
|
|||||||
class="org.yacos.web.PCmember.controller.ValidateArticleController">
|
class="org.yacos.web.PCmember.controller.ValidateArticleController">
|
||||||
<property name="formView" value="validateArticle" />
|
<property name="formView" value="validateArticle" />
|
||||||
<property name="articleManager" ref="articleManager" />
|
<property name="articleManager" ref="articleManager" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="ValideOrRejectController"
|
||||||
|
class="org.yacos.web.PCmember.controller.ValideOrRejectController">
|
||||||
|
<property name="articleManager" ref="articleManager" />
|
||||||
|
</bean>
|
||||||
|
|
||||||
<bean id="ValideOrRejectController"
|
|
||||||
class="org.yacos.web.PCmember.controller.ValideOrRejectController">
|
|
||||||
<property name="articleManager" ref="articleManager" />
|
|
||||||
</bean>
|
|
||||||
<bean id="DispatchArticleController"
|
<bean id="DispatchArticleController"
|
||||||
class="org.yacos.web.chairman.controller.DispatchArticleController">
|
class="org.yacos.web.chairman.controller.DispatchArticleController">
|
||||||
<property name="sessionForm" value="true" />
|
<property name="sessionForm" value="true" />
|
||||||
@@ -147,10 +148,11 @@
|
|||||||
value="org.yacos.web.chairman.form.FormConference" />
|
value="org.yacos.web.chairman.form.FormConference" />
|
||||||
<property name="conferenceManager" ref="conferenceManager" />
|
<property name="conferenceManager" ref="conferenceManager" />
|
||||||
<property name="userManager" ref="userManager" />
|
<property name="userManager" ref="userManager" />
|
||||||
<property name="validator" ref="ConferenceValidator"/>
|
<property name="validator" ref="ConferenceValidator" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="ConferenceValidator" class="org.yacos.web.chairman.validation.ConferenceValidator">
|
<bean id="ConferenceValidator"
|
||||||
|
class="org.yacos.web.chairman.validation.ConferenceValidator">
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="EvaluationController"
|
<bean id="EvaluationController"
|
||||||
@@ -173,7 +175,8 @@
|
|||||||
<property name="articleManager" ref="articleManager" />
|
<property name="articleManager" ref="articleManager" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="LogonController" class="org.yacos.web.system.controller.LogonController">
|
<bean id="LogonController"
|
||||||
|
class="org.yacos.web.system.controller.LogonController">
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<!-- List all conference -->
|
<!-- List all conference -->
|
||||||
@@ -198,7 +201,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<dwr:controller id="dwrController" debug="true"></dwr:controller>
|
<dwr:controller id="dwrController" debug="true"></dwr:controller>
|
||||||
<dwr:configuration>
|
<dwr:configuration>
|
||||||
<dwr:convert type="bean"
|
<dwr:convert type="bean"
|
||||||
class="org.yacos.web.chairman.form.FormConference">
|
class="org.yacos.web.chairman.form.FormConference">
|
||||||
@@ -246,8 +249,8 @@
|
|||||||
<!-- EJB Services Linking -->
|
<!-- EJB Services Linking -->
|
||||||
<jee:jndi-lookup id="articleManager"
|
<jee:jndi-lookup id="articleManager"
|
||||||
jndi-name="ArticleManagerBean/remote" cache="true" />
|
jndi-name="ArticleManagerBean/remote" cache="true" />
|
||||||
<jee:jndi-lookup id="userManager"
|
<jee:jndi-lookup id="userManager" jndi-name="UserManagerBean/remote"
|
||||||
jndi-name="UserManagerBean/remote" cache="true" />
|
cache="true" />
|
||||||
<jee:jndi-lookup id="conferenceManager"
|
<jee:jndi-lookup id="conferenceManager"
|
||||||
jndi-name="ConferenceManagerBean/remote" cache="true" />
|
jndi-name="ConferenceManagerBean/remote" cache="true" />
|
||||||
<jee:jndi-lookup id="evaluationManager"
|
<jee:jndi-lookup id="evaluationManager"
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package org.yacos.web.chairman.controller;
|
package org.yacos.web.chairman.controller;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -14,7 +13,6 @@ import org.springframework.validation.BindException;
|
|||||||
import org.springframework.validation.Errors;
|
import org.springframework.validation.Errors;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
import org.springframework.web.servlet.mvc.SimpleFormController;
|
import org.springframework.web.servlet.mvc.SimpleFormController;
|
||||||
import org.yacos.core.article.Article;
|
|
||||||
import org.yacos.core.article.IArticleManager;
|
import org.yacos.core.article.IArticleManager;
|
||||||
import org.yacos.core.conferences.Conference;
|
import org.yacos.core.conferences.Conference;
|
||||||
import org.yacos.core.conferences.IConferenceManager;
|
import org.yacos.core.conferences.IConferenceManager;
|
||||||
@@ -57,36 +55,47 @@ public class DispatchArticleController extends SimpleFormController{
|
|||||||
protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException {
|
protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException {
|
||||||
logger.info("Returning dispatcher view");
|
logger.info("Returning dispatcher view");
|
||||||
|
|
||||||
//on recupere l'id de conference
|
FormDispatcher fd = new FormDispatcher();
|
||||||
int conf_id = (Integer)request.getSession().getAttribute("idCurrentConference");
|
return fd;
|
||||||
Collection<User> members = userManager.getUsers(conf_id,RoleType.PCMEMBER);
|
|
||||||
|
|
||||||
request.getSession().setAttribute("members",members);
|
//Conference conf = SessionService.getInstance().getCurrentConference();
|
||||||
|
//Collection<User> members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER);
|
||||||
|
|
||||||
return new FormDispatcher();
|
//request.getSession().setAttribute("members", members);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
protected Map referenceData(HttpServletRequest request, Object command,
|
protected Map referenceData(HttpServletRequest request, Object command,
|
||||||
Errors errors) throws Exception {
|
Errors errors) throws Exception {
|
||||||
|
logger.info("Dispatch: In the referenceData method, adding object in the model");
|
||||||
|
|
||||||
Map model = new HashMap();
|
Map model = new HashMap();
|
||||||
// Fetching conference
|
|
||||||
Conference conf = SessionService.getInstance().getCurrentConference();
|
Conference conf = SessionService.getInstance().getCurrentConference();
|
||||||
|
Collection<User> members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER);
|
||||||
model.put("articles", articleManager.getArticles(conf.getId()));
|
model.put("articles", articleManager.getArticles(conf.getId()));
|
||||||
|
model.put("members", members);
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected ModelAndView onSubmit(HttpServletRequest request,
|
|
||||||
HttpServletResponse response,
|
|
||||||
Object command, BindException errors) throws Exception {
|
|
||||||
|
|
||||||
// Fetching conference
|
@SuppressWarnings("unchecked")
|
||||||
Conference conf = SessionService.getInstance().getCurrentConference();
|
protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception {
|
||||||
|
/*Conference conf = SessionService.getInstance().getCurrentConference();
|
||||||
|
|
||||||
FormDispatcher fd = (FormDispatcher)command;
|
FormDispatcher fd = (FormDispatcher)command;
|
||||||
Article article = articleManager.getArticle(fd.getIdArticle());
|
Article article = articleManager.getArticle(fd.getIdArticle());
|
||||||
|
|
||||||
return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId()));
|
return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId()));*/
|
||||||
|
|
||||||
|
logger.info("Dispatch: In the onSubmit method");
|
||||||
|
|
||||||
|
Map model = new HashMap();
|
||||||
|
Conference conf = SessionService.getInstance().getCurrentConference();
|
||||||
|
Collection<User> members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER);
|
||||||
|
model.put("articles", articleManager.getArticles(conf.getId()));
|
||||||
|
model.put("members", members);
|
||||||
|
return new ModelAndView("dispatchArticle", model);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user