debut de validation articles
Policy failures: Code warning - failed on resource EvaluationController.java. Reason: ArrayList is a raw type. References to generic type ArrayList<E> should be parameterized, line 96 - failed on resource EvaluationController.java. Reason: Type safety: The expression of type ArrayList needs unchecked conversion to conform to ArrayList<Rating>, line 9 Override reason: o(∩_∩)o
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
<li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="menu.pcmember.article.preference" /></a></li>
|
||||
<li><a href="<c:url value="evaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
|
||||
<li><a href="<c:url value="submissionArticle.htm"/>"><fmt:message key="menu.author.article.submission" /></a></li>
|
||||
<li><a href="<c:url value="validateArticle.htm"/>"><fmt:message key="menu.pcmember.article.validation" /></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
22
YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
Normal file
22
YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
Normal file
@@ -0,0 +1,22 @@
|
||||
<%@ include file="/WEB-INF/decorators/include.jsp"%>
|
||||
|
||||
<html>
|
||||
<head></head>
|
||||
<body>
|
||||
<H2 align="center">Validate the articles of a PC member</H2>
|
||||
<br>
|
||||
<c:forEach items="${listArticleValidate}" var="article">
|
||||
<ul class="article">
|
||||
<li class="title">TiTle: ${article.title} </li>
|
||||
<li class="author">Author: ${article.mainAuthor}</li>
|
||||
<li class="topic">Topic: ${article.topic}</li>
|
||||
<li class="article_url"><a href="<c:url value="${article.URL_article}"/>"><fmt:message key="validate.download"/></a> <a href="<c:url value="createReport.htm"/>"><fmt:message key="validate.report"/></a></li>
|
||||
<li class="state">State:${article.state} <a href="<c:url value="validerOrReject.htm?value=1&article='${article}'"/>"><fmt:message key="validate.validate"/></a>
|
||||
<a href="<c:url value="validerOrReject.htm?value=2&article='${article}'"/>"><fmt:message key="validate.reject"/></a> </li>
|
||||
<li> <a href="<c:url value="listReport.htm"/>"><fmt:message key="validate.report"/></a>
|
||||
</ul>
|
||||
</c:forEach>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -67,6 +67,9 @@
|
||||
</prop>
|
||||
<prop key="/chooseConference.htm">
|
||||
ChooseConferenceController
|
||||
</prop>
|
||||
<prop key="/validateArticle.htm">
|
||||
ValidateArticleController
|
||||
</prop>
|
||||
</props>
|
||||
</property>
|
||||
@@ -110,7 +113,9 @@
|
||||
</bean>
|
||||
|
||||
<bean id="submissionCheck" class="org.yacos.web.author.validator.ValidateSubmission">
|
||||
</bean>
|
||||
</bean>
|
||||
|
||||
|
||||
|
||||
<bean id="ChoosePreferenceController"
|
||||
class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
|
||||
@@ -123,7 +128,14 @@
|
||||
<property name="articleManager" ref="articleManager" />
|
||||
<property name="userManager" ref="userManager" />
|
||||
<property name="conferenceManager" ref="conferenceManager" />
|
||||
</bean>
|
||||
</bean>
|
||||
|
||||
<bean id="ValidateArticleController"
|
||||
class="org.yacos.web.PCmember.controller.ValidateArticleController">
|
||||
<property name="formView" value="validateArticle" />
|
||||
<property name="articleManager" ref="articleManager" />
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="DispatchArticleController"
|
||||
class="org.yacos.web.chairman.controller.DispatchArticleController">
|
||||
@@ -205,7 +217,8 @@
|
||||
<property name="successView" value="createReport.htm" />
|
||||
<property name="articleManager" ref="articleManager" />
|
||||
<property name="userManager" ref="userManager" />
|
||||
<property name="conferenceManager" ref="conferenceManager" />
|
||||
<property name="conferenceManager" ref="conferenceManager" />
|
||||
<property name="evaluationManager" ref="evaluationManager" />
|
||||
</bean>
|
||||
|
||||
<bean id="CreateReportController"
|
||||
@@ -290,5 +303,7 @@
|
||||
<jee:jndi-lookup id="userManager"
|
||||
jndi-name="UserManagerBean/remote" cache="true" />
|
||||
<jee:jndi-lookup id="conferenceManager"
|
||||
jndi-name="ConferenceManagerBean/remote" cache="true" />
|
||||
jndi-name="ConferenceManagerBean/remote" cache="true" />
|
||||
<jee:jndi-lookup id="evaluationManager"
|
||||
jndi-name="EvaluationManagerBean/remote" cache="true" />
|
||||
</beans>
|
||||
|
||||
@@ -15,6 +15,7 @@ import org.yacos.core.article.*;
|
||||
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.evaluation.Rating;
|
||||
import org.yacos.core.evaluation.Report;
|
||||
import org.yacos.core.users.IUserManager;
|
||||
@@ -33,6 +34,19 @@ public class EvaluationController extends SimpleFormController {
|
||||
private IArticleManager articleManager;
|
||||
private IUserManager userManager;
|
||||
private IConferenceManager conferenceManager;
|
||||
private IEvaluationManager evaluationManager;
|
||||
|
||||
public IEvaluationManager getEvaluationManager() {
|
||||
return evaluationManager;
|
||||
}
|
||||
|
||||
public void setEvaluationManager(IEvaluationManager evaluationManager) {
|
||||
this.evaluationManager = evaluationManager;
|
||||
}
|
||||
|
||||
public Log getLogger() {
|
||||
return logger;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object formBackingObject(HttpServletRequest request)
|
||||
@@ -104,7 +118,7 @@ public class EvaluationController extends SimpleFormController {
|
||||
}
|
||||
|
||||
Report rpt =new Report(commentPCMember,commentAuthor,listeRating,toto,article);
|
||||
|
||||
//evaluationManager.addReport(article, commentPCMember, commentAuthor, listeRating, toto);
|
||||
request.getSession().setAttribute("report", rpt);
|
||||
//Map<String, Report> model1 = new HashMap<String, Report>();
|
||||
//model1.put("report", rpt);
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
package org.yacos.web.PCmember.controller;
|
||||
import org.springframework.web.servlet.mvc.SimpleFormController;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import org.yacos.web.system.session.SessionService;
|
||||
import org.yacos.core.article.Article;
|
||||
import org.yacos.core.article.IArticleManager;
|
||||
import org.yacos.core.exceptions.ConferenceDoesntExistException;
|
||||
|
||||
|
||||
public class ValidateArticleController extends SimpleFormController {
|
||||
|
||||
protected final Log logger = LogFactory.getLog(getClass());
|
||||
|
||||
private IArticleManager articleManager;
|
||||
|
||||
public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
|
||||
throws ServletException, IOException{
|
||||
|
||||
logger.info("Returning validateArticle view");
|
||||
//FIXME user "toto" a remplacer par le vrai PCmembre
|
||||
List<Article> listArticleValidate;
|
||||
//listArticleValidate = articleManager.getArticlesOfMember(SessionService.getInstance().getCurrentConferenceId(),"toto");
|
||||
try {
|
||||
listArticleValidate = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId());
|
||||
getServletContext().setAttribute("listArticleValidate", listArticleValidate);
|
||||
} catch (ConferenceDoesntExistException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
return new ModelAndView("validateArticle");
|
||||
}
|
||||
|
||||
public IArticleManager getArticleManager() {
|
||||
return articleManager;
|
||||
}
|
||||
|
||||
public void setArticleManager(IArticleManager articleManager) {
|
||||
this.articleManager = articleManager;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user