Modification de trop de choses pr tt dire ici...

This commit is contained in:
Frederic Debuire
2008-02-23 16:42:03 +00:00
parent 25c6db06a2
commit a4fe4842df
14 changed files with 408 additions and 251 deletions

View File

@@ -242,7 +242,7 @@ conference.error.noTokenLeft=You have no conference creation token left !\nPleas
evaluation.title=You are evaluating
evaluation.commentPCMember=Comment of PC Member
evaluation.commentAuthor=Comment of author
evaluation.headPage=Here is a report of the evaluation
evaluation.headPage=Report of the evaluation
evaluation.titleArticle=The title of article is
evaluation.note=The note for the criterion
evaluation.thisArticle=evaluate this article

View File

@@ -36,7 +36,7 @@
<ul>
<li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="menu.pcmember.article.preference" /></a></li>
<li><a href="<c:url value="delegateArticle.htm"/>"><fmt:message key="menu.pcmember.article.delegate" /></a></li>
<li><a href="<c:url value="#"/>"><fmt:message key="menu.pcmember.article.evaluation" /></a></li>
<li><a href="<c:url value="listEvaluation.htm?role=pcmember"/>"><fmt:message key="menu.pcmember.article.evaluation" /></a></li>
<li><a href="<c:url value="#"/>"><fmt:message key="menu.pcmember.article.evaluation.modify" /></a></li>
<li><a href="<c:url value="#"/>"><fmt:message key="menu.pcmember.article.discussion" /></a></li>
</ul>
@@ -49,7 +49,7 @@
<div id="mainmenubloc">
<h4><fmt:message key="menu.referee.title" /></h4>
<ul>
<li><a href="<c:url value="listEvaluation.htm"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
<li><a href="<c:url value="listEvaluation.htm?role=referee"/>"><fmt:message key="menu.referee.article.evaluation" /></a></li>
<li><a href="<c:url value="#"/>"><fmt:message key="menu.referee.article.evaluation.modify" /></a></li>
</ul>
<div id="footer"></div>

View File

@@ -1,37 +1,37 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
<body>
<h4 class="title"><fmt:message key="evaluation.headPage" /></h4>
<table>
<tr>
<td><fmt:message key="evaluation.titleArticle"/></td>
<td><c:out value="${report.article.title}"/></td>
</tr>
<c:forEach items="${report.ratings}" var="rating" varStatus="j">
<tr>
<td><fmt:message key="evaluation.note"/> </td>
<td>${rating.criterion.name} is: </td>
<td>${rating.value}</td>
</tr>
</c:forEach>
<tr>
<td><fmt:message key="evaluation.commentPCMember"/></td>
<td><c:out value="${report.commentPCMember}"/></td>
</tr>
<tr>
<td><fmt:message key="evaluation.commentAuthor"/></td>
<td><c:out value="${report.commentAuthor}"/></td>
</tr>
</table>
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>
<h4 class="title"><fmt:message key="evaluation.headPage" /></h4>
<table>
<tr>
<td><fmt:message key="evaluation.titleArticle" /></td>
<td>${report.article.title}</td>
</tr>
<c:forEach items="${report.ratings}" var="rating">
<tr>
<td><fmt:message key="evaluation.note" /></td>
<td>${rating.criterion.name} is:</td>
<td>${rating.value}</td>
</tr>
</c:forEach>
<tr>
<td><fmt:message key="evaluation.commentPCMember" /></td>
<td>${report.commentPCMember}</td>
</tr>
<tr>
<td><fmt:message key="evaluation.commentAuthor" /></td>
<td>${report.commentAuthor}</td>
</tr>
</table>
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

View File

@@ -16,7 +16,7 @@
<form:label path="title">${criterion.name}</form:label>
<form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
<form:label path="simpleRatings[${j.index}].name"><form:select path="simpleRatings[${j.index}].value">
<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}">
<form:option value="${i}"></form:option>
</c:forEach>
</form:select></form:label>

View File

@@ -30,7 +30,7 @@
</c:if>
<c:if test="${article.state eq 'EVALUATED'}">
<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}&action=modify"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
</c:if>
<c:if test="${article.state eq 'REJECTED'}">

View File

@@ -3,42 +3,40 @@
<html>
<head></head>
<body>
<h4 class="title"><fmt:message key="report.headPage" /></h4>
<c:forEach items="${listReport}" var="report">
<table>
<tr>
<td>
<fmt:message key="report.referee"/>: ${report.referee}
</td>
</tr>
<tr>
<td><fmt:message key="evaluation.titleArticle"/></td>
<td><c:out value="${report.article.title}"/></td>
</tr>
<c:forEach items="${rtgs}" var="rating" varStatus="j">
<tr>
<td><fmt:message key="evaluation.note"/> </td>
<td>${rating.criterion.name} is: </td>
<td>${rating.value}</td>
</tr>
</c:forEach>
<tr>
<td><fmt:message key="evaluation.commentPCMember"/></td>
<td><c:out value="${report.commentPCMember}"/></td>
</tr>
<tr>
<td><fmt:message key="evaluation.commentAuthor"/></td>
<td><c:out value="${report.commentAuthor}"/></td>
</tr>
</table>
<hr>
</c:forEach>
<a href="<c:url value="main.htm"/>">Home</a>
<h4 class="title"><fmt:message key="report.headPage" /></h4>
<c:forEach items="${listReport}" var="report">
<table>
<tr>
<td><fmt:message key="report.referee" />: ${report.referee.firstName} ${report.referee.lastName}</td>
</tr>
<tr>
<td><fmt:message key="evaluation.titleArticle" /></td>
<td>${report.article.title}</td>
</tr>
<c:forEach items="${rtgs}" var="rating">
<tr>
<td><fmt:message key="evaluation.note" /></td>
<td>${rating.criterion.name} is:</td>
<td>${rating.value}</td>
</tr>
</c:forEach>
<tr>
<td><fmt:message key="evaluation.commentPCMember" /></td>
<td>${report.commentPCMember}</td>
</tr>
<tr>
<td><fmt:message key="evaluation.commentAuthor" /></td>
<td>${report.commentAuthor}</td>
</tr>
</table>
<hr>
</c:forEach>
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

View File

@@ -25,8 +25,13 @@
</tr>
<tr>
<td><a 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></td>
<td><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report" /></a></td>
src="./images/cc-download_manager-32x32.png" alt="Download" /></a></td>
<c:if test="${article.state == 'EVALUATED' or article.state == 'REJECTED' or article.state == 'ACCEPTED'}">
<td><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report" /></a></td>
</c:if>
<c:if test="${article.state == 'SUBMITED'}">
<td>&nbsp;</td>
</c:if>
</tr>
</table>
</div>

View File

@@ -257,6 +257,7 @@
<bean id="ListEvaluationController"
class="org.yacos.web.PCmember.controller.ListEvaluationController">
<property name="articleManager" ref="articleManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="StateArticleController"