christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
Maxime Dagnicourt
2008-02-24 21:22:22 +00:00
parent c8be67d69d
commit f0fb3887fa
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp
View File

@@ -182,7 +182,7 @@
</c:forEach> </c:forEach>
</c:if> </c:if>
</td> </td>
<td><a href="${article.URL_article}">download the article</a></td> <td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
</tr> </tr>
</table> </table>
</div> </div>

2
YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp
View File

@@ -27,7 +27,7 @@ ${article.mainAuthor.lastName}</b></p>
<c:url value="/download.htm"> <c:url value="/download.htm">
<c:param name="articleId" value="${article.id}"/> <c:param name="articleId" value="${article.id}"/>
</c:url>">Download</a></p> </c:url>">Download</a></p>
</div> </div>
</body> </body>
</html> </html>

19
YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
View File

@@ -54,12 +54,12 @@
var member = data[i]; var member = data[i];
var pref; var pref;
if (member.preference=="LIKE"){ if (member.preference=="LIKE"){
pref = "<span style='color:green;font-weight:bold'>LIKE</span>"; pref = "<span id='pref' style='color:green;font-weight:bold'>LIKE</span>";
} }
if (member.preference=="DISLIKE"){ if (member.preference=="DISLIKE"){
pref = "<span style='color:red;font-weight:bold'>DISLIKE</span>"; pref = "<span id='pref' style='color:red;font-weight:bold'>DISLIKE</span>";
}else { }else {
pref = "<span style='font-weight:bold'>INDIFFERENT</span>"; pref = "<span id='pref' style='font-weight:bold'>INDIFFERENT</span>";
} }
var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles
+ " pref: "+ pref; + " pref: "+ pref;
@@ -78,13 +78,12 @@
var member = data[i]; var member = data[i];
var pref; var pref;
if (member.preference=="LIKE"){ if (member.preference=="LIKE"){
pref = "<span style='color:green;font-weight:bold'>LIKE</span>"; pref = "<span id='pref' style='color:green;font-weight:bold'>LIKE</span>";
} }
if (member.preference=="DISLIKE"){ if (member.preference=="DISLIKE"){
pref = "<span style='color:red;font-weight:bold'>DISLIKE</span>"; pref = "<span id='pref' style='color:red;font-weight:bold'>DISLIKE</span>";
} }else {
if (member.preference=="INDIFFERENT"){ pref = "<span id='pref' style='font-weight:bold'>INDIFFERENT</span>";
pref = "<span style='font-weight:bold'>INDIFFERENT</span>";
} }
var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles
+ " pref: "+ pref; + " pref: "+ pref;
@@ -101,7 +100,7 @@
function select(elem){ function select(elem){
var item = elem; var item = elem;
if(item.hasClassName('selected')){ if(item.hasClassName('selected')&& item.id == 'pref'){
item.removeClassName('selected'); item.removeClassName('selected');
} else { } else {
item.addClassName('selected'); item.addClassName('selected');
@@ -185,7 +184,7 @@
</c:forEach> </c:forEach>
</c:if> </c:if>
</td> </td>
<td><a href="${article.URL_article}">download the article</a></td> <td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
</tr> </tr>
</table> </table>
</div> </div>

18
YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java
View File

@@ -107,6 +107,9 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
//list of all pcmembers of the conference //list of all pcmembers of the conference
List<User> membersTmp = userManager.getUsers(); List<User> membersTmp = userManager.getUsers();
//list of the member who have this article
List<User> refereesTmp = userManager.getRefereesOfPcMemberForArticle(memberId, articleId);
for (User user : membersTmp) { for (User user : membersTmp) {
member = new RefereeBean(); member = new RefereeBean();
member.setFirstName(user.getFirstName()); member.setFirstName(user.getFirstName());
@@ -121,14 +124,25 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
spectialities.add(speciality.getName()); spectialities.add(speciality.getName());
} }
member.setSpecialities(spectialities); member.setSpecialities(spectialities);
List<Role> 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); members.add(member);
} }
}
logger.debug("return"+ members.size() +"members"); logger.debug("return"+ members.size() +"members");
return members; return members;
} }
public void addReferee(List<String> refereesId,int articleId){ public void addReferees(List<String> refereesId,int articleId){
for (String refereeId : refereesId) { for (String refereeId : refereesId) {
articleManager.delegateArticleToReferee(articleId, refereeId,memberId); articleManager.delegateArticleToReferee(articleId, refereeId,memberId);
conferenceManager.addRole(RoleType.REFEREE, refereeId, SessionService.getInstance().getCurrentConference().getId()); conferenceManager.addRole(RoleType.REFEREE, refereeId, SessionService.getInstance().getCurrentConference().getId());
@@ -136,7 +150,7 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
logger.debug("add referee to article"); logger.debug("add referee to article");
} }
public void removeReferee(List<String> refereesId,int articleId){ public void removeReferees(List<String> refereesId,int articleId){
for (String refereeId : refereesId) { for (String refereeId : refereesId) {
articleManager.undelegateArticleToReferee(articleId, refereeId, memberId); articleManager.undelegateArticleToReferee(articleId, refereeId, memberId);
User referee = userManager.getUser(refereeId); User referee = userManager.getUser(refereeId);

6
YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java
View File

@@ -126,16 +126,14 @@ public List<PCMemberBean> getMembersWithConflict(int articleId ){
for (String memberId : membersId) { for (String memberId : membersId) {
articleManager.addPreference(articleId, memberId, PreferenceType.CONFLICT); articleManager.addPreference(articleId, memberId, PreferenceType.CONFLICT);
} }
logger.info("add members to article"); logger.info("add members to conflictlist");
} }
public void removeMembers(List<String> membersId,int articleId){ public void removeMembers(List<String> membersId,int articleId){
for (String memberId : membersId) { for (String memberId : membersId) {
articleManager.removePreference(articleId, memberId); articleManager.removePreference(articleId, memberId);
} }
logger.info("remove members to article"); logger.info("remove members to conflictlist");
} }

7
YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java
View File

@@ -47,6 +47,7 @@ public class DispatchArticleController implements Controller{
} }
public void setConferenceManager(IConferenceManager conferenceManager) { public void setConferenceManager(IConferenceManager conferenceManager) {
this.conferenceManager = conferenceManager; this.conferenceManager = conferenceManager;
} }
// FIXME : c'est interdit de faire ca ;) // FIXME : c'est interdit de faire ca ;)
@@ -165,20 +166,18 @@ public List<PCMemberBean> getMembersWithTheArticle(int articleId ){
} }
public List<User> addMembers(List<String> membersId,int articleId){ public void addMembers(List<String> membersId,int articleId){
for (String memberId : membersId) { for (String memberId : membersId) {
articleManager.assignArticleToPCMember(articleId, memberId); articleManager.assignArticleToPCMember(articleId, memberId);
} }
logger.debug("add members to article"); logger.debug("add members to article");
return userManager.getPCMemberForArticle(articleId);
} }
public List<User> removeMembers(List<String> membersId,int articleId){ public void removeMembers(List<String> membersId,int articleId){
for (String memberId : membersId) { for (String memberId : membersId) {
articleManager.unassignArticleToPCMember(articleId, memberId); articleManager.unassignArticleToPCMember(articleId, memberId);
} }
logger.debug("remove members to article"); logger.debug("remove members to article");
return userManager.getPCMemberForArticle(articleId);
} }