diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp index da3665e..9aafb55 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp @@ -7,81 +7,96 @@

- -
- There is no report for this article at the moment. -
-
+ +
There is no report for this article at + the moment.
+
- + - -
-

: ${report.referee.firstName} ${report.referee.lastName}

-
-
- - ${report.article.title} -
-
- - - ${rating.value}
-
- - -
- - ${report.commentPCMember} -
-
- - ${report.commentAuthor} -
-
- + +
+

: ${report.referee.firstName} ${report.referee.lastName}

+
+
+ + ${report.article.title} +
+
+ + + ${rating.value}
+
+ + +
+ + ${report.commentPCMember} +
+
+ + ${report.commentAuthor} +
+
+
+ + + + + + + + + + + +
The average for ${rating.criterion.name} is + ${listMoyenne[i.index]}
+
+ - - -
-

: ${rpt.referee.firstName} ${rpt.referee.lastName}

-
-
- - ${rpt.article.title} -
-
- - - ${rating.value}
-
- - -
- - ${rpt.commentPCMember} -
-
- - ${rpt.commentAuthor} -
-
- -
+ - - +
+

: ${rpt.referee.firstName} ${rpt.referee.lastName}

+
+
+ + ${rpt.article.title} +
+
+ + + ${rating.value}
+
- + +
+ + ${rpt.commentPCMember} +
+
+ + ${rpt.commentAuthor} +
+
+ +
+ +
+ + +
-"> +"> diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java index 27f3442..b834ee4 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java @@ -40,7 +40,7 @@ public class ListReportController extends SimpleFormController { public void setArticleManager(IArticleManager articleManager) { this.articleManager = articleManager; } - + public IEvaluationManager getEvaluationManager() { return evaluationManager; } @@ -86,11 +86,38 @@ public class ListReportController extends SimpleFormController { List> container = new ArrayList>(); + List listMoyenne = new ArrayList(); + + + List ratings = new ArrayList(); for (int i = 0; i <= listReport.size() - 1; i++) { - List ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); + ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); 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 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("listMoyenne", listMoyenne); } } @@ -136,13 +163,18 @@ public class ListReportController extends SimpleFormController { 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); }