Un report est visible que pr son pc member sauf qd valde or reject

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 74
- failed on resource ListReportController.java. Reason: ArrayList is a raw type. References to generic type ArrayList<E> should be parameterized, line 98
- failed on resource ListReportController.java. Reason: List is a raw type. References to generic type List<E> should be parameterized, line 74
- failed on resource ListReportController.java. Reason: List is a raw type. References to generic type List<E> should be parameterized, line 98
- 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 102
... and more.  
Override reason:   
ff

YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp

@@ -7,13 +7,15 @@
 <h4 class="title"><fmt:message key="report.headPage" /></h4>
 
 <c:choose>
-<c:when test="${empty listReport}">
+<c:when test="${(empty listReport) and ( empty rpt) }">
 	<div class="warningBox">
     	There is no report for this article at the moment.
     </div>
 </c:when>
 
 <c:otherwise>
+<c:choose>
+<c:when test="${not empty listReport }">
 <c:forEach items="${listReport}" var="report" varStatus="current">
 
 	<table>
@@ -46,6 +48,39 @@
 	<hr>
 
 </c:forEach>
+</c:when>
+<c:otherwise>
+<table>
+		<tr>
+			<td><fmt:message key="report.referee" />: ${rpt.referee.firstName} ${rpt.referee.lastName}</td>
+		</tr>
+		<tr>
+			<td><fmt:message key="evaluation.titleArticle" /></td>
+			<td>${rpt.article.title}</td>
+		</tr>
+
+		<c:forEach items="${rtgs}" var="rating">
+			<tr>
+				<td><fmt:message key="evaluation.note" /></td>
+				<td>${rating.criterion.name} is:</td>
+				<td>${rating.value}</td>
+			</tr>
+		</c:forEach>
+
+		<tr>
+			<td><fmt:message key="evaluation.commentPCMember" /></td>
+			<td>${rpt.commentPCMember}</td>
+		</tr>
+
+		<tr>
+			<td><fmt:message key="evaluation.commentAuthor" /></td>
+			<td>${rpt.commentAuthor}</td>
+		</tr>
+	</table>
+
+</c:otherwise>
+</c:choose>
+
 </c:otherwise>
 
 </c:choose>

YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml

@@ -292,6 +292,8 @@
    
     <bean id="ListReportController"
 		class="org.yacos.web.PCmember.controller.ListReportController">
+		<property name="articleManager" ref="articleManager" />
+		<property name="userManager" ref="userManager" />
 		<property name="evaluationManager" ref="evaluationManager" />
    </bean>
    

YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java

@@ -15,10 +15,16 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndViewDefiningException;
 import org.springframework.web.servlet.mvc.SimpleFormController;
+import org.yacos.core.article.Article;
+import org.yacos.core.article.IArticleManager;
+import org.yacos.core.article.Article.State;
 import org.yacos.core.evaluation.IEvaluationManager;
 import org.yacos.core.evaluation.Rating;
 import org.yacos.core.evaluation.Report;
+import org.yacos.core.users.IUserManager;
+import org.yacos.core.users.Role.RoleType;
 import org.yacos.web.system.controller.NoConferenceSelectedException;
+import org.yacos.web.system.session.SessionService;
 
 
 public class ListReportController extends SimpleFormController {
@@ -26,51 +32,116 @@ public class ListReportController extends SimpleFormController {
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private IEvaluationManager evaluationManager;
+	private IUserManager userManager;
+	private IArticleManager articleManager;
+
+
+	public IArticleManager getArticleManager() {
+		return articleManager;
+	}
+
+	public void setArticleManager(IArticleManager articleManager) {
+		this.articleManager = articleManager;
+	}
 
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
 	throws ServletException, IOException, NoConferenceSelectedException {
 
 		logger.info("Returning listReport view");
 
-		List<Report> listReport;
+		List<Report> listReport=new ArrayList<Report>();
 		String reportId = request.getParameter("id");
 
+
 		try {
 
 			Integer id = new Integer(reportId);
+			Article a = articleManager.getArticle(id);
+			if (a == null)
+				throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 
 			Map <String, Object> model = new HashMap<String, Object>();
 
-			listReport = evaluationManager.getReportsForArticle(id);
+			if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.CHAIRMAN, SessionService.getInstance().getCurrentConferenceId()))
-			
+
+			{ listReport = evaluationManager.getReportsForArticle(id); 
+
 			if (listReport.isEmpty())
 				return new ModelAndView("listReport", "listReport", null);
+
+			else { model.put("listReport", listReport);
 			
-			
-			
-			model.put("listReport", listReport);
-            
 			List container=new ArrayList();
-		
+
-				for (int i=0; i<=listReport.size()-1;i++){
+			for (int i=0; i<=listReport.size()-1;i++){
-			     List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
+				List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
-			     container.add(ratings);
+				container.add(ratings);
-			   }
+			}
 			model.put("container", container);
+			  }
+			 
+			}
+
+			else 
+				if 	(userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, SessionService.getInstance().getCurrentConferenceId()))
+				{
+
+					if (a.getState()== State.ACCEPTED ||a.getState()==State.REJECTED)
+					{
+						listReport = evaluationManager.getReportsForArticle(id);
+
+						if (listReport.isEmpty())
+							return new ModelAndView("listReport", "listReport", null);
+
+						else  {model.put("listReport", listReport);
+
+						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);
+						}
+
+					}
+
+					else{	
+						Report rpt = evaluationManager.getReportforArticleAndReferee(id, SessionService.getInstance().getCurrentUserLogin());
+
+						if (rpt==null)
+							return new ModelAndView("listReport", "rpt", null);
+						else {
+							model.put("rpt", rpt); 
+							List<Rating> ratings = evaluationManager.getRatingForReport(rpt.getId());
+							model.put("rtgs",ratings);
+							
+						}
+
+					}
+
+
+
+
+				}
+
+
+
+		
 			model.put("whereIcome", request.getHeader("REFERER"));
-          
+
-	       /* double[] moyennes=new double[listReport.size()];
+			/* double[] moyennes=new double[listReport.size()];
-	        
+
 	        for (Rating rt : ratings)
 	        {
-	        	
+
-	        	
+
 	        }*/
-	        
+
-			
+
 			return new ModelAndView("listReport", model);
 		}
-		
+
 		catch (NumberFormatException e) {
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 		}
@@ -83,4 +154,12 @@ public class ListReportController extends SimpleFormController {
 	public void setEvaluationManager(IEvaluationManager evaluationManager) {
 		this.evaluationManager = evaluationManager;
 	}
+
+	public IUserManager getUserManager() {
+		return userManager;
+	}
+
+	public void setUserManager(IUserManager userManager) {
+		this.userManager = userManager;
+	}
 }