Index: lams_central/web/css/rating.scss =================================================================== diff -u -rdf411d8446000acfdb5937f46a7a7e8ef4b656e0 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_central/web/css/rating.scss (.../rating.scss) (revision df411d8446000acfdb5937f46a7a7e8ef4b656e0) +++ lams_central/web/css/rating.scss (.../rating.scss) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -62,11 +62,3 @@ margin-top: 0; margin-bottom: 12px; } - -/** Remove the following once we move all tools to use Rating.tag. **/ -.rating-stars-div { - float: right; - padding-right: 10px; - margin-top: -8px; - min-height: 45px; -} Index: lams_common/src/java/org/lamsfoundation/lams/rating/RatingUtil.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/rating/RatingUtil.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/rating/RatingUtil.java (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -0,0 +1,28 @@ +package org.lamsfoundation.lams.rating; + +public class RatingUtil { + + public static String constructRatingTagDisabled(String averageRating, String averageRatingLabel) { + int averageRatingFloor = (int) Math.floor(Double.parseDouble(averageRating)); + String dataRating = String.valueOf(averageRatingFloor) + (Double.parseDouble(averageRating) % 1 >= 0.5 ? ".5" : ""); + + String starString = + "
" + + "
" + +// +// +// ${criteriaDto.ratingCriteria.title} +// +// + "
" + + "
" + + + "
" + + averageRatingLabel + + "
" + + "
" + + "
"; + return starString; + } + +} Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -60,6 +60,7 @@ import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.service.IQbService; +import org.lamsfoundation.lams.rating.RatingUtil; import org.lamsfoundation.lams.rating.dto.RatingCommentDTO; import org.lamsfoundation.lams.rating.model.Rating; import org.lamsfoundation.lams.rating.model.RatingCriteria; @@ -629,19 +630,9 @@ double ratingSum = ratings.stream().mapToDouble(Rating::getRating).sum(); String averageRating = NumberUtil.formatLocalisedNumberForceDecimalPlaces( ratingSum / numberOfVotes, null, 2); - - starString = "
"; - starString += - "
"; - starString += "
"; - starString += - "
"; - String msg = service.getMessage("label.average.rating", - new Object[] { averageRating, numberOfVotes }); - starString += msg; - starString += "
"; + + String averageRatingLabel = service.getMessage("label.average.rating", new Object[] { averageRating, numberOfVotes }); + starString = RatingUtil.constructRatingTagDisabled(averageRating, averageRatingLabel); } } userData.add(starString); Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp =================================================================== diff -u -r358c00c5ad71e03c7b22e30b8bcd883375ff6e1e -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp (.../discloseAnswers5.jsp) (revision 358c00c5ad71e03c7b22e30b8bcd883375ff6e1e) +++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp (.../discloseAnswers5.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -5,7 +5,7 @@ var toolContentId = resultsPane.data('toolContentId'); // load an embedded results list // show details button needs to be set in the page which included this page - resultsPane.load("?embedded=true&bootstrap5=true&sessionMapID=${sessionMapID}&showQuestionDetailsButton=" + resultsPane.load("?embedded=true&sessionMapID=${sessionMapID}&showQuestionDetailsButton=" + showQuestionDetailsButton + "&toolContentID=" + toolContentId, function(){ var assessmentQuestionsPane = $(this).closest('.assessment-questions-pane').length ? $(this).closest('.assessment-questions-pane') : $('.assessment-questions-pane-ira'), Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision cfd463431d2171b40403dcff2508408e72685c0e) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -8,7 +8,7 @@ <%@ include file="/common/header.jsp"%> - + @@ -44,9 +44,6 @@ LABEL_VERY_SURE : '' }; - //var for jquery.jRating.js - var pathToImageFolder = "${lams}images/css/"; - //vars for rating.js var MAX_RATES = 0, MIN_RATES = 0, @@ -61,8 +58,7 @@ - - + @@ -202,7 +198,7 @@ } }, loadComplete: function () { - initializeJRating(); + initializeStarability(); initializePortraitPopover(''); if (typeof CodeMirror != 'undefined') { Index: lams_tool_doku/web/pages/monitoring/summary.jsp =================================================================== diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10) +++ lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -16,7 +16,7 @@ <%@ page import="org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants"%> - + @@ -141,10 +141,8 @@ - - +
@@ -605,7 +602,7 @@ ${groupSummary.sessionName} @@ -678,7 +675,7 @@ - + - + @@ -110,10 +110,8 @@ - - +
@@ -546,7 +543,7 @@ ${groupSummary.sessionName} @@ -607,7 +604,7 @@ - + <%@ include file="/common/header.jsp"%> - + - - + @@ -78,7 +74,7 @@ Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r5274ca56bc898b027104d2d37105e9778927a831 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 5274ca56bc898b027104d2d37105e9778927a831) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -24,8 +24,8 @@ <%@ include file="/common/tabbedheader.jsp" %> - - + + @@ -45,9 +45,6 @@ - - + - - + @@ -145,28 +138,19 @@ rows += ''; if (userData["visible"] == 'true') { - rows += '
'; + rows += '
'; for (j = 0; j < userData.criteriaDtos.length; j++){ - var criteriaDto = userData.criteriaDtos[j]; - var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId; - var averageRating = criteriaDto.averageRating; - var numberOfVotes = criteriaDto.numberOfVotes; - var userRating = criteriaDto.userRating; - var isCriteriaNotRatedByUser = userRating == ""; - var averageRatingDisplayed = averageRating; - var ratingStarsClass = "rating-stars-disabled"; - - rows += '

'; - rows += criteriaDto.title; - rows += '

'; - - rows += '
'; - rows += '
'; - - rows += '
'; - rows += AVG_RATING_LABEL.replace("@1@", averageRating).replace("@2@", numberOfVotes); - rows += '
'; + const criteriaDto = userData.criteriaDtos[j], + isDisplayOnly = true, + objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId, + averageRating = criteriaDto.averageRating, + numberOfVotes = criteriaDto.numberOfVotes, + userRating = criteriaDto.userRating, + isCriteriaRatedByUser = userRating != "", + isWidgetDisabled = true, + criteriaTitle = criteriaDto.title; + rows += createStarability(isDisplayOnly, objectId, averageRating, numberOfVotes, userRating, isWidgetDisabled, criteriaTitle); } rows += '
'; @@ -212,7 +196,7 @@ // bind to pager events .bind('pagerInitialized pagerComplete', function(event, options){ $("time.timeago").timeago(); - initializeJRating(); + initializeStarability(); initializePortraitPopover('${lams}'); }) }); Index: lams_tool_laqa/web/monitoring/PrintAnswers.jsp =================================================================== diff -u -r265cd3e424cd797379c4c4d281550914a4dfdd22 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_laqa/web/monitoring/PrintAnswers.jsp (.../PrintAnswers.jsp) (revision 265cd3e424cd797379c4c4d281550914a4dfdd22) +++ lams_tool_laqa/web/monitoring/PrintAnswers.jsp (.../PrintAnswers.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -14,7 +14,7 @@ ${content.title} - + - - + Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp =================================================================== diff -u -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7) +++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -60,7 +60,7 @@ pager: '#pager${toolSessionId}', viewrecords:true, loadComplete: function(){ - initializeJRating(); + initializeStarability(); initializePortraitPopover(''); }, // caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar Index: lams_tool_preview/web/pages/monitoring/summary.jsp =================================================================== diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 --- lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10) +++ lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03) @@ -5,7 +5,7 @@ - +