diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java index 3adebb1..076953a 100644 --- a/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/EvaluationManagerBean.java @@ -179,7 +179,9 @@ public class EvaluationManagerBean implements IEvaluationManager { * rating methods */ - public Rating addRating(Integer value, Criterion criterion, Report report) { + public Rating addRating(Integer value, Integer criterionId, Integer reportId) { + Criterion criterion = getCriterion(criterionId); + Report report=getReport(reportId); Rating rating = new Rating(value,criterion,report); em.persist(rating); em.flush(); diff --git a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java index 5d74139..d31d23f 100644 --- a/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/evaluation/IEvaluationManager.java @@ -36,7 +36,7 @@ public interface IEvaluationManager { public List getReportsForArticle(int articleId); public List getReportsForReferee(String refereeLogin); - public Rating addRating(Integer value,Criterion criterion,Report report); + public Rating addRating(Integer value,Integer criterionId,Integer reportId); public void removeRating(Criterion criterion,Report report); public Rating updateRating(Rating rating); public List getRatingForReport(Integer reportId); diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index 82dc774..7228437 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -67,7 +67,7 @@ public class EvaluationController extends SimpleFormController { { - SimpleCriterion sc=new SimpleCriterion(c.getName(),c.getMin_rating(),c.getMax_rating()); + SimpleCriterion sc=new SimpleCriterion(c.getName(),c.getMin_rating(),c.getMax_rating(),c.getId()); liste.add(sc); @@ -98,7 +98,12 @@ public class EvaluationController extends SimpleFormController { Rating rt=new Rating(); Criterion cn=new Criterion(); + + cn.setMax_rating(sc.getMax_rating()); + cn.setMin_rating(sc.getMin_rating()); cn.setName(sc.getName()); + cn.setId(sc.getId()); + rt.setCriterion(cn); rt.setValue(sc.getValue()); listeRating.add(rt); @@ -126,8 +131,9 @@ public class EvaluationController extends SimpleFormController { { System.out.println("value: "+rt.getValue()); - System.out.println("cretertion: "+rt.getCriterion()); - evaluationManager.addRating(rt.getValue(), rt.getCriterion(), rpt); + System.out.println("criterion: "+rt.getCriterion()); + if (rpt!=null){System.out.println("report is not null");} + evaluationManager.addRating(rt.getValue(), rt.getCriterion().getId(), rpt.getId()); } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/SimpleCriterion.java b/YACOSWeb/src/org/yacos/web/PCmember/form/SimpleCriterion.java index 57dbc32..90c4033 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/form/SimpleCriterion.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/form/SimpleCriterion.java @@ -6,13 +6,15 @@ public class SimpleCriterion { private Integer min_rating; private Integer max_rating; private Integer value; + private Integer id; - public SimpleCriterion(String name, Integer min_rating, Integer max_rating) { + public SimpleCriterion(String name, Integer min_rating, Integer max_rating,Integer id) { super(); this.name = name; this.min_rating = min_rating; this.max_rating = max_rating; this.value=(this.max_rating+this.min_rating)/2; + this.id=id; } public String getName() { @@ -43,7 +45,14 @@ public class SimpleCriterion { public void setValue(Integer value) { this.value = value; } + + public Integer getId() { + return id; + } + public void setId(Integer id) + { this.id=id; + } }