From 6a7919a57f0933fb336959e824ce910a26be65c9 Mon Sep 17 00:00:00 2001
From: Jialin Wang <kooksnake@hotmail.com>
Date: Mon, 25 Feb 2008 00:06:57 +0000
Subject: [PATCH] corriger ratings : pour que les reports affichent les ratings
 differents Policy failures: Code warning - failed on resource
 ListReportController.java. Reason: ArrayList is a raw type. References to
 generic type ArrayList<E> should be parameterized, line 53 - failed on
 resource ListReportController.java. Reason: List is a raw type. References to
 generic type List<E> should be parameterized, line 53 - failed on resource
 ListReportController.java. Reason: Type safety: The method add(Object)
 belongs to the raw type List. References to generic type List<E> should be
 parameterized, line 5 Override reason:

---
 .../WebContent/WEB-INF/jsp/listReport.jsp     |  6 +++--
 .../controller/EvaluationController.java      |  6 ++---
 .../controller/ListReportController.java      | 25 ++++++++++++++++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
index 10833c8..4ff1eb5 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
@@ -14,7 +14,8 @@
 </c:when>
 
 <c:otherwise>
-<c:forEach items="${listReport}" var="report">
+<c:forEach items="${listReport}" var="report" varStatus="current">
+
 	<table>
 		<tr>
 			<td><fmt:message key="report.referee" />: ${report.referee.firstName} ${report.referee.lastName}</td>
@@ -24,7 +25,7 @@
 			<td>${report.article.title}</td>
 		</tr>
 
-		<c:forEach items="${rtgs}" var="rating">
+		<c:forEach items="${container[current.index]}" var="rating">
 			<tr>
 				<td><fmt:message key="evaluation.note" /></td>
 				<td>${rating.criterion.name} is:</td>
@@ -43,6 +44,7 @@
 		</tr>
 	</table>
 	<hr>
+
 </c:forEach>
 </c:otherwise>
 
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index baaf0a9..08f66e0 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -80,8 +80,8 @@ public class EvaluationController  extends SimpleFormController {
 		String articleId = request.getParameter("id");
 		String action = request.getParameter("action");
 		
-		// TODO : vérifier que le gars a le droit d'évaluer cette article
-		// TODO : s'il existe déjà une éval, mais que l'action est pas modify, virer le gars
+		// TODO : verifier que le gars a le droit d'evaluer cette article
+		// TODO : s'il existe deja une al, mais que l'action est pas modify, virer le gars
 
 		if (action == null || action.equals("")) {
 
@@ -181,7 +181,7 @@ public class EvaluationController  extends SimpleFormController {
 					cn.setMin_rating(sc.getMin_rating());
 					cn.setName(sc.getName());
 					cn.setId(sc.getId());
-
+                   
 					rt.setCriterion(cn);
 					rt.setValue(sc.getValue());
 					listeRating.add(rt);
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
index 54a43e3..0fdc3c0 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
@@ -1,6 +1,7 @@
 package org.yacos.web.PCmember.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,12 +46,28 @@ public class ListReportController extends SimpleFormController {
 			if (listReport.isEmpty())
 				return new ModelAndView("listReport", "listReport", null);
 			
+			
+			
 			model.put("listReport", listReport);
-
-			List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(listReport.size() - 1).getId());
-			model.put("rtgs", ratings);
+            
+			List container=new ArrayList();
+		
+				for (int i=0; i<=listReport.size()-1;i++){
+			     List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
+			     container.add(ratings);
+			   }
+			model.put("container", container);
 			model.put("whereIcome", request.getHeader("REFERER"));
-
+          
+	       /* double[] moyennes=new double[listReport.size()];
+	        
+	        for (Rating rt : ratings)
+	        {
+	        	
+	        	
+	        }*/
+	        
+			
 			return new ModelAndView("listReport", model);
 		}