Skip to content
Snippets Groups Projects
Commit 0766c281 authored by srosse's avatar srosse
Browse files

OO-934: the efficiency statement event must redraw only the link to open the...

OO-934: the efficiency statement event must redraw only the link to open the efficiency statement and not the whole page
parent c6935eec
No related branches found
No related tags found
No related merge requests found
...@@ -191,6 +191,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -191,6 +191,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
private final MarkManager markManager; private final MarkManager markManager;
private final BusinessGroupService businessGroupService; private final BusinessGroupService businessGroupService;
private final EfficiencyStatementManager efficiencyStatementManager;
/** /**
* Constructor for the run main controller * Constructor for the run main controller
...@@ -212,6 +213,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -212,6 +213,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class); businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
markManager = CoreSpringFactory.getImpl(MarkManager.class); markManager = CoreSpringFactory.getImpl(MarkManager.class);
efficiencyStatementManager = CoreSpringFactory.getImpl(EfficiencyStatementManager.class);
this.course = course; this.course = course;
addLoggingResourceable(LoggingResourceable.wrap(course)); addLoggingResourceable(LoggingResourceable.wrap(course));
...@@ -924,12 +926,9 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -924,12 +926,9 @@ public class RunMainController extends MainLayoutBasicController implements Gene
assessmentChangedEventReceived = true; assessmentChangedEventReceived = true;
} else if (assessmentChangeType.equals(AssessmentChangedEvent.TYPE_EFFICIENCY_STATEMENT_CHANGED)) { } else if (assessmentChangeType.equals(AssessmentChangedEvent.TYPE_EFFICIENCY_STATEMENT_CHANGED)) {
// update tools, maybe efficiency statement link has changed // update tools, maybe efficiency statement link has changed
removeAsListenerAndDispose(toolC); UserEfficiencyStatement es = efficiencyStatementManager
toolC = initToolController(identity, null); .getUserEfficiencyStatementLight(courseRepositoryEntry.getKey(), identity);
listenTo(toolC); toolC.setEnabled("command.efficiencystatement", (es != null));
Component toolComp = (toolC == null ? null : toolC.getInitialComponent());
columnLayoutCtr.setCol2(toolComp);
} }
// raise a flag to indicate refresh // raise a flag to indicate refresh
needsRebuildAfterRunDone = true; needsRebuildAfterRunDone = true;
...@@ -1096,8 +1095,8 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -1096,8 +1095,8 @@ public class RunMainController extends MainLayoutBasicController implements Gene
// data exists for user // data exists for user
myTool.addPopUpLink("efficiencystatement", translate("command.efficiencystatement"), "command.efficiencystatement", null, myTool.addPopUpLink("efficiencystatement", translate("command.efficiencystatement"), "command.efficiencystatement", null,
"750", "800", false); "750", "800", false);
EfficiencyStatementManager esm = EfficiencyStatementManager.getInstance(); UserEfficiencyStatement es = efficiencyStatementManager
UserEfficiencyStatement es = esm.getUserEfficiencyStatementLight(courseRepositoryEntry.getKey(), identity); .getUserEfficiencyStatementLight(courseRepositoryEntry.getKey(), identity);
if (es == null) { if (es == null) {
myTool.setEnabled("command.efficiencystatement", false); myTool.setEnabled("command.efficiencystatement", false);
} }
......
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