diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp index 90384a3..8dde589 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp @@ -22,8 +22,7 @@ if(selectedArticleId != null){ removeAll(selectedArticleId); $('title'+selectedArticleId).removeClassName('selected'); - //new Effect.SlideUp('dispatcher'+selectedArticleId); - $('dispatcher'+selectedArticleId).hide(); + new Effect.SlideUp('dispatcher'+selectedArticleId); } selectedArticleId = articleId; $(divTitle).addClassName('selected'); @@ -31,39 +30,20 @@ }else{ removeAll(articleId); - //$('dispatcher'+articleId).remove(); - //new Effect.SlideUp('dispatcher'+articleId); - $('dispatcher'+articleId).hide(); + new Effect.SlideUp('dispatcher'+articleId); $(divTitle).removeClassName('selected'); selectedArticleId = null; - //, {afterFinish:function(){$('dispatcher').remove();}}); - // $('dispatcherPattern').innerHTML = pattern; } } function initDispatcher(elementId){ - //container - //var pattern = $('dispatcherPattern').innerHTML - - //$('dispatcherPattern').innerHTML = ""; - //var elem = new Element('div', - //{'class':'dynamicListItem', - //'id':"dispatcher"}).update(pattern); - - //$(elementId).insert(elem); //listes - //DispatchArticlesJS.sayHello(articleId,retour); + DelegateArticlesJS.getRefereesWithoutTheArticle(articleId,fillListReferee); DelegateArticlesJS.getRefereesWithTheArticle(articleId,fillListArticleReferee); - - //new Effect.SlideDown('dispatcher'+articleId); - $('dispatcher'+articleId).show(); - //buttons - //$('addButton').observe("click",addRemote()); - //$('removeButton').observe("click",removeRemote()); - //$('dispatcherPattern').innerHTML = pattern; + new Effect.SlideDown('dispatcher'+articleId); } function retour(data){ @@ -111,9 +91,17 @@ function removeRemote() { var itemsToRemove = $('refereesList'+articleId).select('div.selected'); +<<<<<<< .mine + var refereesId = itemsToRemove.pluck('id'); +======= var refereeId = itemsToRemove.pluck('id'); +>>>>>>> .r446 //var articleId = $('articleId').value; +<<<<<<< .mine + DelegateArticlesJS.removeReferees(refereesId, articleId, remove); +======= DelegateArticlesJS.removeReferee(refereeId, articleId, remove); +>>>>>>> .r446 } function remove() { @@ -133,10 +121,14 @@ function addRemote(){ var itemsToAdd = $('refereesList'+articleId).select('div.selected'); - var refereeId = itemsToAdd.pluck('id'); + var refereesId = itemsToAdd.pluck('id'); //var articleId = $('articleId').value; +<<<<<<< .mine + DelegateArticlesJS.addReferees(refereesId, articleId, add()); +======= DelegateArticlesJS.addReferee(refereeId, articleId, add()); +>>>>>>> .r446 } function add() { @@ -191,7 +183,7 @@ -