Skip to content
Snippets Groups Projects
Commit e5e73f42 authored by uhensler's avatar uhensler
Browse files

OO-3966: Show title in data collection report

parent f78562cf
No related branches found
No related tags found
No related merge requests found
...@@ -66,6 +66,7 @@ public class EvaluationFormReportsController extends BasicController { ...@@ -66,6 +66,7 @@ public class EvaluationFormReportsController extends BasicController {
private final SessionFilter filter; private final SessionFilter filter;
private final Figures figures; private final Figures figures;
private final ReportHelper reportHelper; private final ReportHelper reportHelper;
private final String title;
@Autowired @Autowired
private PdfModule pdfModule; private PdfModule pdfModule;
...@@ -76,16 +77,17 @@ public class EvaluationFormReportsController extends BasicController { ...@@ -76,16 +77,17 @@ public class EvaluationFormReportsController extends BasicController {
public EvaluationFormReportsController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage, SessionFilter filter, public EvaluationFormReportsController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage, SessionFilter filter,
ReportSegment show) { ReportSegment show) {
this(ureq, wControl, form, storage, filter, show, null, null); this(ureq, wControl, form, storage, filter, show, null, null, null);
} }
public EvaluationFormReportsController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage, SessionFilter filter, public EvaluationFormReportsController(UserRequest ureq, WindowControl wControl, Form form, DataStorage storage, SessionFilter filter,
ReportSegment show, Component formHeader, Figures figures) { ReportSegment show, Component formHeader, Figures figures, String title) {
super(ureq, wControl); super(ureq, wControl);
this.form = form; this.form = form;
this.storage = storage; this.storage = storage;
this.filter = filter; this.filter = filter;
this.figures = figures; this.figures = figures;
this.title = title;
Comparator<EvaluationFormSession> comparator = new NameShuffleAnonymousComparator(); Comparator<EvaluationFormSession> comparator = new NameShuffleAnonymousComparator();
LegendNameGenerator legendNameGenerator = new SessionInformationLegendNameGenerator(filter); LegendNameGenerator legendNameGenerator = new SessionInformationLegendNameGenerator(filter);
...@@ -163,7 +165,7 @@ public class EvaluationFormReportsController extends BasicController { ...@@ -163,7 +165,7 @@ public class EvaluationFormReportsController extends BasicController {
private void doOpenPrintSelection(UserRequest ureq, Link targetLink, Target target) { private void doOpenPrintSelection(UserRequest ureq, Link targetLink, Target target) {
removeAsListenerAndDispose(printSelectionCtrl); removeAsListenerAndDispose(printSelectionCtrl);
printSelectionCtrl = new EvaluationFormPrintSelectionController(ureq, getWindowControl(), form, storage, printSelectionCtrl = new EvaluationFormPrintSelectionController(ureq, getWindowControl(), form, storage,
filter, figures, reportHelper, target); filter, figures, reportHelper, target, title);
listenTo(printSelectionCtrl); listenTo(printSelectionCtrl);
removeAsListenerAndDispose(calloutCtrl); removeAsListenerAndDispose(calloutCtrl);
......
...@@ -78,7 +78,7 @@ public class DataCollectionReportController extends FormBasicController { ...@@ -78,7 +78,7 @@ public class DataCollectionReportController extends FormBasicController {
Figures figures = FiguresFactory.createOverviewFigures(dataCollection, dataCollectionView, getLocale()); Figures figures = FiguresFactory.createOverviewFigures(dataCollection, dataCollectionView, getLocale());
reportsCtrl = new EvaluationFormReportsController(ureq, getWindowControl(), form, storage, reportsCtrl = new EvaluationFormReportsController(ureq, getWindowControl(), form, storage,
filter, ReportSegment.OVERVIEW, reportHeaderCtrl.getInitialComponent(), figures); filter, ReportSegment.OVERVIEW, reportHeaderCtrl.getInitialComponent(), figures, dataCollection.getTitle());
flc.put("report", reportsCtrl.getInitialComponent()); flc.put("report", reportsCtrl.getInitialComponent());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment