christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ajout de la moyenne

Browse Source
This commit is contained in:
Jialin Wang
2008-02-25 15:28:38 +00:00
parent 037df2140d
commit 7bc52a789e
2 changed files with 116 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp
View File

@@ -7,81 +7,96 @@
<h4 class="title"><fmt:message key="report.headPage" /></h4> <h4 class="title"><fmt:message key="report.headPage" /></h4>
<c:choose> <c:choose>
<c:when test="${(empty listReport) and ( empty rpt) }"> <c:when test="${(empty listReport) and ( empty rpt) }">
<div class="warningBox"> <div class="warningBox">There is no report for this article at
There is no report for this article at the moment. the moment.</div>
</div> </c:when>
</c:when>
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${not empty listReport }"> <c:when test="${not empty listReport }">
<c:forEach items="${listReport}" var="report" varStatus="current"> <c:forEach items="${listReport}" var="report" varStatus="current">
<div id="account_data"> <div id="account_data">
<p class="legend"><fmt:message key="report.referee" />: ${report.referee.firstName} ${report.referee.lastName}</p> <p class="legend"><fmt:message key="report.referee" />: ${report.referee.firstName} ${report.referee.lastName}</p>
<fieldset> <fieldset>
<div> <div>
<label><fmt:message key="evaluation.titleArticle" /></label> <label><fmt:message key="evaluation.titleArticle" /></label>
<span class="content">${report.article.title}</span> <span class="content">${report.article.title}</span>
</div> </div>
<br /> <br />
<c:forEach items="${container[current.index]}" var="rating"> <c:forEach items="${container[current.index]}" var="rating">
<label><fmt:message key="evaluation.note" /> <b>${rating.criterion.name}</b> is : </label> <label><fmt:message key="evaluation.note" /> <b>${rating.criterion.name}</b> is : </label>
<span class="content">${rating.value}</span><br /> <span class="content">${rating.value}</span><br />
</c:forEach> </c:forEach>
<div> <div>
<label><fmt:message key="evaluation.commentPCMember" /></label> <label><fmt:message key="evaluation.commentPCMember" /></label>
<span class="content">${report.commentPCMember}</span> <span class="content">${report.commentPCMember}</span>
</div> </div>
<div> <div>
<label><fmt:message key="evaluation.commentAuthor" /></label> <label><fmt:message key="evaluation.commentAuthor" /></label>
<span class="content">${report.commentAuthor}</span> <span class="content">${report.commentAuthor}</span>
</div> </div>
</fieldset> </fieldset>
</div> </div>
</c:forEach> </c:forEach>
<authz:authorize ifAllGranted="ROLE_CHAIRMAN">
<table>
<c:set var="OneRatings" value="${container[0]}" />
<c:forEach items="${OneRatings}" var="rating" varStatus="i">
<tr>
<td>The average for ${rating.criterion.name} is
${listMoyenne[i.index]}</td>
</tr>
</c:forEach>
</table>
</authz:authorize>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div id="account_data">
<p class="legend"><fmt:message key="report.referee" />: ${rpt.referee.firstName} ${rpt.referee.lastName}</p>
<fieldset>
<div>
<label><fmt:message key="evaluation.titleArticle" /></label>
<span class="content">${rpt.article.title}</span>
</div>
<br />
<c:forEach items="${rtgs}" var="rating">
<label><fmt:message key="evaluation.note" /> <b>${rating.criterion.name}</b> is : </label>
<span class="content">${rating.value}</span><br />
</c:forEach>
<div>
<label><fmt:message key="evaluation.commentPCMember" /></label>
<span class="content">${rpt.commentPCMember}</span>
</div>
<div>
<label><fmt:message key="evaluation.commentAuthor" /></label>
<span class="content">${rpt.commentAuthor}</span>
</div>
</fieldset>
</div>
</c:otherwise> <div id="account_data">
</c:choose> <p class="legend"><fmt:message key="report.referee" />: ${rpt.referee.firstName} ${rpt.referee.lastName}</p>
<fieldset>
<div>
<label><fmt:message key="evaluation.titleArticle" /></label>
<span class="content">${rpt.article.title}</span>
</div>
<br />
<c:forEach items="${rtgs}" var="rating">
<label><fmt:message key="evaluation.note" /> <b>${rating.criterion.name}</b> is : </label>
<span class="content">${rating.value}</span><br />
</c:forEach>
</c:otherwise>
<div>
<label><fmt:message key="evaluation.commentPCMember" /></label>
<span class="content">${rpt.commentPCMember}</span>
</div>
<div>
<label><fmt:message key="evaluation.commentAuthor" /></label>
<span class="content">${rpt.commentAuthor}</span>
</div>
</fieldset>
</div>
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose> </c:choose>
<br /> <br />
<a class="back_link" href="<c:url value="${whereIcome}"/>"><fmt:message key="form.link.back" /></a> <a class="back_link" href="<c:url value="${whereIcome}"/>"><fmt:message
key="form.link.back" /></a>
</body> </body>
</html> </html>

46
YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
View File

@@ -40,7 +40,7 @@ public class ListReportController extends SimpleFormController {
public void setArticleManager(IArticleManager articleManager) { public void setArticleManager(IArticleManager articleManager) {
this.articleManager = articleManager; this.articleManager = articleManager;
} }
public IEvaluationManager getEvaluationManager() { public IEvaluationManager getEvaluationManager() {
return evaluationManager; return evaluationManager;
} }
@@ -86,11 +86,38 @@ public class ListReportController extends SimpleFormController {
List<List<Rating>> container = new ArrayList<List<Rating>>(); List<List<Rating>> container = new ArrayList<List<Rating>>();
List<Double> listMoyenne = new ArrayList<Double>();
List<Rating> ratings = new ArrayList<Rating>();
for (int i = 0; i <= listReport.size() - 1; i++) { for (int i = 0; i <= listReport.size() - 1; i++) {
List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
container.add(ratings); container.add(ratings);
} }
//init liste moyenne
for (int j=0; j < ratings.size(); j++)
listMoyenne.add(new Double(0));
double sum = 0;
int i = 0;
for (List<Rating> listRt : container) {
for (Rating r : listRt) {
sum = listMoyenne.get(i);
sum += r.getValue();
listMoyenne.set(i, sum);
i++;
}
i=0;
}
for (int j=0; j < ratings.size(); j++) {
listMoyenne.set(j, listMoyenne.get(j) / new Double(listReport.size()));
}
model.put("container", container); model.put("container", container);
model.put("listMoyenne", listMoyenne);
} }
} }
@@ -136,13 +163,18 @@ public class ListReportController extends SimpleFormController {
model.put("whereIcome", request.getHeader("REFERER")); model.put("whereIcome", request.getHeader("REFERER"));
/* double[] moyennes=new double[listReport.size()];
for (Rating rt : ratings)
{
}*/ listReport = evaluationManager.getReportsForArticle(id);
return new ModelAndView("listReport", model); return new ModelAndView("listReport", model);
} }