rating ca marche, page report aussi

This commit is contained in:
Jialin Wang
2008-02-12 09:07:00 +00:00
parent 5799259547
commit 1e3b305678
4 changed files with 23 additions and 6 deletions

View File

@@ -179,7 +179,9 @@ public class EvaluationManagerBean implements IEvaluationManager {
* rating methods * 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); Rating rating = new Rating(value,criterion,report);
em.persist(rating); em.persist(rating);
em.flush(); em.flush();

View File

@@ -36,7 +36,7 @@ public interface IEvaluationManager {
public List<Report> getReportsForArticle(int articleId); public List<Report> getReportsForArticle(int articleId);
public List<Report> getReportsForReferee(String refereeLogin); public List<Report> 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 void removeRating(Criterion criterion,Report report);
public Rating updateRating(Rating rating); public Rating updateRating(Rating rating);
public List<Rating> getRatingForReport(Integer reportId); public List<Rating> getRatingForReport(Integer reportId);

View File

@@ -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); liste.add(sc);
@@ -98,7 +98,12 @@ public class EvaluationController extends SimpleFormController {
Rating rt=new Rating(); Rating rt=new Rating();
Criterion cn=new Criterion(); Criterion cn=new Criterion();
cn.setMax_rating(sc.getMax_rating());
cn.setMin_rating(sc.getMin_rating());
cn.setName(sc.getName()); cn.setName(sc.getName());
cn.setId(sc.getId());
rt.setCriterion(cn); rt.setCriterion(cn);
rt.setValue(sc.getValue()); rt.setValue(sc.getValue());
listeRating.add(rt); listeRating.add(rt);
@@ -126,8 +131,9 @@ public class EvaluationController extends SimpleFormController {
{ {
System.out.println("value: "+rt.getValue()); System.out.println("value: "+rt.getValue());
System.out.println("cretertion: "+rt.getCriterion()); System.out.println("criterion: "+rt.getCriterion());
evaluationManager.addRating(rt.getValue(), rt.getCriterion(), rpt); if (rpt!=null){System.out.println("report is not null");}
evaluationManager.addRating(rt.getValue(), rt.getCriterion().getId(), rpt.getId());
} }

View File

@@ -6,13 +6,15 @@ public class SimpleCriterion {
private Integer min_rating; private Integer min_rating;
private Integer max_rating; private Integer max_rating;
private Integer value; 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(); super();
this.name = name; this.name = name;
this.min_rating = min_rating; this.min_rating = min_rating;
this.max_rating = max_rating; this.max_rating = max_rating;
this.value=(this.max_rating+this.min_rating)/2; this.value=(this.max_rating+this.min_rating)/2;
this.id=id;
} }
public String getName() { public String getName() {
@@ -43,7 +45,14 @@ public class SimpleCriterion {
public void setValue(Integer value) { public void setValue(Integer value) {
this.value = value; this.value = value;
} }
public Integer getId() {
return id;
}
public void setId(Integer id)
{ this.id=id;
}
} }