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 @@
theme: ${article.topic}
main author: ${article.mainAuthor.firstName}{article.mainAuthor.lastName}
download the article
-
+
+
members of the conference
-
+
| name |
preference |
@@ -44,17 +45,17 @@
| ${m.firstName} ${m.lastName}(0) |
- ??? |
- 0 |
+ ${m.preference} |
+ ${m.nbArticles} |
add |
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">
-
+
@@ -212,7 +212,6 @@
class="org.yacos.web.system.controller.ListConferenceController">
-
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 articleMembers = userManager.getPCMemberForArticle(article.getId());
+ logger.debug("nombre de memebre prour l'article = "+articleMembers.size());
- Map nbArticles = new HashMap();
+ //List members for webpage
+ List membersWeb = new ArrayList();
//list of member who have'nt this article
List 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 articles = articleManager.getArticlesOfMember(conf.getId(), user.getLogin());
+ if(articles != null){
+ nb = articles.size();
+ }
+ member.setNbArticles(nb);
+ membersWeb.add(member);
+ }
+
Map model = new HashMap();
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;
+ }
+
+
}