diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index 5c4094a..aca8821 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -13,6 +13,7 @@
">
">
">
+ ">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
index b9f58f8..bec6794 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
@@ -1,43 +1,32 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
+
-
+
| ${criterion.name} |
-
-
-
- ${i} |
-
- |
-
+
+
+
+
+
+ |
@@ -53,7 +42,7 @@
-
+
"/>
@@ -61,10 +50,8 @@
">Home
-
-
-
-
+
+
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index 9f99893..28a21d5 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -42,22 +42,16 @@ public class EvaluationController extends SimpleFormController {
conferenceManager.addConference("myTitre", "myDescirption", "myInfoComplementray", new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008));
Conference conf=conferenceManager.getConference(1);
ArrayList criterionList = new ArrayList();
- Criterion c1=new Criterion();
- c1.setName("respect du theme");
- c1.setConference(conf);
- c1.setMax(new Integer(5));
- c1.setMin(new Integer(1));
+ Criterion c1=new Criterion("respect du theme",new Integer(1),new Integer(5),conf );
+
+
+ Criterion c2=new Criterion("coherence",new Integer(1),new Integer(3),conf );
- Criterion c2=new Criterion();
- c2.setName("exactitude");
- c2.setConference(conf);
- c2.setMax(new Integer(4));
- c2.setMin(new Integer(1));
criterionList.add(c1);
criterionList.add(c2);
- FormEvaluation evaluationForm=new FormEvaluation();
+ FormEvaluation fe=new FormEvaluation();
List liste=new ArrayList();
for (Criterion c : criterionList)
@@ -69,11 +63,11 @@ public class EvaluationController extends SimpleFormController {
liste.add(sc);
}
-
- evaluationForm.setSimpleRatings(liste);
- evaluationForm.setCommentAuthor("no comment by author");
- evaluationForm.setCommentPCMember("no comment by pc member");
- return evaluationForm;
+ if (liste!=null){System.out.println("liste n'est pas null");}
+ fe.setSimpleRatings(liste);
+ fe.setCommentAuthor("no comment by author");
+ fe.setCommentPCMember("no comment by pc member");
+ return fe;
}
@Override