From 60c4bfc7e3612f0165f35640c94d1c81392b7881 Mon Sep 17 00:00:00 2001
From: Jialin Wang <kooksnake@hotmail.com>
Date: Tue, 12 Feb 2008 09:50:44 +0000
Subject: [PATCH] validation ca marche mnt & correction du lien

---
 YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp        | 2 +-
 YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp             | 2 +-
 .../web/PCmember/controller/EvaluationController.java      | 5 ++---
 .../web/PCmember/controller/ListReportController.java      | 7 +++++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index f29e7ea..3cc96b2 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -20,7 +20,7 @@
 					<li><a href="<c:url value="addConference.htm"/>"><fmt:message key="menu.chairman.conference.create" /></a></li>
 					<li><a href="<c:url value="addConference.htm?action=modify"/>"><fmt:message key="menu.chairman.conference.modify" /></a></li>
 					<li><a href="<c:url value="dispatchArticleList.htm"/>"><fmt:message key="menu.chairman.article.dispatch" /></a></li>
-					<li><a href="<c:url value="#"/>"><fmt:message key="menu.chairman.article.validate" /></a></li>
+					<li><a href="<c:url value="validateArticle.htm"/>"><fmt:message key="menu.chairman.article.validate" /></a></li>
 				</ul>
 				<div id="footer"></div>
 		</div>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
index 0e94ff3..b8784e4 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
@@ -18,7 +18,7 @@
    <td><c:out value="${report.article.title}"/></td>
    </tr>
    
-     <c:forEach items="${report.ratings}" var="rating" varStatus="j">
+     <c:forEach items="${rtgs}" var="rating" varStatus="j">
       <tr>
         <td><fmt:message key="evaluation.note"/> </td>
         <td>${rating.criterion.name} is: </td>
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index 7228437..896a739 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -123,15 +123,14 @@ public class EvaluationController  extends SimpleFormController {
 		
 		int idd=Integer.parseInt(id);
 				
-	   Report rpt= evaluationManager.addReport(idd, commentPCMember, commentAuthor, listeRating, current.getLogin());
+	    Report rpt= evaluationManager.addReport(idd, commentPCMember, commentAuthor, listeRating, current.getLogin());
 	    request.getSession().setAttribute("report", rpt);
 	  //persister ratings dans la base apres avoir le id report.
 		System.out.println("lengthe is :"+listeRating.size());
 		for (Rating rt : listeRating)
 			
 		{
-			 System.out.println("value: "+rt.getValue());
-			 System.out.println("criterion: "+rt.getCriterion());
+			
 			 if (rpt!=null){System.out.println("report is not null");}
 			evaluationManager.addRating(rt.getValue(), rt.getCriterion().getId(), rpt.getId());
 		}
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
index 65660ed..f8e599e 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.util.List;
 import org.yacos.web.system.controller.NoConferenceSelectedException;
 import org.yacos.core.evaluation.IEvaluationManager;
+import org.yacos.core.evaluation.Rating;
 import org.yacos.core.evaluation.Report;
 
 
@@ -30,8 +31,10 @@ public class ListReportController extends SimpleFormController {
         int idd=Integer.parseInt(id);
 		
 		listReport = evaluationManager.getReportsForArticle(idd);
-	 getServletContext().setAttribute("listReport", listReport);
-		
+	    getServletContext().setAttribute("listReport", listReport);
+	    
+		List<Rating> ratings=evaluationManager.getRatingForReport(listReport.get(listReport.size()-1).getId());
+		getServletContext().setAttribute("rtgs", ratings);
         return new ModelAndView("listReport");
     }