Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.98 -r1.420.2.99 Binary files differ Index: lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:32:37 -0000 1.1.2.3 +++ lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:24:24 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
: 
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/.settings/org.jboss.ide.eclipse.as.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java,v diff -u -r1.1.2.8 -r1.1.2.9 --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java 12 Oct 2016 20:50:30 -0000 1.1.2.8 +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java 16 Nov 2016 04:16:02 -0000 1.1.2.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java 11 May 2016 07:07:27 -0000 1.1.2.5 +++ lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java 16 Nov 2016 04:16:02 -0000 1.1.2.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java,v diff -u -r1.1.2.9 -r1.1.2.10 --- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java 18 Oct 2016 00:20:57 -0000 1.1.2.9 +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java 16 Nov 2016 04:16:02 -0000 1.1.2.10 @@ -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);