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 12:53:31 +00:00
parent 9a6b799ef1
commit 7bdf106977
6 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@
removeAll(selectedArticleId); removeAll(selectedArticleId);
$('title'+selectedArticleId).removeClassName('selected'); $('title'+selectedArticleId).removeClassName('selected');
new Effect.SlideUp('dispatcher'+selectedArticleId); new Effect.SlideUp('dispatcher'+selectedArticleId);
//$('dispatcher'+selectedArticleId).hide();
} }
selectedArticleId = articleId; selectedArticleId = articleId;
$(divTitle).addClassName('selected'); $(divTitle).addClassName('selected');
@@ -31,47 +31,37 @@
}else{ }else{
removeAll(articleId); removeAll(articleId);
//$('dispatcher'+articleId).remove();
new Effect.SlideUp('dispatcher'+articleId); new Effect.SlideUp('dispatcher'+articleId);
//$('dispatcher'+articleId).hide();
$(divTitle).removeClassName('selected'); $(divTitle).removeClassName('selected');
selectedArticleId = null; selectedArticleId = null;
//, {afterFinish:function(){$('dispatcher').remove();}});
// $('dispatcherPattern').innerHTML = pattern;
} }
} }
function initDispatcher(elementId){ 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 //listes
//DispatchArticlesJS.sayHello(articleId,retour);
DispatchArticlesJS.getMembersWithoutTheArticle(articleId,fillListMembers); DispatchArticlesJS.getMembersWithoutTheArticle(articleId,fillListMembers);
DispatchArticlesJS.getMembersWithTheArticle(articleId,fillListArticleMembers); 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){ function fillListArticleMembers(data){
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var member = data[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 var value= member.firstName+" "+member.lastName +' nb articles:' + member.nbArticles
+ " preferences:"+ member.preference; + " pref: "+ pref;
var elem = new Element('div', var elem = new Element('div',
{'class':'dynamicListItem','id':member.login, {'class':'dynamicListItem','id':member.login,
"style":"border:1px"}).update(value); "style":"border:1px"}).update(value);
@@ -85,8 +75,18 @@
function fillListMembers(data){ function fillListMembers(data){
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var member = data[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>";
}
if (member.preference=="INDIFFERENT"){
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
+ " preferences:"+ member.preference; + " pref: "+ pref;
var elem = new Element('div', var elem = new Element('div',
{'class':'dynamicListItem','id':member.login, {'class':'dynamicListItem','id':member.login,
"style":"border:1px"}).update(value); "style":"border:1px"}).update(value);
@@ -110,7 +110,6 @@
function removeRemote() { function removeRemote() {
var itemsToRemove = $('membersList'+articleId).select('div.selected'); var itemsToRemove = $('membersList'+articleId).select('div.selected');
var membersId = itemsToRemove.pluck('id'); var membersId = itemsToRemove.pluck('id');
//var articleId = $('articleId').value;
DispatchArticlesJS.removeMembers(membersId, articleId, remove); DispatchArticlesJS.removeMembers(membersId, articleId, remove);
} }
@@ -132,7 +131,6 @@
function addRemote(){ function addRemote(){
var itemsToAdd = $('membersList'+articleId).select('div.selected'); var itemsToAdd = $('membersList'+articleId).select('div.selected');
var membersId = itemsToAdd.pluck('id'); var membersId = itemsToAdd.pluck('id');
//var articleId = $('articleId').value;
DispatchArticlesJS.addMembers(membersId, articleId, add()); DispatchArticlesJS.addMembers(membersId, articleId, add());
} }

3
YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
View File

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

9
YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
View File

@@ -4,11 +4,18 @@
<head></head> <head></head>
<body> <body>
<c:choose>
<c:choose>
<c:when test="${currentConferenceId != null}"> <c:when test="${currentConferenceId != null}">
<!-- Main page for current conference --> <!-- Main page for current conference -->
<h4 class="title">${currentConference.title}</h4> <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> <center><h1 class="maintitle">${currentConference.title}</h1></center>
<h3 class="descriptionTitle"><fmt:message key="conference.detail.description" /></h3> <h3 class="descriptionTitle"><fmt:message key="conference.detail.description" /></h3>
<div class="textBox"> <div class="textBox">

BIN
YACOSWeb/WebContent/images/Thumbs.db Normal file
View File

Binary file not shown.

4
YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java
View File

@@ -2,6 +2,7 @@ package org.yacos.web.PCmember.controller;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -48,6 +49,9 @@ public class ListEvaluationController extends SimpleFormController {
logger.info("Returning the article's list to evaluate view"); logger.info("Returning the article's list to evaluate view");
Conference conf = SessionService.getInstance().getCurrentConference(); Conference conf = SessionService.getInstance().getCurrentConference();
if(conf.getDateEvaluation().before(new Date())){
return new ModelAndView("main","end","evaluation");
}
List<Article> listArticle = new ArrayList<Article>(); List<Article> listArticle = new ArrayList<Article>();
String person = request.getParameter("role"); String person = request.getParameter("role");

10
YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
View File

@@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -39,6 +40,7 @@ public class SArticleController extends SimpleFormController {
// Fetching conference // Fetching conference
Conference conf = SessionService.getInstance().getCurrentConference(); Conference conf = SessionService.getInstance().getCurrentConference();
// Fetching user // Fetching user
User user = SessionService.getInstance().getCurrentUser(); User user = SessionService.getInstance().getCurrentUser();
@@ -264,6 +266,14 @@ public class SArticleController extends SimpleFormController {
protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException {
String action = request.getParameter("action"); 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("")) if (action == null || action.equals(""))
{ {
FormSubmission myArticle = new FormSubmission(); FormSubmission myArticle = new FormSubmission();