diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp index c57b96f..dc7eb59 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp @@ -23,7 +23,7 @@ removeAll(selectedArticleId); $('title'+selectedArticleId).removeClassName('selected'); new Effect.SlideUp('dispatcher'+selectedArticleId); - //$('dispatcher'+selectedArticleId).hide(); + } selectedArticleId = articleId; $(divTitle).addClassName('selected'); @@ -31,47 +31,37 @@ }else{ removeAll(articleId); - //$('dispatcher'+articleId).remove(); new Effect.SlideUp('dispatcher'+articleId); - //$('dispatcher'+articleId).hide(); $(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); + DispatchArticlesJS.getMembersWithoutTheArticle(articleId,fillListMembers); DispatchArticlesJS.getMembersWithTheArticle(articleId,fillListArticleMembers); - - 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 fillListArticleMembers(data){ for (var i = 0; i < data.length; i++) { var member = data[i]; + var pref; + if (member.preference=="LIKE"){ + pref = "LIKE"; + } + if (member.preference=="DISLIKE"){ + pref = "DISLIKE"; + }else { + pref = "INDIFFERENT"; + } var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles - + " preferences:"+ member.preference; + + " pref: "+ pref; var elem = new Element('div', {'class':'dynamicListItem','id':member.login, "style":"border:1px"}).update(value); @@ -85,8 +75,18 @@ function fillListMembers(data){ for (var i = 0; i < data.length; i++) { var member = data[i]; - var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles - + " preferences:"+ member.preference; + var pref; + if (member.preference=="LIKE"){ + pref = "LIKE"; + } + if (member.preference=="DISLIKE"){ + pref = "DISLIKE"; + } + if (member.preference=="INDIFFERENT"){ + pref = "INDIFFERENT"; + } + var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles + + " pref: "+ pref; var elem = new Element('div', {'class':'dynamicListItem','id':member.login, "style":"border:1px"}).update(value); @@ -110,7 +110,6 @@ function removeRemote() { var itemsToRemove = $('membersList'+articleId).select('div.selected'); var membersId = itemsToRemove.pluck('id'); - //var articleId = $('articleId').value; DispatchArticlesJS.removeMembers(membersId, articleId, remove); } @@ -132,7 +131,6 @@ function addRemote(){ var itemsToAdd = $('membersList'+articleId).select('div.selected'); var membersId = itemsToAdd.pluck('id'); - //var articleId = $('articleId').value; DispatchArticlesJS.addMembers(membersId, articleId, add()); } diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp index 0617d37..1f416a1 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp @@ -6,9 +6,10 @@

+ +

- - +

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index 3b5e9b8..4376366 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -2,13 +2,20 @@ - + + -

${currentConference.title}

+ + +
+ Sorry, the ${end} period is over ! +
+
+

${currentConference.title}

diff --git a/YACOSWeb/WebContent/images/Thumbs.db b/YACOSWeb/WebContent/images/Thumbs.db new file mode 100644 index 0000000..33c1257 Binary files /dev/null and b/YACOSWeb/WebContent/images/Thumbs.db differ diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java index 2929206..4f816c4 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java @@ -2,6 +2,7 @@ package org.yacos.web.PCmember.controller; import java.io.IOException; import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -48,6 +49,9 @@ public class ListEvaluationController extends SimpleFormController { logger.info("Returning the article's list to evaluate view"); Conference conf = SessionService.getInstance().getCurrentConference(); + if(conf.getDateEvaluation().before(new Date())){ + return new ModelAndView("main","end","evaluation"); + } List
listArticle = new ArrayList
(); String person = request.getParameter("role"); diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 00389c9..3c1e4e8 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Date; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -39,6 +40,7 @@ public class SArticleController extends SimpleFormController { // Fetching conference Conference conf = SessionService.getInstance().getCurrentConference(); + // Fetching user User user = SessionService.getInstance().getCurrentUser(); @@ -264,6 +266,14 @@ public class SArticleController extends SimpleFormController { protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { String action = request.getParameter("action"); + + // date verification + Conference conf = SessionService.getInstance().getCurrentConference(); + if(conf.getDateArticle().before(new Date())){ + throw new ModelAndViewDefiningException(new ModelAndView("main","end","submission")); + } + + if (action == null || action.equals("")) { FormSubmission myArticle = new FormSubmission();