OO-4124: Counts have an offset in the diagram of a rubric, formatting

src/main/java/org/olat/course/nodes/ms/MSStatisticController.java

@@ -45,7 +45,6 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.id.Identity;
 import org.olat.core.util.StringHelper;
-import org.olat.core.util.filter.FilterFactory;
 import org.olat.course.archiver.ScoreAccountingHelper;
 import org.olat.course.assessment.ui.tool.AssessmentToolConstants;
 import org.olat.course.nodes.MSCourseNode;
@@ -173,7 +172,6 @@ public class MSStatisticController extends FormBasicController {
 			String labelCode = translate("tool.stats.table.title.slider", new String[] { 
 					Integer.toString(rubricWrapper.getLabelIndex()), Integer.toString(counter) });
 			String label = EvaluationFormFormatter.formatSliderLabel(slider);
-			label = FilterFactory.getHtmlTagAndDescapingFilter().filter(label);
 			SliderWrapper sliderWrapper = new SliderWrapper(slider, labelCode, label);
 			rubricWrapper.addSlider(sliderWrapper);
 			counter++;

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

@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
+import org.olat.core.util.filter.FilterFactory;
 import org.olat.modules.forms.model.xml.Slider;
 
 /**
@@ -101,13 +102,14 @@ public class EvaluationFormFormatter {
 	public static String formatSliderLabel(Slider slider) {
 		boolean hasStartLabel = StringHelper.containsNonWhitespace(slider.getStartLabel());
 		boolean hasEndLabel = StringHelper.containsNonWhitespace(slider.getEndLabel());
+		String label = null;
 		if (hasStartLabel && hasEndLabel) {
-			return slider.getStartLabel() + " ... " + slider.getEndLabel();
+			label = slider.getStartLabel() + " ... " + slider.getEndLabel();
 		} else if (hasStartLabel) {
-			return slider.getStartLabel();
+			label = slider.getStartLabel();
 		} else if (hasEndLabel) {
-			return slider.getEndLabel();
+			label = slider.getEndLabel();
 		}
-		return null;
+		return label != null? FilterFactory.getHtmlTagAndDescapingFilter().filter(label): null;
 	}
 }

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

@@ -96,7 +96,7 @@ public class RubricDataModel extends DefaultFlexiTableDataModel<RubricRow> imple
 		if (col - offset == 5) {
 			return rubricRow.getAvg();
 		}
-		return rubricRow.getStepCount(col - 1);
+		return rubricRow.getStepCount(col);
 	}
 
 	@Override