From 3e9a46211a8dfa467b68a8454ab4ca8135760488 Mon Sep 17 00:00:00 2001
From: Jialin Wang <kooksnake@hotmail.com>
Date: Fri, 8 Feb 2008 12:49:39 +0000
Subject: [PATCH] =?UTF-8?q?L'=C3=A9valuation=20d'un=20article=20renvoit=20?=
 =?UTF-8?q?les=20vrais=20crit=C3=A8res.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp  |  2 +-
 .../PCmember/controller/EvaluationController.java    | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index ce8fc88..650441d 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -46,7 +46,7 @@
 		<div id="mainmenubloc">
 			<h4><fmt:message key="menu.referee.title" /></h4>
 				<ul>
-					<li><a href="<c:url value="evaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
+					<li><a href="<c:url value="listEvaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
 					<li><a href="<c:url value="#"/>"><fmt:message key="menu.referee.article.evaluation.modify" /></a></li>
 				</ul>
 				<div id="footer"></div>
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index e64021a..208bab7 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -52,17 +52,9 @@ public class EvaluationController  extends SimpleFormController {
 	@Override
 	protected Object formBackingObject(HttpServletRequest request)
 			throws Exception {
-		// FIXME mock object: criterionList  en attendant criterionManager 
+		
 		Conference conf=SessionService.getInstance().getCurrentConference();
-		ArrayList<Criterion> criterionList = new ArrayList<Criterion>();
-		Criterion c1=new Criterion("respect du theme",new Integer(1),new Integer(5),conf );
-		
-		
-		Criterion c2=new Criterion("coherence",new Integer(1),new Integer(3),conf );
-		
-		
-		criterionList.add(c1);
-		criterionList.add(c2);
+		List<Criterion> criterionList =	evaluationManager.getCriterions(conf.getId());
 		
 		String id=request.getParameter("id");
 		Article art=articleManager.getArticle(Integer.parseInt(id));