diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp index 5354790..408055a 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp @@ -6,12 +6,9 @@ -

- - - - +

: ${evaluationForm.title}

+
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp index 5bb4e04..7f9afdd 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp @@ -3,7 +3,7 @@ -

+

  • Title: ">${article.title}
    • diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index 98c6974..463ee60 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -65,6 +65,10 @@ public class EvaluationController extends SimpleFormController { criterionList.add(c1); criterionList.add(c2); + String id=request.getParameter("id"); + Article art=articleManager.getArticle(Integer.parseInt(id)); + String title=art.getTitle(); + FormEvaluation fe=new FormEvaluation(); List liste=new ArrayList(); @@ -81,6 +85,7 @@ public class EvaluationController extends SimpleFormController { fe.setSimpleRatings(liste); fe.setCommentAuthor("no comment by author"); fe.setCommentPCMember("no comment by pc member"); + fe.setTitle(title); return fe; } @@ -122,8 +127,12 @@ public class EvaluationController extends SimpleFormController { } int idd=Integer.parseInt(id); + /*System.out.println(idd); + if (!listeRating.isEmpty()) { System.out.println("not empty liste");} + System.out.println("current user is "+current.getLogin());*/ + Report rpt =new Report(commentPCMember,commentAuthor,listeRating,current,article); - //evaluationManager.addReport(idd, commentPCMember, commentAuthor, listeRating, current.getLogin()); + // evaluationManager.addReport(idd, commentPCMember, commentAuthor, listeRating, current.getLogin()); request.getSession().setAttribute("report", rpt); //Map model1 = new HashMap(); //model1.put("report", rpt); diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/FormEvaluation.java b/YACOSWeb/src/org/yacos/web/PCmember/form/FormEvaluation.java index 03fbe46..5e11e93 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/form/FormEvaluation.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/form/FormEvaluation.java @@ -11,8 +11,15 @@ public class FormEvaluation { private List simpleRatings = new ArrayList(); private String commentPCMember; private String commentAuthor; + private String title; + public String getTitle() { + return title; + } + public void setTitle(String title) { + this.title = title; + } public String getCommentPCMember() { return commentPCMember; }