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);	
-		new Effect.SlideDown('dispatcher'+articleId);
-		//$('dispatcher'+articleId).show();					
-		//buttons
-		//$('addButton').observe("click",addRemote());
-		//$('removeButton').observe("click",removeRemote());	
-		//$('dispatcherPattern').innerHTML = pattern;	
 	}
 	
 	function fillListArticleMembers(data){
 		
 		for (var i = 0; i < data.length; i++) {  	
   			var member = data[i];
+  			var pref;
+  			if (member.preference=="LIKE"){
+  				pref = "<span style='color:green;font-weight:bold'>LIKE</span>";
+  			}
+  			if (member.preference=="DISLIKE"){
+  				pref = "<span style='color:red;font-weight:bold'>DISLIKE</span>";
+  			}else { 
+  				pref = "<span style='font-weight:bold'>INDIFFERENT</span>";
+  			}
   			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  
+  			var pref;
-  					+ " preferences:"+ member.preference;
+  			if (member.preference=="LIKE"){
+  				pref = "<span style='color:green;font-weight:bold'>LIKE</span>";
+  			}
+  			if (member.preference=="DISLIKE"){
+  				pref = "<span style='color:red;font-weight:bold'>DISLIKE</span>";
+  			}
+  			if (member.preference=="INDIFFERENT"){ 
+  				pref = "<span style='font-weight:bold'>INDIFFERENT</span>";
+  			}
+  			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());
 
 	}

YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp

@@ -6,9 +6,10 @@
 
 <h4 class="title"><fmt:message key="evaluation.choose" /></h4>
 
+
+
 <p class="formHelp">
-  <fmt:message key="evaluation.help"/>
+  <fmt:message key="evaluation.help"/>	
-	
 </p>
 
 <c:forEach items="${listArticle}" var="article">

YACOSWeb/WebContent/WEB-INF/jsp/main.jsp

@@ -2,13 +2,20 @@
 
 <html>
 <head></head>
-<body>
+<body>
+
 
 <c:choose>
-
 	<c:when test="${currentConferenceId != null}">
 		<!--  Main page for current conference -->
 		<h4 class="title">${currentConference.title}</h4>
+
+			<c:if test="${end != null}">
+			<div class="warningBox">
+					Sorry, the ${end} period is over !
+			</div>
+			</c:if>
+
 		<center><h1 class="maintitle">${currentConference.title}</h1></center>
 		<h3 class="descriptionTitle"><fmt:message key="conference.detail.description" /></h3>
 		<div class="textBox">

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<Article> listArticle = new ArrayList<Article>();
 		
 		String person = request.getParameter("role");

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();