OO-3819: Option to set the positive rating end of a rubric

src/main/java/org/olat/modules/forms/model/xml/Rubric.java

@@ -50,6 +50,7 @@ public class Rubric extends AbstractElement {
 	private Double upperBoundNeutral;
 	private Double lowerBoundSufficient;
 	private Double upperBoundSufficient;
+	private boolean startGoodRating;
 	
 	@Override
 	public String getType() {
@@ -185,6 +186,14 @@ public class Rubric extends AbstractElement {
 		this.upperBoundSufficient = upperBoundSufficient;
 	}
 
+	public boolean isStartGoodRating() {
+		return startGoodRating;
+	}
+
+	public void setStartGoodRating(boolean startGoodRating) {
+		this.startGoodRating = startGoodRating;
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if(this == obj) {

src/main/java/org/olat/modules/forms/ui/RubricEditorController.java

@@ -19,6 +19,8 @@
  */
 package org.olat.modules.forms.ui;
 
+import static org.olat.core.gui.translator.TranslatorHelper.translateAll;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -58,6 +60,12 @@ import org.olat.modules.forms.model.xml.StepLabel;
  */
 public class RubricEditorController extends FormBasicController implements PageElementEditorController {
 	
+	private static final String GOOD_RATING_END_KEY = "rubric.good.rating.end";
+	private static final String GOOD_RATING_START_KEY = "rubric.good.rating.start";
+	private final String[] GOOD_RATING_KEYS = new String[] {
+			GOOD_RATING_END_KEY, GOOD_RATING_START_KEY
+	};
+
 	private static AtomicInteger count = new AtomicInteger();
 	private final Rubric rubric;
 	private boolean editMode = false;
@@ -83,6 +91,7 @@ public class RubricEditorController extends FormBasicController implements PageE
 	private TextElement upperBoundNeutralEl;
 	private TextElement lowerBoundSufficientEl;
 	private TextElement upperBoundSufficientEl;
+	private SingleSelection goodRatingEl;
 	private FormLink addSliderButton;
 	private FormLayoutContainer settingsLayout;
 	
@@ -222,6 +231,13 @@ public class RubricEditorController extends FormBasicController implements PageE
 				sufficientCont);
 		upperBoundSufficientEl.setDomReplacementWrapperRequired(false);
 		upperBoundSufficientEl.setDisplaySize(4);
+		
+		goodRatingEl = uifactory.addDropdownSingleselect("rubric.good.rating" + count.incrementAndGet(), "rubric.good.rating",
+				settingsLayout, GOOD_RATING_KEYS, translateAll(getTranslator(), GOOD_RATING_KEYS), null);
+		if (rubric != null) {
+			String goodRatingKey = rubric.isStartGoodRating()? GOOD_RATING_START_KEY: GOOD_RATING_END_KEY;
+			goodRatingEl.select(goodRatingKey, true);
+		}
 
 		updateTypeSettings();
 		updateSteps();
@@ -592,6 +608,11 @@ public class RubricEditorController extends FormBasicController implements PageE
 			rubric.setUpperBoundSufficient(null);
 		}
 		
+		boolean startGoodRating = goodRatingEl.isOneSelected() && GOOD_RATING_END_KEY.equals(goodRatingEl.getSelectedKey())
+				? true
+				: false;
+		rubric.setStartGoodRating(startGoodRating);
+		
 		rubricCtrl.updateForm();
 		
 		fireEvent(ureq, new ChangePartEvent(rubric));

src/main/java/org/olat/modules/forms/ui/_content/rubric_editor.html

@@ -5,7 +5,7 @@
 	#if($r.isNotEmpty($stepLabels))
 	<div class="row">
 		<div class="form-horizontal">
-			<label class="control-label col-sm-3">$r.translate("rubic.column.label")</label>
+			<label class="control-label col-sm-3">$r.translate("rubric.column.label")</label>
 		</div>
 		<div class="col-sm-6"><div class="form-inline">
 		#foreach($stepLabel in $stepLabels)

src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties

@@ -94,7 +94,10 @@ reports.session.forms=Frageb\u00F6gen
 reports.session.selection=Einzelne Frageb\u00F6gen
 reports.table.overview=\u00DCbersicht
 reports.table.report=Tabellen
-rubic.column.label=Spaltenbeschriftung
+rubric.column.label=Spaltenbeschriftung
+rubric.good.rating.end=Rechts
+rubric.good.rating.start=Links
+rubric.good.rating=Positive Bewertung
 rubric.insufficient=Ungen\u00FCgend
 rubric.insufficient.explanation=Ungen\u00FCgende Beurteilung (Wert zwischen {0} und {1})
 rubric.lower.bound=von

src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties

@@ -94,7 +94,10 @@ reports.session.forms=Questionnaires
 reports.session.selection=Individual questionnaires
 reports.table.overview=Overview
 reports.table.report=Tables
-rubic.column.label=Column label
+rubric.column.label=Column label
+rubric.good.rating.end=Right
+rubric.good.rating.start=Left
+rubric.good.rating=Positive rating
 rubric.insufficient=Insufficient
 rubric.insufficient.explanation=Good rating (Value between {0} and {1})
 rubric.lower.bound=from

src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_fr.properties

@@ -91,7 +91,7 @@ reports.session.forms=Questionnaires
 reports.session.selection=Questionnaires individuels
 reports.table.overview=Aper\u00E7u
 reports.table.report=Tableaux
-rubic.column.label=Etiquette de colonne
+rubric.column.label=Etiquette de colonne
 rubric.insufficient=Insuffisant
 rubric.insufficient.explanation=Evaluation insuffisante (valuer entre {0} et {1})
 rubric.lower.bound=de

src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties

@@ -91,7 +91,7 @@ reports.session.forms=Question\u00E1rios
 reports.session.selection=Question\u00E1rios individuais
 reports.table.overview=Vis\u00E3o global
 reports.table.report=Tabelas
-rubic.column.label=R\u00F3tulo da coluna
+rubric.column.label=R\u00F3tulo da coluna
 rubric.insufficient=Insuficiente
 rubric.insufficient.explanation=Boa classifica\u00E7\u00E3o (valor entre {0} e {1})
 rubric.lower.bound=de

src/main/java/org/olat/modules/quality/analysis/GroupedStatistic.java

@@ -29,8 +29,10 @@ import org.olat.modules.forms.RubricRating;
  */
 public interface GroupedStatistic extends RawGroupedStatistic {
 	
+	public boolean isRawAvgMaxGood();
+
 	public Double getAvg();
 	
 	public RubricRating getRating();
-
+	
 }

src/main/java/org/olat/modules/quality/analysis/manager/StatisticsCalculator.java

@@ -90,10 +90,11 @@ public class StatisticsCalculator {
 	GroupedStatistic getGroupedStatistic(RawGroupedStatistic rawStatistic, Rubric rubric) {
 		log.debug("Raw grouped statistic: " + rawStatistic.toString());
 		Double rawAvg = rawStatistic.getRawAvg();
+		boolean rawAvgMaxGood = !rubric.isStartGoodRating();
 		Double scaledAvg = getScaledAvg(rubric, rawAvg);
 		RubricRating rating = evaluationFormManager.getRubricRating(rubric, scaledAvg);
 		GroupedStatistic statistic = new GroupedStatisticImpl(rawStatistic.getIdentifier(), rawStatistic.getMultiKey(),
-				rawStatistic.getTemporalKey(), rawStatistic.getCount(), rawAvg, scaledAvg, rating);
+				rawStatistic.getTemporalKey(), rawStatistic.getCount(), rawAvg, rawAvgMaxGood, scaledAvg, rating);
 		log.debug("Grouped statistic:        " + statistic.toString());
 		return statistic;
 	}
@@ -134,7 +135,7 @@ public class StatisticsCalculator {
 			for (TemporalKey temporalKey: multiTrendSeries.getTemporalKeys()) {
 				GroupedStatistic currentStatistic = statistics.getStatistic(identifier, temporalKey);
 				if (currentStatistic != null) {
-					DIRECTION direction = getTrendDirection(lastStatistic, currentStatistic);
+					DIRECTION direction = getTrendDirection(lastStatistic, currentStatistic, currentStatistic.isRawAvgMaxGood());
 					Trend trend = new TrendImpl(currentStatistic, direction);
 					multiTrendSeries.put(identifier, temporalKey, trend);
 					lastStatistic = currentStatistic;
@@ -144,25 +145,26 @@ public class StatisticsCalculator {
 		return multiTrendSeries;
 	}
 
-	DIRECTION getTrendDirection(GroupedStatistic prev, GroupedStatistic current) {
+	DIRECTION getTrendDirection(GroupedStatistic prev, GroupedStatistic current, boolean rawAvgMaxGood) {
 		// First in a series
 		if (prev == null) return DIRECTION.EQUAL;
 		
 		// Should not happen
 		Double prevAvg = prev.getRawAvg();
 		Double currentAvg = current.getRawAvg();
-		return getTrendDirection(prevAvg, currentAvg);
+		return getTrendDirection(prevAvg, currentAvg, rawAvgMaxGood);
 	}
 
-	DIRECTION getTrendDirection(Double prevAvg, Double currentAvg) {
+	DIRECTION getTrendDirection(Double prevAvg, Double currentAvg, boolean rawAvgMaxGood) {
 		if (prevAvg == null || currentAvg == null) return null;
 		
+		double diffRange = 0.05;
 		double diff = currentAvg.doubleValue() - prevAvg.doubleValue();
 		DIRECTION direction = DIRECTION.EQUAL;
-		if (diff > 0.05) {
-			direction = DIRECTION.UP;
-		} else if (diff < -0.05) {
-			direction = DIRECTION.DOWN;
+		if (diff > diffRange) {
+			direction = rawAvgMaxGood? DIRECTION.UP: DIRECTION.DOWN;
+		} else if (diff < -diffRange) {
+			direction = rawAvgMaxGood? DIRECTION.DOWN: DIRECTION.UP;
 		}
 		return direction;
 	}

src/main/java/org/olat/modules/quality/analysis/model/GroupedStatisticImpl.java

@@ -37,17 +37,19 @@ public class GroupedStatisticImpl implements GroupedStatistic {
 	private final TemporalKey temporalKey;
 	private final Long count;
 	private final Double rawAvg;
+	private final boolean rawAvgMaxGood;
 	private final Double avg;
 	private final RubricRating rating;
 	
 	public GroupedStatisticImpl(String identitfier, MultiKey multiKey, TemporalKey temporalKey, Long count,
-			Double rawAvg, Double avg, RubricRating rating) {
+			Double rawAvg, boolean rawMaxGood, Double avg, RubricRating rating) {
 		this.identitfier = identitfier;
 		this.multiKey = multiKey;
 		this.temporalKey = temporalKey;
 		this.count = count;
 		this.rawAvg = rawAvg;
 		this.avg = avg;
+		this.rawAvgMaxGood = rawMaxGood;
 		this.rating = rating;
 	}
 
@@ -76,6 +78,11 @@ public class GroupedStatisticImpl implements GroupedStatistic {
 		return rawAvg;
 	}
 
+	@Override
+	public boolean isRawAvgMaxGood() {
+		return rawAvgMaxGood;
+	}
+
 	@Override
 	public Double getAvg() {
 		return avg;

src/main/java/org/olat/modules/quality/analysis/model/TrendImpl.java

@@ -71,6 +71,11 @@ public class TrendImpl implements Trend {
 		return groupedStatistic.getRawAvg();
 	}
 
+	@Override
+	public boolean isRawAvgMaxGood() {
+		return groupedStatistic.isRawAvgMaxGood();
+	}
+
 	@Override
 	public Double getAvg() {
 		return groupedStatistic.getAvg();

src/test/java/org/olat/modules/quality/analysis/manager/StatisticsCalculatorTest.java

@@ -88,21 +88,42 @@ public class StatisticsCalculatorTest extends OlatTestCase {
 	
 	@Test
 	public void shouldCalculateTrendDirectionUp() {
-		DIRECTION direction = sut.getTrendDirection(1.0, 2.0);
+		DIRECTION direction = sut.getTrendDirection(1.0, 2.0, true);
 		
 		assertThat(direction).isEqualTo(DIRECTION.UP);
 	}
 	
 	@Test
 	public void shouldCalculateTrendDirectionDown() {
-		DIRECTION direction = sut.getTrendDirection(2.0, 1.0);
+		DIRECTION direction = sut.getTrendDirection(2.0, 1.0, true);
 		
 		assertThat(direction).isEqualTo(DIRECTION.DOWN);
 	}
 	
 	@Test
 	public void shouldCalculateTrendDirectionEqual() {
-		DIRECTION direction = sut.getTrendDirection(1.0, 1.01);
+		DIRECTION direction = sut.getTrendDirection(1.0, 1.01, true);
+		
+		assertThat(direction).isEqualTo(DIRECTION.EQUAL);
+	}
+	
+	@Test
+	public void shouldCalculateTrendDirectionDownWithRawMaxBad() {
+		DIRECTION direction = sut.getTrendDirection(1.0, 2.0, false);
+		
+		assertThat(direction).isEqualTo(DIRECTION.DOWN);
+	}
+	
+	@Test
+	public void shouldCalculateTrendDirectionUpWithRawMaxBad() {
+		DIRECTION direction = sut.getTrendDirection(2.0, 1.0, false);
+		
+		assertThat(direction).isEqualTo(DIRECTION.UP);
+	}
+	
+	@Test
+	public void shouldCalculateTrendDirectionEqualWithRawMaxBad() {
+		DIRECTION direction = sut.getTrendDirection(1.0, 1.01, false);
 		
 		assertThat(direction).isEqualTo(DIRECTION.EQUAL);
 	}
@@ -113,17 +134,17 @@ public class StatisticsCalculatorTest extends OlatTestCase {
 		TemporalKey tk2000 = TemporalKey.of(2000);
 		TemporalKey tk2005 = TemporalKey.of(2005);
 		GroupedStatistics<GroupedStatistic> statistics = new GroupedStatistics<>();
-		GroupedStatistic gs0 = new GroupedStatisticImpl(identifier1, MultiKey.none(), tk2000, 1l, 1.0, null, null);
+		GroupedStatistic gs0 = new GroupedStatisticImpl(identifier1, MultiKey.none(), tk2000, 1l, 1.0, true, null, null);
 		statistics.putStatistic(gs0);
-		GroupedStatistic gs1 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2001), 1l, 1.0, null, null);
+		GroupedStatistic gs1 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2001), 1l, 1.0, true, null, null);
 		statistics.putStatistic(gs1);
-		GroupedStatistic gs2 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2002), 1l, 2.0, null, null);
+		GroupedStatistic gs2 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2002), 1l, 2.0, true, null, null);
 		statistics.putStatistic(gs2);
-		GroupedStatistic gs3 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2003), 1l, 2.01, null, null);
+		GroupedStatistic gs3 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2003), 1l, 2.01, true, null, null);
 		statistics.putStatistic(gs3);
-		GroupedStatistic gs4 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2004), 1l, 1.0, null, null);
+		GroupedStatistic gs4 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2004), 1l, 1.0, true, null, null);
 		statistics.putStatistic(gs4);
-		GroupedStatistic gs5 = new GroupedStatisticImpl(identifier1, MultiKey.none(), tk2005, 1l, 1.0, null, null);
+		GroupedStatistic gs5 = new GroupedStatisticImpl(identifier1, MultiKey.none(), tk2005, 1l, 1.0, true, null, null);
 		statistics.putStatistic(gs5);
 		
 		MultiTrendSeries<String> multiTrendSeries = sut.getTrends(statistics, TemporalGroupBy.DATA_COLLECTION_DEADLINE_YEAR);
@@ -147,9 +168,9 @@ public class StatisticsCalculatorTest extends OlatTestCase {
 	public void shouldClaculateTrendGaps() {
 		String identifier1 = "i1";
 		GroupedStatistics<GroupedStatistic> statistics = new GroupedStatistics<>();
-		GroupedStatistic gs0 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2000), 1l, 1.0, null, null);
+		GroupedStatistic gs0 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2000), 1l, 1.0, true, null, null);
 		statistics.putStatistic(gs0);
-		GroupedStatistic gs3 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2003), 1l, 2.01, null, null);
+		GroupedStatistic gs3 = new GroupedStatisticImpl(identifier1, MultiKey.none(), TemporalKey.of(2003), 1l, 2.01, true, null, null);
 		statistics.putStatistic(gs3);
 		
 		MultiTrendSeries<String> multiTrendSeries = sut.getTrends(statistics, TemporalGroupBy.DATA_COLLECTION_DEADLINE_YEAR);