diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 3856618..bd866c4 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -18,6 +18,7 @@
  • ">
  • ">
  • ">
    • +
  • ">
    • diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp new file mode 100644 index 0000000..eafa56f --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp @@ -0,0 +1,22 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + +

    Validate the articles of a PC member

    +
    + + + + + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index cdce2f8..558921b 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -67,6 +67,9 @@ ChooseConferenceController + + + ValidateArticleController @@ -110,7 +113,9 @@ - + + + @@ -123,7 +128,14 @@ - + + + + + + + @@ -205,7 +217,8 @@ - + + + jndi-name="ConferenceManagerBean/remote" cache="true" /> + diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index cfcf886..016fd6e 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -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 model1 = new HashMap(); //model1.put("report", rpt); diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java new file mode 100644 index 0000000..c19913c --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java @@ -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
    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; + } +} \ No newline at end of file