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

OO-4186: Save score in list of identities of check list course element

parent f9648cee
No related branches found
No related tags found
No related merge requests found
...@@ -252,7 +252,6 @@ public class AssessmentNotificationsHandler implements NotificationsHandler { ...@@ -252,7 +252,6 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
* <code>AssessableCourseNode</code> * <code>AssessableCourseNode</code>
* </ul> * </ul>
*/ */
//TODO uh CourseNodeSelector as well
private List<CourseNode> getCourseTestNodes(ICourse course) { private List<CourseNode> getCourseTestNodes(ICourse course) {
List<CourseNode> assessableNodes = new ArrayList<>(); List<CourseNode> assessableNodes = new ArrayList<>();
......
...@@ -85,12 +85,17 @@ public class CheckListAssessmentHandler implements AssessmentHandler { ...@@ -85,12 +85,17 @@ public class CheckListAssessmentHandler implements AssessmentHandler {
public Controller getDetailsEditController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel, public Controller getDetailsEditController(UserRequest ureq, WindowControl wControl, BreadcrumbPanel stackPanel,
CourseNode courseNode, UserCourseEnvironment coachCourseEnv, CourseNode courseNode, UserCourseEnvironment coachCourseEnv,
UserCourseEnvironment assessedUserCourseEnvironment) { UserCourseEnvironment assessedUserCourseEnvironment) {
Identity assessedIdentity = assessedUserCourseEnvironment.getIdentityEnvironment().getIdentity(); if (courseNode instanceof CheckListCourseNode) {
Long resId = assessedUserCourseEnvironment.getCourseEnvironment().getCourseResourceableId(); CheckListCourseNode clCourseNode = (CheckListCourseNode)courseNode;
OLATResourceable courseOres = OresHelper.createOLATResourceableInstance("CourseModule", resId);
Identity assessedIdentity = assessedUserCourseEnvironment.getIdentityEnvironment().getIdentity();
return new AssessedIdentityCheckListController(ureq, wControl, assessedIdentity, courseOres, coachCourseEnv, Long resId = assessedUserCourseEnvironment.getCourseEnvironment().getCourseResourceableId();
assessedUserCourseEnvironment, courseNode, false, false); OLATResourceable courseOres = OresHelper.createOLATResourceableInstance("CourseModule", resId);
return new AssessedIdentityCheckListController(ureq, wControl, assessedIdentity, courseOres, coachCourseEnv,
assessedUserCourseEnvironment, clCourseNode, false, false);
}
return null;
} }
@Override @Override
......
...@@ -44,7 +44,6 @@ import org.olat.core.id.OLATResourceable; ...@@ -44,7 +44,6 @@ import org.olat.core.id.OLATResourceable;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.course.assessment.AssessmentHelper; import org.olat.course.assessment.AssessmentHelper;
import org.olat.course.nodes.CheckListCourseNode; import org.olat.course.nodes.CheckListCourseNode;
import org.olat.course.nodes.CourseNode;
import org.olat.course.nodes.MSCourseNode; import org.olat.course.nodes.MSCourseNode;
import org.olat.course.nodes.cl.CheckboxManager; import org.olat.course.nodes.cl.CheckboxManager;
import org.olat.course.nodes.cl.model.AssessmentBatch; import org.olat.course.nodes.cl.model.AssessmentBatch;
...@@ -54,6 +53,7 @@ import org.olat.course.nodes.cl.model.DBCheck; ...@@ -54,6 +53,7 @@ import org.olat.course.nodes.cl.model.DBCheck;
import org.olat.course.nodes.cl.model.DBCheckbox; import org.olat.course.nodes.cl.model.DBCheckbox;
import org.olat.course.run.userview.UserCourseEnvironment; import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.ModuleConfiguration; import org.olat.modules.ModuleConfiguration;
import org.olat.modules.assessment.Role;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
/** /**
...@@ -70,7 +70,7 @@ public class AssessedIdentityCheckListController extends FormBasicController { ...@@ -70,7 +70,7 @@ public class AssessedIdentityCheckListController extends FormBasicController {
private final boolean withScore; private final boolean withScore;
private final boolean saveAndClose; private final boolean saveAndClose;
private final ModuleConfiguration config; private final ModuleConfiguration config;
private final CourseNode courseNode; private final CheckListCourseNode courseNode;
private final UserCourseEnvironment coachCourseEnv; private final UserCourseEnvironment coachCourseEnv;
private final UserCourseEnvironment assessedUserCourseEnv; private final UserCourseEnvironment assessedUserCourseEnv;
private final OLATResourceable courseOres; private final OLATResourceable courseOres;
...@@ -82,9 +82,10 @@ public class AssessedIdentityCheckListController extends FormBasicController { ...@@ -82,9 +82,10 @@ public class AssessedIdentityCheckListController extends FormBasicController {
@Autowired @Autowired
private CheckboxManager checkboxManager; private CheckboxManager checkboxManager;
public AssessedIdentityCheckListController(UserRequest ureq, WindowControl wControl, public AssessedIdentityCheckListController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity,
Identity assessedIdentity, OLATResourceable courseOres, UserCourseEnvironment coachCourseEnv, OLATResourceable courseOres, UserCourseEnvironment coachCourseEnv,
UserCourseEnvironment assessedUserCourseEnv, CourseNode courseNode, boolean saveAndClose, boolean cancel) { UserCourseEnvironment assessedUserCourseEnv, CheckListCourseNode courseNode, boolean saveAndClose,
boolean cancel) {
super(ureq, wControl); super(ureq, wControl);
this.cancel = cancel; this.cancel = cancel;
...@@ -285,8 +286,7 @@ public class AssessedIdentityCheckListController extends FormBasicController { ...@@ -285,8 +286,7 @@ public class AssessedIdentityCheckListController extends FormBasicController {
} }
checkboxManager.check(courseOres, courseNode.getIdent(), batchElements); checkboxManager.check(courseOres, courseNode.getIdent(), batchElements);
//TODO uh enable courseNode.updateScoreEvaluation(getIdentity(), assessedUserCourseEnv, assessedIdentity, Role.coach);
// courseNode.updateScoreEvaluation(getIdentity(), assessedUserCourseEnv, assessedIdentity, Role.coach);
} }
private void doUpdateCheck(CheckboxWrapper wrapper, boolean check) { private void doUpdateCheck(CheckboxWrapper wrapper, boolean check) {
......
...@@ -65,10 +65,9 @@ public class AssessedIdentityOverviewController extends BasicController { ...@@ -65,10 +65,9 @@ public class AssessedIdentityOverviewController extends BasicController {
private boolean changes = false; private boolean changes = false;
public AssessedIdentityOverviewController(UserRequest ureq, WindowControl wControl, public AssessedIdentityOverviewController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity,
Identity assessedIdentity, OLATResourceable courseOres, OLATResourceable courseOres, UserCourseEnvironment coachCourseEnv,
UserCourseEnvironment coachCourseEnv, UserCourseEnvironment assessedUserCourseEnv, UserCourseEnvironment assessedUserCourseEnv, CheckListCourseNode courseNode) {
CheckListCourseNode courseNode) {
super(ureq, wControl); super(ureq, wControl);
this.courseNode = courseNode; this.courseNode = courseNode;
......
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