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

OO-4444: check more options to show correction flow in assessment tool

parent 6177431c
No related branches found
No related tags found
No related merge requests found
...@@ -206,8 +206,9 @@ public class IQIdentityListCourseNodeController extends IdentityListCourseNodeCo ...@@ -206,8 +206,9 @@ public class IQIdentityListCourseNodeController extends IdentityListCourseNodeCo
resetButton = uifactory.addFormLink("tool.delete.data", formLayout, Link.BUTTON); resetButton = uifactory.addFormLink("tool.delete.data", formLayout, Link.BUTTON);
resetButton.setIconLeftCSS("o_icon o_icon_delete_item"); resetButton.setIconLeftCSS("o_icon o_icon_delete_item");
} }
if(qtiService.needManualCorrection(testEntry) String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE))) { if(!IQEditController.CORRECTION_GRADING.equals(correctionMode) &&
(IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry))) {
correctionButton = uifactory.addFormLink("correction.test.title", formLayout, Link.BUTTON); correctionButton = uifactory.addFormLink("correction.test.title", formLayout, Link.BUTTON);
correctionButton.setElementCssClass("o_sel_correction"); correctionButton.setElementCssClass("o_sel_correction");
correctionButton.setIconLeftCSS("o_icon o_icon-fw o_icon_correction"); correctionButton.setIconLeftCSS("o_icon o_icon-fw o_icon_correction");
......
...@@ -104,8 +104,10 @@ public class QTI21IdentityListCourseNodeToolsController extends AbstractToolsCon ...@@ -104,8 +104,10 @@ public class QTI21IdentityListCourseNodeToolsController extends AbstractToolsCon
this.stackPanel = stackPanel; this.stackPanel = stackPanel;
this.testCourseNode = courseNode; this.testCourseNode = courseNode;
testEntry = courseNode.getReferencedRepositoryEntry(); testEntry = courseNode.getReferencedRepositoryEntry();
manualCorrections = qtiService.needManualCorrection(testEntry)
|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE)); String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
manualCorrections = !IQEditController.CORRECTION_GRADING.equals(correctionMode)
&& (IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry));
courseEntry = coachCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry(); courseEntry = coachCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
......
...@@ -183,8 +183,9 @@ public class QTI21AssessmentDetailsController extends FormBasicController { ...@@ -183,8 +183,9 @@ public class QTI21AssessmentDetailsController extends FormBasicController {
readOnly = coachCourseEnv.isCourseReadOnly(); readOnly = coachCourseEnv.isCourseReadOnly();
testEntry = courseNode.getReferencedRepositoryEntry(); testEntry = courseNode.getReferencedRepositoryEntry();
assessedIdentity = assessedUserCourseEnv.getIdentityEnvironment().getIdentity(); assessedIdentity = assessedUserCourseEnv.getIdentityEnvironment().getIdentity();
manualCorrections = qtiService.needManualCorrection(testEntry) String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE)); manualCorrections = !IQEditController.CORRECTION_GRADING.equals(correctionMode)
&& (IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry));
RepositoryEntry courseEntry = assessedUserCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry(); RepositoryEntry courseEntry = assessedUserCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
reSecurity = repositoryManager.isAllowed(ureq, courseEntry); reSecurity = repositoryManager.isAllowed(ureq, courseEntry);
......
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