OO-3966: Title in print view

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

@@ -69,9 +69,9 @@ public class EvaluationFormPrintController extends BasicController {
 	@Autowired
 	private EvaluationFormsModule evaluationFormsModule;
 
-	public EvaluationFormPrintController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage, SessionFilter filter,
-			Figures figures, ReportHelper reportHelper,
-			EvaluationFormPrintSelection printSelection) {
+	public EvaluationFormPrintController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage,
+			SessionFilter filter, Figures figures, ReportHelper reportHelper,
+			EvaluationFormPrintSelection printSelection, String title) {
 		super(ureq, wControl);
 		this.form = form;
 		this.storage = storage;
@@ -79,6 +79,7 @@ public class EvaluationFormPrintController extends BasicController {
 		this.reportHelper = reportHelper;
 
 		mainVC = createVelocityContainer("report_print");
+		mainVC.contextPut("mainTitle", title);
 		if (printSelection.isOverview()) {
 			Controller overviewCtrl = new EvaluationFormOverviewController(ureq, getWindowControl(), form, storage, filter, figures);
 			mainVC.put("overview", overviewCtrl.getInitialComponent());

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

@@ -43,21 +43,23 @@ public class EvaluationFormPrintControllerCreator implements ControllerCreator {
 	private final Figures figures;
 	private final ReportHelper reportHelper;
 	private final EvaluationFormPrintSelection printSelection;
+	private final String title;
 
 	public EvaluationFormPrintControllerCreator(Form form, DataStorage storage, SessionFilter filter, Figures figures,
-			ReportHelper reportHelper, EvaluationFormPrintSelection printSelection) {
+			ReportHelper reportHelper, EvaluationFormPrintSelection printSelection, String title) {
 		this.form = form;
 		this.storage = storage;
 		this.filter = filter;
 		this.figures = figures;
 		this.reportHelper = reportHelper;
 		this.printSelection = printSelection;
+		this.title = title;
 	}
 
 	@Override
 	public Controller createController(UserRequest lureq, WindowControl lwControl) {
 		return new EvaluationFormPrintController(lureq, lwControl, form, storage,
-				filter, figures, reportHelper, printSelection);
+				filter, figures, reportHelper, printSelection, title);
 	}
 
 }

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

@@ -79,20 +79,28 @@ public class EvaluationFormPrintSelectionController extends FormBasicController
 	private final ReportHelper reportHelper;
 	private final Target target;
 	private final EvaluationFormPrintSelection printSelection;
+	private final String title;
 	
 	@Autowired
 	private PdfModule pdfModule;
 	@Autowired
 	private PdfService pdfService;
-
+	
 	public EvaluationFormPrintSelectionController(UserRequest ureq, WindowControl wControl, Form form,
 			DataStorage storage, SessionFilter filter, Figures figures, ReportHelper reportHelper, Target target) {
+		this(ureq, wControl, form, storage, filter, figures, reportHelper, target, null);
+	}
+
+	public EvaluationFormPrintSelectionController(UserRequest ureq, WindowControl wControl, Form form,
+			DataStorage storage, SessionFilter filter, Figures figures, ReportHelper reportHelper, Target target,
+			String title) {
 		super(ureq, wControl, "report_print_selection");
 		this.form = form;
 		this.storage = storage;
 		this.filter = filter;
 		this.figures = figures;
 		this.reportHelper = reportHelper;
+		this.title = title;
 		this.target = target;
 		this.printSelection = new EvaluationFormPrintSelection();
 		this.printSelection.setOverview(true);
@@ -175,7 +183,7 @@ public class EvaluationFormPrintSelectionController extends FormBasicController
 	}
 	
 	private ControllerCreator getControllerCreator() {
-		return new EvaluationFormPrintControllerCreator(form, storage, filter, figures, reportHelper, printSelection);
+		return new EvaluationFormPrintControllerCreator(form, storage, filter, figures, reportHelper, printSelection, title);
 	}
 
 	@Override

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

@@ -3,20 +3,23 @@
 		<span class="o_navbar-brand"></span>
 	</div>
 	<div class="o_eva_content">
+		#if($r.isNotNull($mainTitle))
+			<h2>$mainTitle</h2>
+		#end
 		#if($r.available("overview"))
-			<h1>$r.translate("report.print.title.overview")</h1> 
+			<h3>$r.translate("report.print.title.overview")</h3> 
 			<div class="o_print_overview o_print_break_after">$r.render("overview")</div>
 		#end
 		#if($r.available("tables"))
-			<h1>$r.translate("report.print.title.tables")</h1> 
+			<h3>$r.translate("report.print.title.tables")</h3> 
 			<div class="o_print_tables o_print_break_after">$r.render("tables")</div>
 		#end
 		#if($r.available("diagrams"))
-			<h1>$r.translate("report.print.title.diagrams")</h1> 
+			<h3>$r.translate("report.print.title.diagrams")</h3> 
 			<div class="o_print_diagrams o_print_break_after">$r.render("diagrams")</div>
 		#end
 		#foreach($sessionWrapper in $sessionWrappers)
-			<h1>$sessionWrapper.getLegendName()</h1> 
+			<h3>$sessionWrapper.getLegendName()</h3> 
 			<div class="o_print_session o_print_break_after">$r.render("$sessionWrapper.getComponentName()")</div>
 		#end
 	</div>

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

@@ -566,7 +566,7 @@ public class AnalysisController extends BasicController implements TooledControl
 	private void doOpenPrintSelection(UserRequest ureq, Link targetLink, Target target) {
 		removeAsListenerAndDispose(printSelectionCtrl);
 		printSelectionCtrl = new EvaluationFormPrintSelectionController(ureq, getWindowControl(), form, storage, getReportSessionFilter(),
-				getReportFigures(), getReportHelper(), target);
+				getReportFigures(), getReportHelper(), target, presentation.getFormEntry().getDisplayname());
 		listenTo(printSelectionCtrl);
 
 		removeAsListenerAndDispose(calloutCtrl);

src/main/java/org/olat/modules/quality/manager/QualityMailing.java

@@ -424,7 +424,8 @@ class QualityMailing {
 		ReportHelper reportHelper = ReportHelper.builder(locale).withLegendNameGenrator(legendNameGenerator)
 				.withSessionComparator(comparator).withColors().build();
 
-		return new EvaluationFormPrintControllerCreator(form, storage, filter, figures, reportHelper, printSelection);
+		return new EvaluationFormPrintControllerCreator(form, storage, filter, figures, reportHelper, printSelection,
+				dataCollection.getTitle());
 	}
 
 }