From 884c2d01d50dbc0442e94ea222bfa6abceb403d2 Mon Sep 17 00:00:00 2001
From: Maxime Dagnicourt <maxime.dagnicourt@gmail.com>
Date: Mon, 11 Feb 2008 16:51:56 +0000
Subject: [PATCH] Policy failures: Code warning - failed on resource
 PCMemberBean.java. Reason: The import
 org.yacos.core.article.Preference.PreferenceType is never used, line Override
 reason: d

---
 .../WEB-INF/jsp/dispatchArticle.jsp           | 15 +++++----
 YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml |  3 +-
 .../controller/DispatchArticleController.java | 33 ++++++++++++++++---
 .../web/chairman/controller/PCMemberBean.java | 18 +++++++---
 4 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
index d277b8c..bf92e20 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
@@ -30,11 +30,12 @@
 	<br/> theme: ${article.topic}
 	<br/> main author: ${article.mainAuthor.firstName}{article.mainAuthor.lastName}
 	<br/><a href="${article.URL_article}">download the article</a>
-</p>
+</p>
+<br/>
 			
 	<b>members of the conference</b>
 			
-	<table id="members">
+	<table border="1px" id="members">
 		<tr>
 			<th>name</th>
 			<th>preference</th>
@@ -44,17 +45,17 @@
 		<c:forEach var="m" items="${members}">
 			<tr>
 				<td>${m.firstName} ${m.lastName}(0)</td>
-				<td>???</td>
-				<td>0</td>
+				<td>${m.preference}</td>
+				<td>${m.nbArticles}</td>
 				<td><a href="" onclick="addMember('${m.login}', '${article.id}');"/>add</a></td>
 			</tr>
 		</c:forEach>
 	</table>
 		
 	<select>
-		<c:forEach var="am" items="${ArticleMembers}">
-			<option value="${m.login}">
-				 ${m.firstName} ${m.lastName}(0)
+		<c:forEach var="am" items="${articleMembers}">
+			<option value="${am.login}">
+				 ${am.firstName} ${am.lastName}
 			</option>
 		</c:forEach>
 	</select>
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 09b6ba2..7e61f77 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -202,7 +202,7 @@
 		class="org.yacos.web.PCmember.controller.CreateReportController">
 		<property name="articleManager" ref="articleManager" />
 	</bean>
-
+	
 	<bean id="LogonController"
 		class="org.yacos.web.system.controller.LogonController">
 	</bean>
@@ -212,7 +212,6 @@
 		class="org.yacos.web.system.controller.ListConferenceController">
 		<property name="conferenceManager" ref="conferenceManager" />
 	</bean>
-
    
     <bean id="ListEvaluationController"
 		class="org.yacos.web.PCmember.controller.ListEvaluationController">
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java
index 0def020..e6626f5 100644
--- a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java
@@ -1,20 +1,20 @@
 package org.yacos.web.chairman.controller;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.directwebremoting.WebContextFactory;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 import org.yacos.core.article.Article;
 import org.yacos.core.article.IArticleManager;
+import org.yacos.core.article.Preference;
 import org.yacos.core.conferences.Conference;
 import org.yacos.core.conferences.IConferenceManager;
 import org.yacos.core.users.IUserManager;
@@ -62,15 +62,38 @@ public class DispatchArticleController implements Controller{
 		
 		//list of the member who have this article
 		List<User> articleMembers = userManager.getPCMemberForArticle(article.getId());
+		logger.debug("nombre de memebre prour l'article = "+articleMembers.size());
 		
-		Map<String,Integer> nbArticles = new HashMap<String,Integer>();
+		//List members for webpage
+		List<PCMemberBean> membersWeb = new ArrayList<PCMemberBean>();
 		
 		//list of member who have'nt this article
 		List<User> members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER);
-				
+		
+		for (User user : members) {
+			PCMemberBean member = new PCMemberBean();
+			member.setFirstName(user.getFirstName());
+			member.setLastName(user.getLastName());
+			member.setLogin(user.getLogin());
+			Preference pref = articleManager.getPreferenceForUserAndArticle(article.getId(), user.getLogin());
+			if (pref != null){
+				String prefType = pref.getPreferenceType().toString();
+				member.setPreference(prefType);
+			}else {
+				member.setPreference(Preference.PreferenceType.INDIFFERENT.toString());
+			}
+			int nb = 0;
+			List<Article> articles = articleManager.getArticlesOfMember(conf.getId(), user.getLogin());
+			if(articles != null){
+				nb = articles.size();
+			}
+			member.setNbArticles(nb);
+			membersWeb.add(member);
+		}	
+		
 		Map<String,Object> model = new HashMap<String,Object>();
 		model.put("articleMembers",articleMembers);
-		model.put("members", members);
+		model.put("members", membersWeb);
 		model.put("article", article);
 				
 		return new ModelAndView("dispatchArticle", model);
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java b/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java
index e60fdf7..b177710 100644
--- a/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java
@@ -1,11 +1,13 @@
 package org.yacos.web.chairman.controller;
 
+import org.yacos.core.article.Preference.PreferenceType;
+
 public class PCMemberBean {
 	private String login;
 	private String firstName;
 	private String lastName;
 	private String Preference;
-	private String nbArticles;
+	private int nbArticles;
 	
 	public PCMemberBean() {
 		super();
@@ -29,16 +31,22 @@ public class PCMemberBean {
 	public void setLastName(String lastName) {
 		this.lastName = lastName;
 	}
+	
 	public String getPreference() {
 		return Preference;
 	}
+
 	public void setPreference(String preference) {
 		Preference = preference;
 	}
-	public String getNbArticles() {
-		return nbArticles;
-	}
-	public void setNbArticles(String nbArticles) {
+	
+	public void setNbArticles(int nbArticles) {
 		this.nbArticles = nbArticles;
 	}
+
+	public int getNbArticles() {
+		return nbArticles;
+	}
+
+	
 }