From f0fb3887fa21e5b6468552bf1fa8acae3a69d0a7 Mon Sep 17 00:00:00 2001 From: Maxime Dagnicourt Date: Sun, 24 Feb 2008 21:22:22 +0000 Subject: [PATCH] --- .../WebContent/WEB-INF/jsp/conflictList.jsp | 2 +- .../WebContent/WEB-INF/jsp/detailArticle.jsp | 2 +- .../WEB-INF/jsp/dispatchArticle.jsp | 19 +++++++++--------- .../controller/DelegateArticleController.java | 20 ++++++++++++++++--- .../controller/ConflictListController.java | 6 ++---- .../controller/DispatchArticleController.java | 7 +++---- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp index 7ff712c..83eaac9 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp @@ -182,7 +182,7 @@ - download the article + article's detail diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp index 7fe7201..2afde41 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp @@ -27,7 +27,7 @@ ${article.mainAuthor.lastName}

">Download

- + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp index 8f4febd..14d642a 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp @@ -54,12 +54,12 @@ var member = data[i]; var pref; if (member.preference=="LIKE"){ - pref = "LIKE"; + pref = "LIKE"; } if (member.preference=="DISLIKE"){ - pref = "DISLIKE"; + pref = "DISLIKE"; }else { - pref = "INDIFFERENT"; + pref = "INDIFFERENT"; } var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles + " pref: "+ pref; @@ -78,13 +78,12 @@ var member = data[i]; var pref; if (member.preference=="LIKE"){ - pref = "LIKE"; + pref = "LIKE"; } if (member.preference=="DISLIKE"){ - pref = "DISLIKE"; - } - if (member.preference=="INDIFFERENT"){ - pref = "INDIFFERENT"; + pref = "DISLIKE"; + }else { + pref = "INDIFFERENT"; } var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles + " pref: "+ pref; @@ -101,7 +100,7 @@ function select(elem){ var item = elem; - if(item.hasClassName('selected')){ + if(item.hasClassName('selected')&& item.id == 'pref'){ item.removeClassName('selected'); } else { item.addClassName('selected'); @@ -185,7 +184,7 @@ - download the article + article's detail diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java index b485946..a2670d8 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java @@ -107,6 +107,9 @@ public List getRefereesWithTheArticle(int articleId ){ //list of all pcmembers of the conference List membersTmp = userManager.getUsers(); + //list of the member who have this article + List refereesTmp = userManager.getRefereesOfPcMemberForArticle(memberId, articleId); + for (User user : membersTmp) { member = new RefereeBean(); member.setFirstName(user.getFirstName()); @@ -121,14 +124,25 @@ public List getRefereesWithTheArticle(int articleId ){ spectialities.add(speciality.getName()); } member.setSpecialities(spectialities); - members.add(member); + List userRoles = conferenceManager.getRoles(user.getLogin(), conf.getId()); + boolean isMember = false; + for (Role role : userRoles) { + if(role.getType().equals(Role.RoleType.CHAIRMAN)||(role.getType().equals(Role.RoleType.PCMEMBER))){ + isMember = true; + } + } + //add the member to the return list + if (!refereesTmp.contains(user) && !isMember){ + members.add(member); + } + } logger.debug("return"+ members.size() +"members"); return members; } - public void addReferee(List refereesId,int articleId){ + public void addReferees(List refereesId,int articleId){ for (String refereeId : refereesId) { articleManager.delegateArticleToReferee(articleId, refereeId,memberId); conferenceManager.addRole(RoleType.REFEREE, refereeId, SessionService.getInstance().getCurrentConference().getId()); @@ -136,7 +150,7 @@ public List getRefereesWithTheArticle(int articleId ){ logger.debug("add referee to article"); } - public void removeReferee(List refereesId,int articleId){ + public void removeReferees(List refereesId,int articleId){ for (String refereeId : refereesId) { articleManager.undelegateArticleToReferee(articleId, refereeId, memberId); User referee = userManager.getUser(refereeId); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java index 13adeaa..d219009 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java @@ -126,16 +126,14 @@ public List getMembersWithConflict(int articleId ){ for (String memberId : membersId) { articleManager.addPreference(articleId, memberId, PreferenceType.CONFLICT); } - logger.info("add members to article"); - + logger.info("add members to conflictlist"); } public void removeMembers(List membersId,int articleId){ for (String memberId : membersId) { articleManager.removePreference(articleId, memberId); } - logger.info("remove members to article"); - + logger.info("remove members to conflictlist"); } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java index 1a9d561..f7b7bc0 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java @@ -47,6 +47,7 @@ public class DispatchArticleController implements Controller{ } public void setConferenceManager(IConferenceManager conferenceManager) { this.conferenceManager = conferenceManager; + } // FIXME : c'est interdit de faire ca ;) @@ -165,20 +166,18 @@ public List getMembersWithTheArticle(int articleId ){ } - public List addMembers(List membersId,int articleId){ + public void addMembers(List membersId,int articleId){ for (String memberId : membersId) { articleManager.assignArticleToPCMember(articleId, memberId); } logger.debug("add members to article"); - return userManager.getPCMemberForArticle(articleId); } - public List removeMembers(List membersId,int articleId){ + public void removeMembers(List membersId,int articleId){ for (String memberId : membersId) { articleManager.unassignArticleToPCMember(articleId, memberId); } logger.debug("remove members to article"); - return userManager.getPCMemberForArticle(articleId); }