OO-3819: Refactoring to corresponding names

src/main/java/org/olat/modules/quality/analysis/ui/HeatMapController.java

@@ -527,7 +527,7 @@ public class HeatMapController extends FormBasicController implements Filterable
 	private void doShowTrend(UserRequest ureq, HeatMapRow row) {
 		MultiKey multiKey = row.getMultiKey();
 		AnalysisSearchParameter trendSearchParameter = getTrendSearchParams(multiKey);
-		trendCtrl = new QuestionTrendController(ureq, getWindowControl(), sliders, trendSearchParameter);
+		trendCtrl = new SliderTrendController(ureq, getWindowControl(), sliders, trendSearchParameter);
 		listenTo(trendCtrl);
 		stackPanel.changeDisplayname(translate("analysis.trend"));
 		stackPanel.pushController(getTrendTitle(multiKey), trendCtrl);

src/main/java/org/olat/modules/quality/analysis/ui/QuestionTrendController.java → src/main/java/org/olat/modules/quality/analysis/ui/SliderTrendController.java

@@ -56,10 +56,10 @@ import edu.emory.mathcs.backport.java.util.Arrays;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class QuestionTrendController extends FormBasicController {
+public class SliderTrendController extends FormBasicController {
 
 	private SingleSelection temporalGroupEl;
-	private QuestionTrendDataModel dataModel;
+	private SliderTrendDataModel dataModel;
 	private FlexiTableElement tableEl;
 	
 	private final List<SliderWrapper> sliders;
@@ -69,7 +69,7 @@ public class QuestionTrendController extends FormBasicController {
 	@Autowired
 	private QualityAnalysisService analysisService;
 
-	public QuestionTrendController(UserRequest ureq, WindowControl wControl, List<SliderWrapper> sliders,
+	public SliderTrendController(UserRequest ureq, WindowControl wControl, List<SliderWrapper> sliders,
 			AnalysisSearchParameter searchParams) {
 		super(ureq, wControl, LAYOUT_BAREBONE);
 		this.sliders = sliders;
@@ -79,12 +79,12 @@ public class QuestionTrendController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		String groupPage = velocity_root + "/question_trend_grouping.html";
+		String groupPage = velocity_root + "/slider_trend_grouping.html";
 		FormLayoutContainer groupingCont = FormLayoutContainer.createCustomFormLayout("grouping", getTranslator(), groupPage);
 		flc.add("grouping", groupingCont);
 		
 		KeyValues temporalKV = AnalysisUIFactory.getTemporalGroupByKeyValues(getTranslator());
-		temporalGroupEl = uifactory.addDropdownSingleselect("question.trend.group.temporal", groupingCont,
+		temporalGroupEl = uifactory.addDropdownSingleselect("slider.trend.group.temporal", groupingCont,
 				temporalKV.keys(), temporalKV.values());
 		temporalGroupEl.addActionListener(FormEvent.ONCHANGE);
 		String key = AnalysisUIFactory.getKey(temporalGroupBy);
@@ -105,19 +105,19 @@ public class QuestionTrendController extends FormBasicController {
 	private void updateTable(List<String> temporalHeaders) {
 		int columnIndex = 0;
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("question.trend.table.title.question", columnIndex++));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("slider.trend.table.title.question", columnIndex++));
 		for (String header: temporalHeaders) {
-			DefaultFlexiColumnModel columnModel = new DefaultFlexiColumnModel("question.trend.table.title.question", columnIndex++);
+			DefaultFlexiColumnModel columnModel = new DefaultFlexiColumnModel("slider.trend.table.title.question", columnIndex++);
 			columnModel.setHeaderLabel(header);
 			columnModel.setCellRenderer(new TrendRenderer());
 			columnsModel.addFlexiColumnModel(columnModel);
 		}
 		
-		dataModel = new QuestionTrendDataModel(columnsModel, getLocale());
+		dataModel = new SliderTrendDataModel(columnsModel, getLocale());
 		if (tableEl != null) flc.remove(tableEl);
 		tableEl = uifactory.addTableElement(getWindowControl(), "table", dataModel, getTranslator(), flc);
-		tableEl.setElementCssClass("o_qual_question_trend");
-		tableEl.setEmtpyTableMessageKey("question.trend.empty");
+		tableEl.setElementCssClass("o_qual_slider_trend");
+		tableEl.setEmtpyTableMessageKey("slider.trend.empty");
 		tableEl.setNumOfRowsEnabled(false);
 		tableEl.setCustomizeColumns(false);
 	}
@@ -129,11 +129,11 @@ public class QuestionTrendController extends FormBasicController {
 	}
 
 	private void updateModel(MultiTrendSeries<String> multiTrendSeries) {
-		List<QuestionTrendRow> rows = new ArrayList<>();
+		List<SliderTrendRow> rows = new ArrayList<>();
 		for (SliderWrapper slider : sliders) {
 			String question = slider.getLabel();
 			TrendSeries trendSeries = multiTrendSeries.getSeries(slider.getIdentifier());
-			QuestionTrendRow row = new QuestionTrendRow(question, trendSeries);
+			SliderTrendRow row = new SliderTrendRow(question, trendSeries);
 			rows.add(row);
 		}
 		dataModel.setObjects(rows);
@@ -145,8 +145,8 @@ public class QuestionTrendController extends FormBasicController {
 		List<String> headers = new ArrayList<>(temporalKeys.size());
 		for (TemporalKey temporalKey : temporalKeys) {
 			String header = TemporalKey.NO_VALUE == temporalKey.getYearPart()
-					? translate("question.trend.table.year", new String[] { Integer.toString(temporalKey.getYear()) })
-					: translate("question.trend.table.year.part", new String[] {
+					? translate("slider.trend.table.year", new String[] { Integer.toString(temporalKey.getYear()) })
+					: translate("slider.trend.table.year.part", new String[] {
 							Integer.toString(temporalKey.getYear()), Integer.toString(temporalKey.getYearPart()) });
 			headers.add(header);
 		}

src/main/java/org/olat/modules/quality/analysis/ui/QuestionTrendDataModel.java → src/main/java/org/olat/modules/quality/analysis/ui/SliderTrendDataModel.java

@@ -34,30 +34,30 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.SortableFl
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-class QuestionTrendDataModel extends DefaultFlexiTableDataModel<QuestionTrendRow>
-		implements SortableFlexiTableDataModel<QuestionTrendRow> {
+class SliderTrendDataModel extends DefaultFlexiTableDataModel<SliderTrendRow>
+		implements SortableFlexiTableDataModel<SliderTrendRow> {
 	
 	private final Locale locale;
 	
-	QuestionTrendDataModel(FlexiTableColumnModel columnsModel, Locale locale) {
+	SliderTrendDataModel(FlexiTableColumnModel columnsModel, Locale locale) {
 		super(columnsModel);
 		this.locale = locale;
 	}
 	
 	@Override
 	public void sort(SortKey orderBy) {
-		List<QuestionTrendRow> rows = new SortableFlexiTableModelDelegate<>(orderBy, this, locale).sort();
+		List<SliderTrendRow> rows = new SortableFlexiTableModelDelegate<>(orderBy, this, locale).sort();
 		super.setObjects(rows);
 	}
 
 	@Override
 	public Object getValueAt(int row, int col) {
-		QuestionTrendRow generator = getObject(row);
+		SliderTrendRow generator = getObject(row);
 		return getValueAt(generator, col);
 	}
 
 	@Override
-	public Object getValueAt(QuestionTrendRow row, int col) {
+	public Object getValueAt(SliderTrendRow row, int col) {
 		if (col == 0) {
 			return row.getQuestion();
 		}
@@ -65,8 +65,8 @@ class QuestionTrendDataModel extends DefaultFlexiTableDataModel<QuestionTrendRow
 	}
 
 	@Override
-	public DefaultFlexiTableDataModel<QuestionTrendRow> createCopyWithEmptyList() {
-		return new QuestionTrendDataModel(getTableColumnModel(), locale);
+	public DefaultFlexiTableDataModel<SliderTrendRow> createCopyWithEmptyList() {
+		return new SliderTrendDataModel(getTableColumnModel(), locale);
 	}
 	
 }

src/main/java/org/olat/modules/quality/analysis/ui/QuestionTrendRow.java → src/main/java/org/olat/modules/quality/analysis/ui/SliderTrendRow.java

@@ -28,12 +28,12 @@ import org.olat.modules.quality.analysis.TrendSeries;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class QuestionTrendRow {
+public class SliderTrendRow {
 	
 	private final String question;
 	private final TrendSeries trendSerie;
 
-	public QuestionTrendRow(String question, TrendSeries trendSeries) {
+	public SliderTrendRow(String question, TrendSeries trendSeries) {
 		this.question = question;
 		this.trendSerie = trendSeries;
 	}

src/main/java/org/olat/modules/quality/analysis/ui/_content/question_trend_grouping.html → src/main/java/org/olat/modules/quality/analysis/ui/_content/slider_trend_grouping.html

 #set($col = "col-sm-3")
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<h4 class="panel-title">$r.translate("question.trend.group.panel.header")</h4>
+		<h4 class="panel-title">$r.translate("slider.trend.group.panel.header")</h4>
 	</div>
 	<div class="panel-body">
 		<div class='row'>
 			<div class="$col">
-				$r.render("question.trend.group.temporal")
+				$r.render("slider.trend.group.temporal")
 			</div>
 		</div>
 	</div>

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

@@ -80,11 +80,6 @@ presentation.edit=Ansicht speichern
 presentation.name=Name
 presentation.replace.button=Ersetzen
 presentation.replace.selection=Gespeicherte Ansicht ersetzen
-question.trend.empty=Das Trenddiagramm enth\u00E4lt keine Daten
-question.trend.table.title.question=Frage
-question.trend.table.year.part={1}.{0}
-question.trend.table.year={0}
-question.trend.group.panel.header=Gruppierung
 report.figure.form.name=Fragebogen
 report.figure.number.data.collections=Anzahl Datenerhebungen
 segments.heatmap.breadcrumb=Heatmap
@@ -92,6 +87,11 @@ segments.heatmap.link=Heatmap
 segments.report.breadcrumb=Report
 segments.report.link=Report
 segments.trend.link=Trend
+slider.trend.empty=Das Trenddiagramm enth\u00E4lt keine Daten
+slider.trend.group.panel.header=Gruppierung
+slider.trend.table.title.question=Frage
+slider.trend.table.year.part={1}.{0}
+slider.trend.table.year={0}
 trend.group.data.collection.deadline.half.year=Halbjahr
 trend.group.data.collection.deadline.month=Monat
 trend.group.data.collection.deadline.quarter=Quartal

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

@@ -80,11 +80,6 @@ presentation.edit=Save view
 presentation.name=Name
 presentation.replace.button=Replace
 presentation.replace.selection=Replace saved view
-question.trend.empty=The trend diagram contains no data.
-question.trend.group.panel.header=Grouping
-question.trend.table.title.question=Question
-question.trend.table.year.part={0}-{1}
-question.trend.table.year={0}
 report.figure.form.name=Questionnaire
 report.figure.number.data.collections=Number of data collections
 segments.heatmap.breadcrumb=Heat map
@@ -92,6 +87,11 @@ segments.heatmap.link=Heat map
 segments.report.breadcrumb=Report
 segments.report.link=Report
 segments.trend.link=Trend
+slider.trend.empty=The trend diagram contains no data.
+slider.trend.group.panel.header=Grouping
+slider.trend.table.title.question=Question
+slider.trend.table.year.part={0}-{1}
+slider.trend.table.year={0}
 trend.group.data.collection.deadline.half.year=Half year
 trend.group.data.collection.deadline.month=Month
 trend.group.data.collection.deadline.quarter=Quarter

src/main/webapp/static/themes/light/modules/_quality.scss

@@ -182,7 +182,7 @@
 	}
 }
 
-.o_qual_question_trend {
+.o_qual_slider_trend {
 	.o_qual_ana_trend_up {
 		transform: rotate(315deg);
 		-webkit-transform: rotate(315deg);