3148 SupervisorStatisticsPage: IllegalArgumentException
This commit is contained in:
parent
19840f5641
commit
2fc1b53394
view/src/main/java/se/su/dsv/scipro/statistics
@ -30,7 +30,7 @@ public class SupervisorApplicationPeriodStatisticsPanel extends GenericPanel<Use
|
||||
upcomingPeriods().stream()
|
||||
.flatMap(period -> period.getProjectTypes().stream()
|
||||
.map(projectType -> {
|
||||
final Target target = targetService.findOne(period, supervisorModel.getObject(), projectType);
|
||||
final Target target = targetService.findOne(period, getModelObject(), projectType);
|
||||
return new PeriodTypeTarget(period, projectType, target);
|
||||
}))
|
||||
.filter(ptt -> ptt.getTarget().getTarget() > 0)
|
||||
|
@ -28,7 +28,7 @@ public class SupervisorStatisticsPanel extends Panel {
|
||||
ideaPanel = new SupervisorIdeaStatisticsPanel(IDEAS_PANEL);
|
||||
ideaPanel.setOutputMarkupPlaceholderTag(true);
|
||||
add(ideaPanel);
|
||||
periodStatisticsPanel = new SupervisorApplicationPeriodStatisticsPanel("periods", new Model<>()) {
|
||||
periodStatisticsPanel = new SupervisorApplicationPeriodStatisticsPanel("periods", new DetachableServiceModel<>(userService)) {
|
||||
@Override
|
||||
protected void onConfigure() {
|
||||
super.onConfigure();
|
||||
@ -47,7 +47,7 @@ public class SupervisorStatisticsPanel extends Panel {
|
||||
protected void action(AjaxRequestTarget pTarget, User newSelection) {
|
||||
projectPanel.updateSupervisor(newSelection);
|
||||
ideaPanel.updateSupervisor(newSelection);
|
||||
periodStatisticsPanel.setModel(getModel());
|
||||
periodStatisticsPanel.setModelObject(getModelObject());
|
||||
pTarget.add(projectPanel);
|
||||
pTarget.add(ideaPanel);
|
||||
pTarget.add(periodStatisticsPanel);
|
||||
|
Loading…
x
Reference in New Issue
Block a user