From 22512884255f65746d01a449365856cd819f66be Mon Sep 17 00:00:00 2001
From: Frederic Debuire <frederic.debuire@gmail.com>
Date: Sun, 24 Feb 2008 23:17:02 +0000
Subject: [PATCH] Multiple corrections

---
 .../WEB-INF/classes/messages.properties       |  2 +-
 .../WebContent/WEB-INF/jsp/addConference2.jsp |  8 +-
 .../WebContent/WEB-INF/jsp/listConference.jsp | 97 ++++++++++++++-----
 .../WebContent/WEB-INF/jsp/listEvaluation.jsp | 22 +++--
 YACOSWeb/WebContent/WEB-INF/jsp/main.jsp      | 34 ++++++-
 .../WebContent/WEB-INF/jsp/manageArticle.jsp  | 83 +++++++++-------
 .../WEB-INF/jsp/reportConfCreate.jsp          | 45 ++++++++-
 .../WEB-INF/jsp/submissionArticle.jsp         | 16 ++-
 YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp | 63 +++++++-----
 .../controller/ListEvaluationController.java  |  8 ++
 .../PCmember/form/EvaluationArticleBean.java  | 42 +++++---
 .../controller/ArticleDeleteController.java   |  3 +-
 .../controller/ListConferenceController.java  |  4 -
 .../controller/UserBoardController.java       | 46 +++++++--
 .../web/system/form/UserBoardArticleBean.java |  7 ++
 15 files changed, 341 insertions(+), 139 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index bd1a53d..48013b0 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -212,7 +212,7 @@ step=Step ({0}/{1})
 conference.remainingTokens=You have {0} tokens left to create new conferences.<br/>\n You can ask to the admin if you need more.
 conference.help.step1=
 conference.help.step2=This step is used to define some dates like the starting date for the conference.<br/>\nYou just have to click on a field and the calendar will appear.
-conference.help.step3=Here you can add some constraints at your conference like the number of pages by articles or the type of file you want the authors to use.
+conference.help.step3=Here you can add some constraints at your conference like the number of pages by articles (just for indication) or the type of file you want the authors to use.<br/>If you don't select any file types, any file types will be authorized.
 conference.help.step4=This step allows you to add criterion which will be used when someone will evaluate an article.<br/>\nYou can add a new criterion using the form, or simply add an existing criterion using the list.
 conference.help.step5=This step allows you to add PC Member to the conference.<br/>\nYou can add a Program Committee Member using the list below, or invite someone using his email address.
 conference.titleAdd=Add a conference
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
index a178c0f..4f04b42 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
@@ -31,7 +31,7 @@
 				</td>
 				<td><form:input onfocus="ds_sh(this);" path="dateArticle"
 					cssStyle="cursor: text" />
-					<div class="formErrors">
+					<div class="formError">
 						<form:errors path="dateArticle" />
 					</div>
 				</td>
@@ -41,7 +41,7 @@
 				</td>
 				<td><form:input onfocus="ds_sh(this);" path="dateEvaluation"
 					cssStyle="cursor: text" />
-					<div class="formErrors">
+					<div class="formError">
 						<form:errors path="dateEvaluation" />
 					</div>
 				</td>
@@ -51,7 +51,7 @@
 				</td>
 				<td><form:input onfocus="ds_sh(this);" path="dateStart"
 					cssStyle="cursor: text" />
-					<div class="formErrors">
+					<div class="formError">
 						<form:errors path="dateStart" />
 					</div>
 				</td>
@@ -60,7 +60,7 @@
 				<td class="formLabel"><fmt:message key="conference2.end" /></td>
 				<td><form:input onfocus="ds_sh(this);" path="dateEnd"
 					cssStyle="cursor: text" />
-					<div class="formErrors">
+					<div class="formError">
 						<form:errors path="dateEnd" />
 					</div>
 				</td>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
index c5079a3..8ea9139 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
@@ -7,8 +7,15 @@
 
 <script type="text/javascript">
 //<![CDATA[
-	function HideRegistered() {
-		var listElem = $$('.isRegistered');
+	function ShowRegistered() {
+		
+		// faux tt ca
+		var listElem;
+		if ($('ongoing').checked)
+			listElem = $$('.isRegistered', 'confPost');
+		else
+			listElem = $$('.isRegistered');
+			
 		for (var i = 0; i < listElem.length; i++) {
 			if (listElem[i].visible())  	
   				listElem[i].style.display = "none";
@@ -17,8 +24,23 @@
   		}
 	}
 	
-	function HideNotRegistered() {
-		var listElem = $$('.notRegistered');
+	function ShowNotRegistered() {
+		var listElem;
+		if ($('ongoing').checked)
+			listElem = $$('.notRegistered', 'confPost');
+		else
+			listElem = $$('.notRegistered');
+			
+		for (var i = 0; i < listElem.length; i++) {
+			if (listElem[i].visible())  	
+  				listElem[i].style.display = "none";
+  			else
+  				listElem[i].style.display = "";
+  		}
+	}
+	
+	function ShowOngoing() {
+		var listElem = $$('.confPast');
 		for (var i = 0; i < listElem.length; i++) {
 			if (listElem[i].visible())  	
   				listElem[i].style.display = "none";
@@ -66,9 +88,10 @@
 			
 			<table width="100%">
 			<tr>
-				<td width="7%">Hide</td>
-				<td width="93%"><input type="checkbox" name="register" value="Register" onchange="HideRegistered()"> Conference you are registered in<br />
-					<input type="checkbox" name="notregister" value="NotRegister" onchange="HideNotRegistered()"> Conference you are not registered in
+				<td width="7%">Show</td>
+				<td width="93%"><input id="register" type="checkbox" name="register" value="Register" onchange="ShowRegistered()" checked="checked"> Conference you are registered in<br />
+					<input id="notregister" type="checkbox" name="notregister" value="NotRegister" onchange="ShowNotRegistered()" checked="checked"> Conference you are not registered in<br />
+					<input id="ongoing" type="checkbox" name="ongoing" value="Ongoing" onchange="ShowOngoing()"> Only ongoing conferences<br />
 				</td>
 			</tr>
 			</table>
@@ -82,40 +105,66 @@
 				</c:forEach>
 				<c:choose>
 					<c:when test="${varName == 'true'}">
-						<div class="conferenceBloc cbb isRegistered">
+						<c:choose>
+						<c:when test="${conference.currentPhase == 'PAST'}">
+							<div class="conferenceBloc cbb isRegistered confPast">
 							<h2>
 								${conference.title} - In this conference you are:
 								<c:forEach items="${listRole}" var="role">
 								<c:if test="${conference.id == role.conference.id}">
-									${fn:toLowerCase(role.type)}				
+									<span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>				
 								</c:if>
 								</c:forEach>
 							</h2>
 							<b>Description:</b> ${conference.description}<br />
 							<center>
-							<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
+								<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
 							</center>
-						</div>
-					</c:when>
-					<c:otherwise>
-						<div class="conferenceBloc cbb notRegistered">
-							<h2>${conference.title} - You haven't any role in this conference</h2>
+							</div>
+						</c:when>
+						<c:otherwise>
+							<div class="conferenceBloc cbb isRegistered">
+							<h2>
+								${conference.title} - In this conference you are:
+								<c:forEach items="${listRole}" var="role">
+								<c:if test="${conference.id == role.conference.id}">
+									<span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>				
+								</c:if>
+								</c:forEach>
+							</h2>
 							<b>Description:</b> ${conference.description}<br />
 							<center>
-							<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
+								<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
 							</center>
-						</div>
+							</div>
+						</c:otherwise>
+						</c:choose>
+					</c:when>
+					<c:otherwise>
+						<c:choose>
+						<c:when test="${conference.currentPhase == 'PAST'}">
+							<div class="conferenceBloc cbb notRegistered confPast">
+								<h2>${conference.title} - You haven't any role in this conference</h2>
+								<b>Description:</b> ${conference.description}<br />
+								<center>
+									<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
+								</center>
+							</div>
+						</c:when>
+						<c:otherwise>
+							<div class="conferenceBloc cbb notRegistered">
+								<h2>${conference.title} - You haven't any role in this conference</h2>
+								<b>Description:</b> ${conference.description}<br />
+								<center>
+									<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
+								</center>
+							</div>
+						</c:otherwise>
+						</c:choose>
 					</c:otherwise>
 				</c:choose>
 			</c:forEach>
     	</c:otherwise>
 	</c:choose>
-	
-
-	<br />
-
-
-<a href="<c:url value="main.htm"/>">Home</a>
-
 </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
index f96ffa2..52c26dc 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
@@ -6,8 +6,6 @@
 
 <h4 class="title"><fmt:message key="evaluation.choose" /></h4>
 
-
-
 <p class="formHelp">
   <fmt:message key="evaluation.help"/>	
 </p>
@@ -21,19 +19,27 @@
 				</td>
 			</tr>
 			<tr>
-				<!--<td align="left">
-					Topic: <b>${article.article.topic}</b><br/>
-					Abstract: ${article.article.abstractText}
+				<td align="left">
+					<c:choose>
+					<c:when test="${not empty article.referee}">
+						Delegated to:<br />
+						<c:forEach var="referee" items="${article.referee}">
+							${referee.firstName} ${referee.lastName}<br/>
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						&nbsp;
+					</c:otherwise>
+					</c:choose>
 				</td>
-				-->
 				<td align="right">
-        			<c:if test="${article.evaluated == false}">
+        			<c:if test="${article.evaluated == false and empty article.referee}">
         				<c:if test="${article.article.state != 'REJECTED' and  article.article.state != 'ACCEPTED'}">
 							<a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a>
 						</c:if>
         			</c:if>
         
-        			<c:if test="${article.evaluated == true}">
+        			<c:if test="${article.evaluated == true and empty article.referee}">
         				<c:if test="${article.article.state != 'REJECTED' and  article.article.state != 'ACCEPTED'}">
 							<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.article.id}&action=modify"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
 						</c:if>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index e0102ab..db00b2b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -38,7 +38,39 @@
 			<b><fmt:message key="conference.detail.date.end" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEnd }" dateStyle="long" /><br /><br />
 			<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateArticle }" dateStyle="long" /><br />
 			<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEvaluation }" dateStyle="long" /><br />
-		</div><br />
+		</div>
+		<h3 class="descriptionTitle">Submission Informations</h3>
+		<div class="textBox">
+			<c:if test="${currentConference.pageNumber != 0}">
+				The number of pages for an article is about ${currentConference.pageNumber}.<br/><br/>
+			</c:if>
+			
+			The following file's type are allowed:&nbsp;
+			<c:choose>
+			<c:when test="${currentConference.typePDF == true or currentConference.typeLatec == true or currentConference.typeWord == true or currentConference.typeODT == true}">
+				<c:if test="${currentConference.typePDF == true}">
+					.pdf&nbsp;
+				</c:if>
+				<c:if test="${currentConference.typeLatec == true}">
+					.tex&nbsp;
+				</c:if>
+				<c:if test="${currentConference.typeWord == true}">
+					.doc&nbsp;.docx&nbsp;
+				</c:if>
+				<c:if test="${currentConference.typeODT == true}">
+					.odt&nbsp;
+				</c:if>
+			</c:when>
+			<c:otherwise>
+				Any file's type.
+			</c:otherwise>
+			</c:choose>
+			
+			<br /><br />
+			Other informations about the submission: ${currentConference.sendInfo}
+			
+		</div>
+		<br />
 		<center><a href="<c:url value="submissionArticle.htm" />" class="submitLink"><fmt:message key="conference.detail.link.submit" /></a></center>
 	</c:when>
 	
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
index 82abce2..57968d2 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
@@ -9,48 +9,65 @@
 </head>
 <body>
 
-<h4 class="title"><fmt:message key="manageArticle.title" /></h4>
-<br />
-
-<div id="articleList" class="dynamicFredList">
-<c:forEach var="article" items="${listArticle}" varStatus="i">
-
-	<div id="articleLine${i.index}" align="center" class="articleLine">${article.title}</div>
-	
-	<div id="articleDetails${i.index}" style="display: none;">
-	<table width="100%">
-		<tbody>
-			<tr>
-				<td width="50%" align="center">
-				<ul>
+<h4 class="title"><fmt:message key="manageArticle.title" /></h4>
+
+<c:if test="${param['delete'] eq 'ok'}">
+	<p class="formOk">
+		Your article has been successfully deleted.<br/>
+	</p>
+</c:if>
+
+<c:choose>
+<c:when test="${empty listArticle}">
+	<div class="warningBox">
+		You have no article at the moment.<br />
+		You can submit an article in clicking 
+		<a href="submissionArticle.htm">here</a>
+		or using the item menu.<br />
+	</div>
+</c:when>
+<c:otherwise>
+	<div id="articleList" class="dynamicFredList">
+	<c:forEach var="article" items="${listArticle}" varStatus="i">
+
+	<div id="articleLine${i.index}" align="center" class="articleLine">${article.title}</div>
+	
+	<div id="articleDetails${i.index}" style="display: none;">
+	<table width="100%">
+		<tbody>
+			<tr>
+				<td width="50%" align="center">
+				<ul>
 					<li>Secondary Authors:
-						<ul>
-						<c:forEach var="sAuthor" items="${article.secondaryAuthors}">
-							<li><b>${sAuthor}</b></li>						
+						<ul>
+						<c:forEach var="sAuthor" items="${article.secondaryAuthors}">
+							<li><b>${sAuthor}</b></li>						
 						</c:forEach>
-						</ul>						
-					</li>
-					<li>Topic: <b>${article.topic}</b></li>
-				</ul>
+						</ul>						
+					</li>
+					<li>Topic: <b>${article.topic}</b></li>
+				</ul>
 				</td>
 				<td width="50%" align="center">
 					${article.abstractText}
 				</td>
 			</tr>
-			<tr>
+			<tr>
 				<td colspan="2" align="center">
-				<a class="manage_link" id="articleURL${i.index}" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img src="./images/cc-download_manager-32x32.png" alt="Download" /></a>
-				<a class="manage_link" id="modifyArticle${i.index}" title="Modify" href="<c:url value="/submissionArticle.htm"><c:param name="action" value="modify"/><c:param name="articleID" value="${article.id}"/></c:url>">Modify<img src="./images/cc-kedit-32x32.png" alt="Modify" /></a>
+				<a class="manage_link" id="articleURL${i.index}" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img src="./images/cc-download_manager-32x32.png" alt="Download" /></a>
+				<a class="manage_link" id="modifyArticle${i.index}" title="Modify" href="<c:url value="/submissionArticle.htm"><c:param name="action" value="modify"/><c:param name="articleID" value="${article.id}"/></c:url>">Modify<img src="./images/cc-kedit-32x32.png" alt="Modify" /></a>
 				<a class="manage_link" id="suppressArticle${i.index}" title="Delete" href="javascript:deleteArticle(${article.id});">Delete<img src="./images/cc-button_cancel-32x32.png" alt="Delete"/></a>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-	</div>
-	
-	
-</c:forEach>
-</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	</div>
+	
+	</c:forEach>
+	</div>
+</c:otherwise>
+
+</c:choose>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
index 8acad5c..bfcc12b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
@@ -37,22 +37,57 @@
 			<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateArticle }" dateStyle="long" /><br />
 			<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEvaluation }" dateStyle="long" /><br />
 		</div>
+		
+		<h3 class="dateTitle">Submission Informations</h3>
+		<div class="textBox">
+			<c:if test="${conferenceReport.pageNumber == 0}">
+				The number of pages for an article is undefined.<br/><br/>
+			</c:if>
+			<c:if test="${conferenceReport.pageNumber != 0}">
+				The number of pages for an article is about ${conferenceReport.pageNumber}.<br/><br/>
+			</c:if>
+			
+			The following file's type are allowed:&nbsp;
+			<c:choose>
+			<c:when test="${conferenceReport.typePDF == true or conferenceReport.typeLatec == true or conferenceReport.typeWord == true or conferenceReport.typeODT == true}">
+				<c:if test="${conferenceReport.typePDF == true}">
+					.pdf&nbsp;
+				</c:if>
+				<c:if test="${conferenceReport.typeLatec == true}">
+					.tex&nbsp;
+				</c:if>
+				<c:if test="${conferenceReport.typeWord == true}">
+					.doc&nbsp;.docx&nbsp;
+				</c:if>
+				<c:if test="${conferenceReport.typeODT == true}">
+					.odt&nbsp;
+				</c:if>
+			</c:when>
+			<c:otherwise>
+				Any file's type.
+			</c:otherwise>
+			</c:choose>
+			
+			<br /><br />
+			Other informations about the submission: ${conferenceReport.sendInfo}
+			
+		</div>
 
-		<h3 class="descriptionTitle"></h3>
+		<h3 class="descriptionTitle">Criterion</h3>
 		<div class="textBox">
 		<c:if test="${not empty criterionReport}">
-			<b>Criterion's list </b><br />
+			<b>Criterion's list: </b><br />
 		</c:if>
 		<c:forEach items="${criterionReport}" var="crit">
-			${crit.name} From ${crit.min_rating} to ${crit.max_rating}<br />
+			${crit.name} From <b>${crit.min_rating}</b> to <b>${crit.max_rating}</b><br />
 		</c:forEach>
 		</div>
 		
-		<h3 class="descriptionTitle"></h3>
+		<h3 class="descriptionTitle">User</h3>
 		<div class="textBox">
 		<b>Chairman:</b> ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}<br /><br />
 		<c:if test="${not empty userReport}">
-			<b>PCmember's list </b><br />
+			<b>PCmember's list: </b><br />
 		</c:if>
 		<c:forEach items="${userReport}" var="user">
 			${user.firstName} ${user.lastName}<br />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index 3ac9077..fb46b9d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -38,17 +38,17 @@
 	<span class="info"><fmt:message key="form.field.necessary" /></span>
 	<div>
 		<form:label path="title"><fmt:message key="form.submission.article.title" /></form:label>
-		<form:input path="title"/>*
+		* <form:input path="title"/>
 		<span class="formError"><form:errors path="title" /></span>
 	</div>
 	<div>
 		<form:label path="theme"><fmt:message key="form.submission.article.theme" /></form:label>
-		<form:input path="theme"/>*
+		* <form:input path="theme"/>
 		<span class="formError"><form:errors path="theme" /></span>
 	</div>
 	<div>
 		<form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label>
-		<form:textarea path="abstractText" cols="60" rows="10" />*<br />
+		* <form:textarea path="abstractText" cols="60" rows="10" />
 		<span class="formError"><form:errors path="abstractText" /></span>
 	</div>
 </fieldset>
@@ -82,9 +82,15 @@
 <p class="legend"><fmt:message key="form.article.submit.info" /></p>
 
 <fieldset>
-	<div>
+	<div>
+		<c:if test="${currentConference.pageNumber != 0}">
+			<p class="formHelp">
+  				Remember that the page's number of an article should be about ${currentConference.pageNumber}.
+			</p>
+		</c:if>
+	
 		<form:label path="file"><fmt:message key="form.article.file" /></form:label>
-		<input type="file" name="file" />*
+		* <input type="file" name="file" />
 		<span class="formError"><form:errors path="file" /></span>
 	</div>
 </fieldset>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp
index 5707c87..9fbe944 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp
@@ -76,6 +76,16 @@ function showArticleReferee() {
 	<a name="listConf"></a> 
 	<h3 class="descriptionTitle">Generals informations</h3>
 	<div class="textBox">
+		<c:choose>
+		<c:when test="${numberCreationTokens != 0}">
+			You can create <b>${numberCreationTokens}</b> conference(s). Click 
+			<a href="addConference.htm">here</a> to create one now.<br /><br />
+		</c:when>
+		<c:otherwise>
+			You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.<br /><br />
+		</c:otherwise>
+		</c:choose>
+	
 		You currently follow <b>${numberConference}</b> conference(s)<br /><br />
 		
 		<c:if test="${not empty listConfForUser}">
@@ -129,7 +139,7 @@ function showArticleReferee() {
 		<a name="listArticleAuthor"></a> 
 		You have posted <b>${numberArticle}</b> article(s).<br /><br />
 		
-		<c:if test="${not empty listConfForUser}">
+		<c:if test="${not empty listAllArticle}">
 			If you want to see the list of articles you have submitted, click <a href="#listArticleAuthor" onclick="showArticleAll();">here</a>.
 			
 			
@@ -197,7 +207,9 @@ function showArticleReferee() {
 		</c:if>
 		
 		<a name="listArticleReferee"></a> 
-		You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br /><br />
+		You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br />
+		You have evaluated <b>${numberEvaluatedReferee}</b> article(s)<br />
+		You have to evaluate <b>${numberNotEvaluatedReferee}</b> article(s)<br /><br />
 		
 		<c:if test="${not empty listArticleReferee}">
 			If you want to see the list of articles you have in your evaluation list, click <a href="#listArticleReferee" onclick="showArticleReferee();">here</a>.
@@ -210,12 +222,16 @@ function showArticleReferee() {
 							<tr>
 								<td align="center" width="25%">${article.title}</td>
 								<td align="center" width="25%">
-									<c:if test="${article.state == 'SUBMITED'}">
-										To evaluate
-									</c:if>
-									<c:if test="${article.state == 'EVALUATED'}">
-										Evaluated
-									</c:if>
+									<c:if test="${article.evaluated == false}">
+        								<c:if test="${article.state != 'REJECTED' and  article.state != 'ACCEPTED'}">
+											To evaluate
+										</c:if>
+        							</c:if>
+									<c:if test="${article.evaluated == true}">
+        								<c:if test="${article.state != 'REJECTED' and  article.state != 'ACCEPTED'}">
+											Evaluated
+										</c:if>
+        							</c:if>
 									<c:if test="${article.state == 'REJECTED'}">
 										Rejected
 									</c:if>
@@ -268,7 +284,9 @@ function showArticleReferee() {
 		
 		
 		<a name="listArticlePcMember"></a> 
-		You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br /><br />
+		You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br />
+		You have evaluated <b>${numberEvaluatedPCMember}</b> article(s)<br />
+		You have to evaluate <b>${numberNotEvaluatedPCMember}</b> article(s)<br /><br />
 		
 		<c:if test="${not empty listArticlePCMember}">
 			If you want to see the list of articles you have in your evaluation list, click <a href="#listArticlePcMember" onclick="showArticlePcMember();">here</a>.
@@ -289,12 +307,16 @@ function showArticleReferee() {
 									</c:forEach>
 								</c:when>
 								<c:otherwise>
-									<c:if test="${article.state == 'SUBMITED'}">
-										To evaluate
-									</c:if>
-									<c:if test="${article.state == 'EVALUATED'}">
-										Evaluated
-									</c:if>
+									<c:if test="${article.evaluated == false}">
+        								<c:if test="${article.state != 'REJECTED' and  article.state != 'ACCEPTED'}">
+											To evaluate
+										</c:if>
+        							</c:if>
+									<c:if test="${article.evaluated == true}">
+        								<c:if test="${article.state != 'REJECTED' and  article.state != 'ACCEPTED'}">
+											Evaluated
+										</c:if>
+        							</c:if>
 									<c:if test="${article.state == 'REJECTED'}">
 										Rejected
 									</c:if>
@@ -324,19 +346,8 @@ function showArticleReferee() {
 	<div class="textBox">
 		You are Chairman in <b>${numberChairman}</b> conference(s)<br /><br />
 		
-		<c:choose>
-		<c:when test="${numberCreationTokens} != 0">
-			You can create <b>${numberCreationTokens}</b> conference(s). Click 
-			<a href="addConference.htm">here</a> to create one now.
-		</c:when>
-		<c:otherwise>
-			You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.
-		</c:otherwise>
-		</c:choose>
-		
 		<a name="listConfChairman"></a> 
 		<c:if test="${not empty listConfForUser}">
-		<br /><br />
 			If you want to see the list of conferences you are registered in, click <a href="#listConfChairman" onclick="showConfChairman();">here</a>.
 			
 			
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java
index e5f7a1b..838c653 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java
@@ -18,6 +18,7 @@ import org.yacos.core.conferences.Conference;
 import org.yacos.core.evaluation.IEvaluationManager;
 import org.yacos.core.evaluation.Report;
 import org.yacos.core.users.IUserManager;
+import org.yacos.core.users.User;
 import org.yacos.core.users.Role.RoleType;
 import org.yacos.web.PCmember.form.EvaluationArticleBean;
 import org.yacos.web.system.controller.NoConferenceSelectedException;
@@ -86,6 +87,13 @@ public class ListEvaluationController extends SimpleFormController {
 					else {
 						eab.setEvaluated(true);
 					}
+					
+					List<User> referee = userManager.getRefereesOfPcMemberForArticle(SessionService.getInstance().getCurrentUserLogin(), a.getId());
+		        	if (referee != null)
+		        		eab.setReferee(referee);
+		        	else
+		        		eab.setReferee(null);
+					
 					listArticleBean.add(eab);
 
 				}
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/EvaluationArticleBean.java b/YACOSWeb/src/org/yacos/web/PCmember/form/EvaluationArticleBean.java
index b167b8c..fd32e68 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/form/EvaluationArticleBean.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/form/EvaluationArticleBean.java
@@ -1,23 +1,33 @@
 package org.yacos.web.PCmember.form;
 
+import java.util.List;
+
 import org.yacos.core.article.Article;
+import org.yacos.core.users.User;
 
 public class EvaluationArticleBean {
-	
-  private Article article;
-  private boolean evaluated;
-  
-public Article getArticle() {
-	return article;
-}
-public void setArticle(Article article) {
-	this.article = article;
-}
-public boolean isEvaluated() {
-	return evaluated;
-}
-public void setEvaluated(boolean evaluated) {
-	this.evaluated = evaluated;
-}
+
+	private Article article;
+	private boolean evaluated;
+	private List<User> referee;
+
+	public List<User> getReferee() {
+		return referee;
+	}
+	public void setReferee(List<User> referee) {
+		this.referee = referee;
+	}
+	public Article getArticle() {
+		return article;
+	}
+	public void setArticle(Article article) {
+		this.article = article;
+	}
+	public boolean isEvaluated() {
+		return evaluated;
+	}
+	public void setEvaluated(boolean evaluated) {
+		this.evaluated = evaluated;
+	}
 
 }
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
index 5c6c6c1..393a787 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
@@ -35,13 +35,12 @@ public class ArticleDeleteController implements Controller {
 
 			articleManager.removeArticle(articleId);
 
-
 		} 
 		catch(NumberFormatException e) {
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 		}
 
-		return new ModelAndView(new RedirectView("manageArticle.htm"));
+		return new ModelAndView(new RedirectView("manageArticle.htm?delete=ok"));
 	}
 
 }
\ No newline at end of file
diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java
index 6aabf47..8c22f8f 100644
--- a/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java
+++ b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java
@@ -1,12 +1,9 @@
 package org.yacos.web.system.controller;
 
-
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.servlet.ModelAndView;
@@ -65,7 +62,6 @@ public class ListConferenceController implements Controller{
 			model.put("ac", msgAccount);
 		}
 
-
 		return new ModelAndView("listConference", model);
 	}
 }
diff --git a/YACOSWeb/src/org/yacos/web/system/controller/UserBoardController.java b/YACOSWeb/src/org/yacos/web/system/controller/UserBoardController.java
index bf89814..05b4fda 100644
--- a/YACOSWeb/src/org/yacos/web/system/controller/UserBoardController.java
+++ b/YACOSWeb/src/org/yacos/web/system/controller/UserBoardController.java
@@ -15,9 +15,11 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import org.yacos.core.article.Article;
 import org.yacos.core.article.IArticleManager;
+import org.yacos.core.article.Article.State;
 import org.yacos.core.conferences.Conference;
 import org.yacos.core.conferences.IConferenceManager;
 import org.yacos.core.evaluation.IEvaluationManager;
+import org.yacos.core.evaluation.Report;
 import org.yacos.core.users.IUserManager;
 import org.yacos.core.users.Role;
 import org.yacos.core.users.User;
@@ -119,15 +121,6 @@ public class UserBoardController extends SimpleFormController {
         	listAllArticleBean.add(ab);
         }
         	
-        
-        
-        //Map<Integer, Object> listConfForArticle = new HashMap<Integer, Object>();
-        /*List<Conference> listConfForArticle = new ArrayList<Conference>();
-        for (Article a : listAllArticle) {
-        	listConfForArticle.add(articleManager.getConferenceForArticle(a.getId()));
-        }
-        
-        model.put("listConfForArticle", listConfForArticle);*/
         model.put("numberArticle", numberArticle);
         model.put("listAllArticle", listAllArticleBean);
         
@@ -144,6 +137,9 @@ public class UserBoardController extends SimpleFormController {
         List<UserBoardArticleBean> listArticleRefereeBean = new ArrayList<UserBoardArticleBean>();
         List<Conference> listConfPCMember = new ArrayList<Conference>();
         
+        Integer numberEvaluatedPCMember = 0;
+        Integer numberNotEvaluatedPCMember = 0;
+        
         for (Conference c : listConfForUser) {
         	if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, c.getId()))
         		listConfPCMember.add(c);
@@ -154,7 +150,7 @@ public class UserBoardController extends SimpleFormController {
         }
         
         for (Article a : listArticlePCMember) {
-        	UserBoardArticleBean ab = new UserBoardArticleBean();
+        	UserBoardArticleBean ab = new UserBoardArticleBean();        	
         	ab.setAbstractText(a.getAbstractText());
         	ab.setTitle(a.getTitle());
         	ab.setTopic(a.getTopic());
@@ -168,13 +164,39 @@ public class UserBoardController extends SimpleFormController {
         		ab.setReferee(referee);
         	else
         		ab.setReferee(null);
+        	
+        	Report rpt = evaluationManager.getReportforArticleAndReferee(a.getId(), SessionService.getInstance().getCurrentUserLogin());
+			if (rpt == null) {
+				ab.setEvaluated(false);
+				if (! a.getState().equals(State.ACCEPTED) && ! a.getState().equals(State.REJECTED))
+					numberNotEvaluatedPCMember++;
+			}
+			else {
+				ab.setEvaluated(true);
+				numberEvaluatedPCMember++;
+			}
         	listArticlePCMemberBean.add(ab);
         }
         
         listArticleReferee = articleManager.getArticlesOfReferee(SessionService.getInstance().getCurrentUserLogin());
         
+        Integer numberEvaluatedReferee = 0;
+        Integer numberNotEvaluatedReferee = 0;
+        
         for (Article a : listArticleReferee) {
         	UserBoardArticleBean ab = new UserBoardArticleBean();
+        	
+        	Report rpt = evaluationManager.getReportforArticleAndReferee(a.getId(), SessionService.getInstance().getCurrentUserLogin());
+			if (rpt == null) {
+				ab.setEvaluated(false);
+				if (! a.getState().equals(State.ACCEPTED) && ! a.getState().equals(State.REJECTED))
+					numberNotEvaluatedReferee++;
+			}
+			else {
+				ab.setEvaluated(true);
+				numberEvaluatedReferee++;
+			}
+        	
         	ab.setAbstractText(a.getAbstractText());
         	ab.setTitle(a.getTitle());
         	ab.setTopic(a.getTopic());
@@ -186,6 +208,10 @@ public class UserBoardController extends SimpleFormController {
         	listArticleRefereeBean.add(ab);
         }        
         
+        model.put("numberEvaluatedReferee", numberEvaluatedReferee);
+        model.put("numberNotEvaluatedReferee", numberNotEvaluatedReferee);
+        model.put("numberEvaluatedPCMember", numberEvaluatedPCMember);
+        model.put("numberNotEvaluatedPCMember", numberNotEvaluatedPCMember);
         model.put("listArticlePCMember", listArticlePCMemberBean);
         model.put("numberArticlePCMember", listArticlePCMember.size());     
         model.put("listArticleReferee", listArticleRefereeBean);
diff --git a/YACOSWeb/src/org/yacos/web/system/form/UserBoardArticleBean.java b/YACOSWeb/src/org/yacos/web/system/form/UserBoardArticleBean.java
index 527db03..93cbbe8 100644
--- a/YACOSWeb/src/org/yacos/web/system/form/UserBoardArticleBean.java
+++ b/YACOSWeb/src/org/yacos/web/system/form/UserBoardArticleBean.java
@@ -22,6 +22,7 @@ public class UserBoardArticleBean {
 	private List<User> referee;
 	private List<Preference> preferences;
 	private List<Report> report;
+	private boolean evaluated;
 	
 	private State state;
 	
@@ -103,4 +104,10 @@ public class UserBoardArticleBean {
 	public void setReferee(List<User> referee) {
 		this.referee = referee;
 	}
+	public boolean isEvaluated() {
+		return evaluated;
+	}
+	public void setEvaluated(boolean evaluated) {
+		this.evaluated = evaluated;
+	}
 }