Index: lams_common/.settings/org.jboss.ide.eclipse.as.core.prefs =================================================================== diff -u --- lams_common/.settings/org.jboss.ide.eclipse.as.core.prefs (revision 0) +++ lams_common/.settings/org.jboss.ide.eclipse.as.core.prefs (revision 375f8bce2569de89cfce75b0b67cee5633d24822) @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList= Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java =================================================================== diff -u -r223de22225bd6f7969f417b6d17ba681671af095 -r375f8bce2569de89cfce75b0b67cee5633d24822 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java (.../RatingDAO.java) (revision 223de22225bd6f7969f417b6d17ba681671af095) +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java (.../RatingDAO.java) (revision 375f8bce2569de89cfce75b0b67cee5633d24822) @@ -171,12 +171,9 @@ Object[] results = list.get(0); Object averageRatingObj = (results[0] == null) ? 0 : results[0]; - NumberFormat numberFormat = NumberFormat.getInstance(Locale.US); - numberFormat.setMaximumFractionDigits(1); - String averageRating = numberFormat.format(averageRatingObj); String numberOfVotes = (results[1] == null) ? "0" : String.valueOf(results[1]); - return new ItemRatingCriteriaDTO(averageRating, numberOfVotes); + return new ItemRatingCriteriaDTO((Number)averageRatingObj, numberOfVotes); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r375f8bce2569de89cfce75b0b67cee5633d24822 --- lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java (.../ItemRatingCriteriaDTO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java (.../ItemRatingCriteriaDTO.java) (revision 375f8bce2569de89cfce75b0b67cee5633d24822) @@ -23,7 +23,9 @@ package org.lamsfoundation.lams.rating.dto; +import java.text.NumberFormat; import java.util.List; +import java.util.Locale; import org.lamsfoundation.lams.rating.model.RatingCriteria; @@ -36,15 +38,19 @@ private String userRating; private String averageRating; private String numberOfVotes; + private Number averageRatingAsNumber; //used in case of filling with all rating private List ratingDtos; public ItemRatingCriteriaDTO() { } - public ItemRatingCriteriaDTO(String rating, String numberOfVotes) { - this.averageRating = rating; + public ItemRatingCriteriaDTO(Number rating, String numberOfVotes) { + NumberFormat numberFormat = NumberFormat.getInstance(Locale.US); + numberFormat.setMaximumFractionDigits(1); + this.averageRatingAsNumber = rating; + this.averageRating = numberFormat.format(rating); this.numberOfVotes = numberOfVotes; } @@ -88,4 +94,12 @@ this.ratingDtos = ratingDtos; } + public Number getAverageRatingAsNumber() { + return averageRatingAsNumber; + } + + public void setAverageRatingAsNumber(Number averageRatingAsFloat) { + this.averageRatingAsNumber = averageRatingAsFloat; + } + } Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java =================================================================== diff -u -re1fac48f7bb8bf00cc7e591c0a19ad767172eda0 -r375f8bce2569de89cfce75b0b67cee5633d24822 --- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision e1fac48f7bb8bf00cc7e591c0a19ad767172eda0) +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision 375f8bce2569de89cfce75b0b67cee5633d24822) @@ -254,10 +254,16 @@ } } - String averageRating = itemStatistics == null ? "0" : numberFormat.format(itemStatistics[2]); - String numberOfVotes = itemStatistics == null ? "0" : String.valueOf(itemStatistics[3]); - criteriaDto.setAverageRating(averageRating); - criteriaDto.setNumberOfVotes(numberOfVotes); + if ( itemStatistics != null ) { + Number averageRating = (Number) itemStatistics[2]; + criteriaDto.setAverageRating(numberFormat.format(averageRating)); + criteriaDto.setAverageRatingAsNumber(averageRating); + criteriaDto.setNumberOfVotes(String.valueOf(itemStatistics[3])); + } else { + criteriaDto.setAverageRating("0"); + criteriaDto.setAverageRatingAsNumber(0); + criteriaDto.setNumberOfVotes("0"); + } criteriaDtos.add(criteriaDto);