diff --git a/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java b/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
index 5e98c26c4c5b3d7e8697f0f98806bbb4d66236c7..acb7c85a373cd79290844f8973bfeb34d5080eca 100644
--- a/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
+++ b/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
@@ -378,9 +378,9 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ
ScoreEvaluation se;
if (hasPassed && cut != null){
Boolean passed = (score.floatValue() >= cut.floatValue()) ? Boolean.TRUE : Boolean.FALSE;
- se = new ScoreEvaluation(score, passed, datas.getStatus(), datas.getVisibility(), null, null, null, null);
+ se = new ScoreEvaluation(score, passed, datas.getStatus(), datas.getVisibility(), null, null, null);
} else {
- se = new ScoreEvaluation(score, null, datas.getStatus(), datas.getVisibility(), null, null, null, null);
+ se = new ScoreEvaluation(score, null, datas.getStatus(), datas.getVisibility(), null, null, null);
}
// Update score,passed properties in db, and the user's efficiency statement
@@ -393,7 +393,7 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ
if (hasPassed && passed != null && cut == null) { // Configuration of manual assessment --> Display passed/not passed: yes, Type of display: Manual by tutor
ScoreEvaluation seOld = courseAssessmentService.getAssessmentEvaluation(courseNode, uce);
Float oldScore = seOld.getScore();
- ScoreEvaluation se = new ScoreEvaluation(oldScore, passed, datas.getStatus(), datas.getVisibility(), null, null, null, null);
+ ScoreEvaluation se = new ScoreEvaluation(oldScore, passed, datas.getStatus(), datas.getVisibility(), null, null, null);
// Update score,passed properties in db, and the user's efficiency statement
boolean incrementAttempts = false;
courseAssessmentService.updateScoreEvaluation(courseNode, se, uce, coachIdentity, incrementAttempts, Role.auto);
@@ -427,8 +427,8 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ
if(!statusVisibilitySet && (datas.getStatus() != null || datas.getVisibility() != null)) {
ScoreEvaluation seOld = courseAssessmentService.getAssessmentEvaluation(courseNode, uce);
ScoreEvaluation se = new ScoreEvaluation(seOld.getScore(), seOld.getPassed(),
- datas.getStatus(), datas.getVisibility(), seOld.getFullyAssessed(),
- seOld.getCurrentRunCompletion(), seOld.getCurrentRunStatus(), seOld.getAssessmentID());
+ datas.getStatus(), datas.getVisibility(), seOld.getCurrentRunCompletion(),
+ seOld.getCurrentRunStatus(), seOld.getAssessmentID());
// Update score,passed properties in db, and the user's efficiency statement
boolean incrementAttempts = false;
courseAssessmentService.updateScoreEvaluation(courseNode, se, uce, coachIdentity, incrementAttempts, Role.auto);
diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
index 5f25d31fe13ae901456562df094cfda6d0d4f348..cd2da119c659170a29f3bed2c21c648411d66d6d 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
@@ -501,7 +501,6 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
assessmentEntry.setScore(new BigDecimal(Float.toString(score)));
}
assessmentEntry.setPassed(passed);
- assessmentEntry.setFullyAssessed(scoreEvaluation.getFullyAssessed());
if(assessmentId != null) {
assessmentEntry.setAssessmentId(assessmentId);
}
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
index 27c8f0d3486be3173df413b5022552335a3c2166..285fa234e31518e4ca93ee88d92f2debbe3952a4 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
@@ -334,8 +334,8 @@ public class AssessmentForm extends FormBasicController {
ScoreEvaluation scoreEval = assessedUserCourseEnv.getScoreAccounting().evalCourseNode(courseNode);
if (scoreEval != null) {
ScoreEvaluation reopenedEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.inReview, scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
+ AssessmentEntryStatus.inReview, scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, reopenedEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
updateStatus(reopenedEval);
@@ -388,9 +388,9 @@ public class AssessmentForm extends FormBasicController {
// Update score,passed properties in db
ScoreEvaluation scoreEval;
if(setAsDone) {
- scoreEval = new ScoreEvaluation(updatedScore, updatedPassed, AssessmentEntryStatus.done, visibility, null, null, null, null);
+ scoreEval = new ScoreEvaluation(updatedScore, updatedPassed, AssessmentEntryStatus.done, visibility, null, null, null);
} else {
- scoreEval = new ScoreEvaluation(updatedScore, updatedPassed, null, visibility, null, null, null, null);
+ scoreEval = new ScoreEvaluation(updatedScore, updatedPassed, null, visibility, null, null, null);
}
courseAssessmentService.updateScoreEvaluation(courseNode, scoreEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
index 5ea18a139047f5d53b5353c461ed1b5230f24d69..d1de817632cba086d7c32a22b8d3d4f2d2926b88 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
@@ -840,8 +840,8 @@ public class IdentityListCourseNodeController extends FormBasicController
ScoreEvaluation scoreEval = courseAssessmentService.getAssessmentEvaluation(courseNode, assessedUserCourseEnv);
ScoreEvaluation doneEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- scoreEval.getAssessmentStatus(), visibility, scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
+ scoreEval.getAssessmentStatus(), visibility, scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, doneEval, assessedUserCourseEnv, getIdentity(),
false, Role.coach);
}
@@ -879,8 +879,8 @@ public class IdentityListCourseNodeController extends FormBasicController
ScoreEvaluation scoreEval = courseAssessmentService.getAssessmentEvaluation(courseNode, assessedUserCourseEnv);
ScoreEvaluation doneEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.done, null, scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
+ AssessmentEntryStatus.done, null, scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, doneEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java b/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java
index 281c7d5fbb197b58d32d2d1cb1e5adfc05931d3a..8345ac26f0c7c90f1007b4e8ec9da11f38a47195 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java
@@ -238,9 +238,8 @@ public abstract class AbstractToolsController extends BasicController {
protected void reopenEvaluation() {
ScoreEvaluation reopenedEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.inReview, scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), AssessmentRunStatus.running,
- scoreEval.getAssessmentID());
+ AssessmentEntryStatus.inReview, scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ AssessmentRunStatus.running, scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, reopenedEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
}
@@ -254,9 +253,8 @@ public abstract class AbstractToolsController extends BasicController {
protected void doneEvalution() {
ScoreEvaluation doneEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.done, scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(),
- scoreEval.getAssessmentID());
+ AssessmentEntryStatus.done, scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, doneEval, assessedUserCourseEnv, getIdentity(),
false, Role.coach);
}
@@ -264,9 +262,8 @@ public abstract class AbstractToolsController extends BasicController {
private void doSetVisibility(UserRequest ureq, boolean visible) {
if (scoreEval != null) {
ScoreEvaluation doneEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.done, visible, scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(),
- scoreEval.getAssessmentID());
+ AssessmentEntryStatus.done, visible, scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
courseAssessmentService.updateScoreEvaluation(courseNode, doneEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
}
diff --git a/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java b/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
index 008240e9cdbad77a1b812cd393ae4a2e3350d63c..a01d7a10b915a6dcc4ffb27378791c43e293124d 100644
--- a/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
@@ -335,7 +335,7 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se
Float score = am.getNodeScore(this, mySelf);
Long assessmentID = am.getAssessmentID(this, mySelf);
Boolean fullyAssessed = am.getNodeFullyAssessed(this, mySelf);
- scoreEvaluation = new ScoreEvaluation(score, passed, fullyAssessed, assessmentID);
+ scoreEvaluation = new ScoreEvaluation(score, passed, assessmentID);
} else if(referencedRepositoryEntry != null && ImsQTI21Resource.TYPE_NAME.equals(referencedRepositoryEntry.getOlatResource().getResourceableTypeName())) {
RepositoryEntry courseEntry = userCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
Identity assessedIdentity = userCourseEnv.getIdentityEnvironment().getIdentity();
@@ -344,7 +344,7 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se
if(testSession != null) {
boolean fullyAssessed = (testSession.getFinishTime() != null || testSession.getTerminationTime() != null);
Float score = testSession.getScore() == null ? null : testSession.getScore().floatValue();
- return new ScoreEvaluation(score, testSession.getPassed(), fullyAssessed, testSession.getKey());
+ return new ScoreEvaluation(score, testSession.getPassed(), testSession.getKey());
}
} else {
Identity identity = userCourseEnv.getIdentityEnvironment().getIdentity();
@@ -353,7 +353,7 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se
if (qTIResultSet != null) {
Boolean passed = qTIResultSet.getIsPassed();
Boolean fullyAssessed = qTIResultSet.getFullyAssessed();
- scoreEvaluation = new ScoreEvaluation(Float.valueOf(qTIResultSet.getScore()), passed, fullyAssessed, new Long(qTIResultSet.getAssessmentID()));
+ scoreEvaluation = new ScoreEvaluation(Float.valueOf(qTIResultSet.getScore()), passed, new Long(qTIResultSet.getAssessmentID()));
}
}
return scoreEvaluation;
diff --git a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
index 30fd89460623357310c72bdac29a4f973a3e41e7..77e987f7d5617a5388b04297601b72a7dcc750f0 100644
--- a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
@@ -557,8 +557,8 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements QT
visibility = Boolean.TRUE;
}
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
- ScoreEvaluation sceval = new ScoreEvaluation(session.getScore().floatValue(), session.getPassed(), assessmentStatus, visibility, Boolean.TRUE,
- 1.0d, AssessmentRunStatus.done, session.getKey());
+ ScoreEvaluation sceval = new ScoreEvaluation(session.getScore().floatValue(), session.getPassed(), assessmentStatus, visibility, 1.0d,
+ AssessmentRunStatus.done, session.getKey());
courseAssessmentService.updateScoreEvaluation(this, sceval, assessedUserCourseenv, coachingIdentity, true, by);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java b/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
index 18123abdc43307914d9d9f1930217c43f8b3ac78..ccc5ba28180af5483ae9d7c2c76ee49811ee9bf5 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
@@ -556,9 +556,9 @@ public class GroupAssessmentController extends FormBasicController {
ScoreEvaluation newScoreEval;
if(setAsDone) {
- newScoreEval = new ScoreEvaluation(score, passed, AssessmentEntryStatus.done, userVisible, true,null, null, null);
+ newScoreEval = new ScoreEvaluation(score, passed, AssessmentEntryStatus.done, userVisible, null,null, null);
} else {
- newScoreEval = new ScoreEvaluation(score, passed, null, userVisible, null, null, null, null);
+ newScoreEval = new ScoreEvaluation(score, passed, null, userVisible, null, null, null);
}
courseAssessmentService.updateScoreEvaluation(gtaNode, newScoreEval, userCourseEnv, getIdentity(), false, Role.coach);
@@ -595,9 +595,9 @@ public class GroupAssessmentController extends FormBasicController {
UserCourseEnvironment userCourseEnv = row.getUserCourseEnvironment(course);
ScoreEvaluation newScoreEval;
if(setAsDone) {
- newScoreEval = new ScoreEvaluation(score, passed, AssessmentEntryStatus.done, userVisible, true, null, null, null);
+ newScoreEval = new ScoreEvaluation(score, passed, AssessmentEntryStatus.done, userVisible, null, null, null);
} else {
- newScoreEval = new ScoreEvaluation(score, passed, null, userVisible, null, null, null, null);
+ newScoreEval = new ScoreEvaluation(score, passed, null, userVisible, null, null, null);
}
courseAssessmentService.updateScoreEvaluation(gtaNode, newScoreEval, userCourseEnv, getIdentity(), false, Role.coach);
}
diff --git a/src/main/java/org/olat/course/nodes/iq/ConfirmReopenController.java b/src/main/java/org/olat/course/nodes/iq/ConfirmReopenController.java
index a62aa55a27d27221ccf862c1f2500164919b14dc..f7328fc5bec9c84dfebeb5c059136a3f2674da4e 100644
--- a/src/main/java/org/olat/course/nodes/iq/ConfirmReopenController.java
+++ b/src/main/java/org/olat/course/nodes/iq/ConfirmReopenController.java
@@ -88,8 +88,8 @@ public class ConfirmReopenController extends FormBasicController {
ScoreEvaluation scoreEval = courseAssessmentService.getAssessmentEvaluation(courseNode, assessedUserCourseEnv);
ScoreEvaluation reopenedScoreEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(),
- AssessmentEntryStatus.inProgress, scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), AssessmentRunStatus.running, testSession.getKey());
+ AssessmentEntryStatus.inProgress, scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ AssessmentRunStatus.running, testSession.getKey());
courseAssessmentService.updateScoreEvaluation(courseNode, reopenedScoreEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
diff --git a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
index 23ff75409d8f9554b009911b13e997690b45d367..f574fd68a7bc8f2fc49c3691a150799bb491e56e 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
@@ -451,8 +451,8 @@ public class IQIdentityListCourseNodeController extends IdentityListCourseNodeCo
}
AssessmentEntryStatus finalStatus = status == null ? scoreEval.getAssessmentStatus() : status;
ScoreEvaluation manualScoreEval = new ScoreEvaluation(score, passed,
- finalStatus, scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), testSession.getKey());
+ finalStatus, scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), testSession.getKey());
courseAssessmentService.updateScoreEvaluation(courseNode, manualScoreEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
}
diff --git a/src/main/java/org/olat/course/nodes/iq/IQRunController.java b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
index da4f1626c9a0d9d7bf34d9b3aec4e6321a718ce4..b95d5300a9e2e9082f710a7c9edf87b0e7c7e7a2 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
@@ -526,7 +526,7 @@ public class IQRunController extends BasicController implements GenericEventList
userVisibility = Boolean.TRUE;
}
- ScoreEvaluation sceval = new ScoreEvaluation(ac.getScore(), ac.isPassed(), assessmentStatus, userVisibility, fullyAssed, null, null, ai.getAssessID());
+ ScoreEvaluation sceval = new ScoreEvaluation(ac.getScore(), ac.isPassed(), assessmentStatus, userVisibility, null, null, ai.getAssessID());
courseAssessmentService.updateScoreEvaluation(courseNode, sceval, userCourseEnv, getIdentity(), true, Role.user);
// Mark publisher for notifications
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index c3e1a9b7d0c3f7730f3c884848d163960ff72aa0..1493f68b4981c6c0602f04df5b5c4c051db41ccc 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -864,8 +864,8 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
assessmentStatus = AssessmentEntryStatus.done;
visibility = Boolean.TRUE;
}
- ScoreEvaluation sceval = new ScoreEvaluation(score, pass, assessmentStatus, visibility, Boolean.TRUE,
- completion, AssessmentRunStatus.done, assessmentId);
+ ScoreEvaluation sceval = new ScoreEvaluation(score, pass, assessmentStatus, visibility, completion,
+ AssessmentRunStatus.done, assessmentId);
boolean increment = incrementAttempts.getAndSet(false);
courseAssessmentService.updateScoreEvaluation(courseNode, sceval, userCourseEnv, getIdentity(),
diff --git a/src/main/java/org/olat/course/nodes/ms/MSResetDataController.java b/src/main/java/org/olat/course/nodes/ms/MSResetDataController.java
index 99014f752b9e2c940203bdb8e40667135441bf91..ebd21e2ee4ec3aecc5f9d56dfb9d3284d948c7fb 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSResetDataController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSResetDataController.java
@@ -121,7 +121,7 @@ public class MSResetDataController extends FormBasicController {
protected void formOK(UserRequest ureq) {
UserNodeAuditManager auditManager = courseEnv.getAuditManager();
RepositoryEntry courseEntry = courseEnv.getCourseGroupManager().getCourseEntry();
- ScoreEvaluation scoreEval = new ScoreEvaluation(null, null, AssessmentEntryStatus.notStarted, null, Boolean.FALSE, 0.0d, AssessmentRunStatus.notStarted, null);
+ ScoreEvaluation scoreEval = new ScoreEvaluation(null, null, AssessmentEntryStatus.notStarted, null, 0.0d, AssessmentRunStatus.notStarted, null);
for(Identity identity:identities) {
IdentityEnvironment ienv = new IdentityEnvironment(identity, Roles.userRoles());
UserCourseEnvironment uce = new UserCourseEnvironmentImpl(ienv, courseEnv);
diff --git a/src/main/java/org/olat/course/nodes/ta/TaskController.java b/src/main/java/org/olat/course/nodes/ta/TaskController.java
index 7d8c93c1ba554a4f5e5ffb0770ff5b313e7429da..3795ccccfa3f17d205642131576b160a185ce939 100644
--- a/src/main/java/org/olat/course/nodes/ta/TaskController.java
+++ b/src/main/java/org/olat/course/nodes/ta/TaskController.java
@@ -347,7 +347,7 @@ public class TaskController extends BasicController {
ScoreEvaluation eval = courseAssessmentService.getAssessmentEvaluation(node, userCourseEnv);
if(eval.getAssessmentStatus() == null || eval.getAssessmentStatus() == AssessmentEntryStatus.notStarted) {
eval = new ScoreEvaluation(eval.getScore(), eval.getPassed(), AssessmentEntryStatus.inProgress,
- eval.getUserVisible(), null, null, null, null);
+ eval.getUserVisible(), null, null, null);
courseAssessmentService.saveScoreEvaluation(node, getIdentity(), eval, userCourseEnv, false, Role.user);
}
}
diff --git a/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java b/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java
index 40abd0ef34c4ecbdb1a2b40cd87ba39382999cf1..3ea66e6f0e816c5a3919b8396931dc185d997dc3 100644
--- a/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java
+++ b/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java
@@ -51,6 +51,7 @@ public class AssessmentEvaluation extends ScoreEvaluation {
private final Date lastUserModified;
private final Date lastCoachModified;
private final Date assessmentDone;
+ private final Boolean fullyAssessed;
private final Date fullyAssessedDate;
private final Date firstVisit;
private final Date lastVisit;
@@ -79,8 +80,7 @@ public class AssessmentEvaluation extends ScoreEvaluation {
String comment, String coachComment, int numOfAssessmentDocs, Date lastModified, Date lastUserModified,
Date lastCoachModified, Date assessmentDone, Date startDate, AssessmentObligation obligation,
Integer duration, Date firstVisit, Date lastVisit) {
- super(score, passed, assessmentStatus, userVisibility, fullyAssessed, currentRunCompletion, runStatus,
- assessmentID);
+ super(score, passed, assessmentStatus, userVisibility, currentRunCompletion, runStatus, assessmentID);
this.attempts = attempts;
this.completion = completion;
this.comment = comment;
@@ -90,6 +90,7 @@ public class AssessmentEvaluation extends ScoreEvaluation {
this.lastUserModified = lastUserModified;
this.lastCoachModified = lastCoachModified;
this.assessmentDone = assessmentDone;
+ this.fullyAssessed = fullyAssessed;
this.fullyAssessedDate = fullyAssessedDate;
this.startDate = startDate;
this.obligation = obligation;
@@ -156,6 +157,10 @@ public class AssessmentEvaluation extends ScoreEvaluation {
return lastCoachModified;
}
+ public Boolean getFullyAssessed() {
+ return fullyAssessed;
+ }
+
public Date getFullyAssessedDate() {
return fullyAssessedDate;
}
diff --git a/src/main/java/org/olat/course/run/scoring/ScoreEvaluation.java b/src/main/java/org/olat/course/run/scoring/ScoreEvaluation.java
index f924ebff21d7bda6a6c36908b696be927b338fe6..087cba1c9e619af07f5b737ffee73d6ed5863172 100644
--- a/src/main/java/org/olat/course/run/scoring/ScoreEvaluation.java
+++ b/src/main/java/org/olat/course/run/scoring/ScoreEvaluation.java
@@ -39,7 +39,6 @@ public class ScoreEvaluation {
private final Float score;
private final Boolean passed; //could be Boolean.TRUE, Boolean.FALSE or null if "passed" info is not defined
private final Long assessmentID;
- private final Boolean fullyAssessed;
private final Boolean userVisible;
private final AssessmentEntryStatus assessmentStatus;
@@ -56,50 +55,33 @@ public class ScoreEvaluation {
* @param scoreEval
*/
public ScoreEvaluation(ScoreEvaluation scoreEval) {
- this(scoreEval.getScore(), scoreEval.getPassed(), scoreEval.getAssessmentStatus(), scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
+ this(scoreEval.getScore(), scoreEval.getPassed(), scoreEval.getAssessmentStatus(), scoreEval.getUserVisible(),
scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), scoreEval.getAssessmentID());
}
-
- /**
- * @param score
- * @param passed
- */
+
public ScoreEvaluation(Float score, Boolean passed) {
- this(score, passed, null, null, null, null, null, null);
+ this(score, passed, null, null, null, null, null);
}
- /**
- * Constructor for passing the assessmentID.
- * @param score
- * @param passed
- * @param assessmentID
- */
- public ScoreEvaluation(Float score, Boolean passed, Boolean fullyAssessed, Long assessmentID) {
- this(score, passed, null, null, fullyAssessed, null, null, assessmentID);
+ public ScoreEvaluation(Float score, Boolean passed, Long assessmentID) {
+ this(score, passed, null, null, null, null, assessmentID);
}
public ScoreEvaluation(Float score, Boolean passed, AssessmentEntryStatus assessmentStatus,
- Boolean userVisible, Boolean fullyAssessed, Double currentRunCompletion, AssessmentRunStatus runStatus, Long assessmentID) {
+ Boolean userVisible, Double currentRunCompletion, AssessmentRunStatus runStatus, Long assessmentID) {
this.score = score;
this.passed = passed;
this.assessmentID = assessmentID;
- this.fullyAssessed = fullyAssessed;
this.userVisible = userVisible;
this.assessmentStatus = assessmentStatus;
this.currentRunCompletion = currentRunCompletion;
this.runStatus = runStatus;
}
- /**
- * @return Returns the passed.
- */
public Boolean getPassed() {
return passed;
}
- /**
- * @return Returns the score.
- */
public Float getScore() {
return score;
}
@@ -112,17 +94,9 @@ public class ScoreEvaluation {
return userVisible;
}
- /**
- *
- * @return Returns the assessmentID.
- */
public Long getAssessmentID() {
return assessmentID;
}
-
- public Boolean getFullyAssessed() {
- return fullyAssessed;
- }
public Double getCurrentRunCompletion() {
return currentRunCompletion;
@@ -134,6 +108,6 @@ public class ScoreEvaluation {
@Override
public String toString() {
- return "score:" + score + ", passed:" + passed + ", fullyAssessed " + fullyAssessed + ", S" + hashCode();
+ return "score:" + score + ", passed:" + passed + ", S" + hashCode();
}
}
diff --git a/src/main/java/org/olat/ims/qti/QTI12ResultDetailsController.java b/src/main/java/org/olat/ims/qti/QTI12ResultDetailsController.java
index 21388ee51b45cc3da417614d4cc686f747664cb9..3f15c013a45df9c76675eaf2f60c98ab0362b4ef 100644
--- a/src/main/java/org/olat/ims/qti/QTI12ResultDetailsController.java
+++ b/src/main/java/org/olat/ims/qti/QTI12ResultDetailsController.java
@@ -266,7 +266,7 @@ public class QTI12ResultDetailsController extends BasicController {
AssessmentContext ac = ai.getAssessmentContext();
Float score = Float.valueOf(ac.getScore());
Boolean passed = Boolean.valueOf(ac.isPassed());
- ScoreEvaluation sceval = new ScoreEvaluation(score, passed, Boolean.FALSE, new Long(ai.getAssessID()));
+ ScoreEvaluation sceval = new ScoreEvaluation(score, passed, new Long(ai.getAssessID()));
UserCourseEnvironment userCourseEnv = AssessmentHelper.createAndInitUserCourseEnvironment(assessedIdentity, course);
courseAssessmentService.updateScoreEvaluation(testNode, sceval, userCourseEnv, assessedIdentity, true, Role.coach);
diff --git a/src/main/java/org/olat/ims/qti/statistics/ui/QTI12PullTestsToolController.java b/src/main/java/org/olat/ims/qti/statistics/ui/QTI12PullTestsToolController.java
index 55b9d080f5005cea86dbff35b91fe44b835fa54f..849640989c01c546e2b042886d53d0486246e9f5 100644
--- a/src/main/java/org/olat/ims/qti/statistics/ui/QTI12PullTestsToolController.java
+++ b/src/main/java/org/olat/ims/qti/statistics/ui/QTI12PullTestsToolController.java
@@ -185,7 +185,7 @@ public class QTI12PullTestsToolController extends FormBasicController {
AssessmentContext ac = ai.getAssessmentContext();
Float score = new Float(ac.getScore());
Boolean passed = new Boolean(ac.isPassed());
- ScoreEvaluation sceval = new ScoreEvaluation(score, passed, Boolean.FALSE, new Long(ai.getAssessID()));
+ ScoreEvaluation sceval = new ScoreEvaluation(score, passed, new Long(ai.getAssessID()));
UserCourseEnvironment userCourseEnv = AssessmentHelper.createAndInitUserCourseEnvironment(assessedIdentity, course);
courseAssessmentService.updateScoreEvaluation(courseNode, sceval, userCourseEnv, assessedIdentity, true,
Role.coach);
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
index 6f8938dfa2b86ed84164a46f0407ee570862112b..814b7780e867685aeceaa296c6ff61f2f4628b53 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
@@ -442,8 +442,8 @@ public class QTI21AssessmentDetailsController extends FormBasicController {
}
AssessmentEntryStatus finalStatus = entryStatus == null ? scoreEval.getAssessmentStatus() : entryStatus;
ScoreEvaluation manualScoreEval = new ScoreEvaluation(score, passed,
- finalStatus, null, scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), session.getKey());
+ finalStatus, null, scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), session.getKey());
courseAssessmentService.updateScoreEvaluation(courseNode, manualScoreEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
}
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21ResetDataController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21ResetDataController.java
index c4e7776411c95d7f8049ee07a57c06968964fc30..8af1e18b3a00f11623bc623c37605fefac02e859 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21ResetDataController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21ResetDataController.java
@@ -206,7 +206,7 @@ public class QTI21ResetDataController extends FormBasicController {
qtiService.deleteAssessmentTestSession(identities, testEntry, courseEntry, courseNode.getIdent());
for(Identity identity:identities) {
- ScoreEvaluation scoreEval = new ScoreEvaluation(null, null, AssessmentEntryStatus.notStarted, null, Boolean.FALSE, 0.0d, AssessmentRunStatus.notStarted, null);
+ ScoreEvaluation scoreEval = new ScoreEvaluation(null, null, AssessmentEntryStatus.notStarted, null, 0.0d, AssessmentRunStatus.notStarted, null);
IdentityEnvironment ienv = new IdentityEnvironment(identity, Roles.userRoles());
UserCourseEnvironment uce = new UserCourseEnvironmentImpl(ienv, courseEnv);
courseAssessmentService.updateScoreEvaluation(courseNode, scoreEval, uce, getIdentity(), false,
diff --git a/src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java b/src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java
index 313486ba5960f59d5314f78ae16835d45a7a57b3..a187aeee7e5c43e9d33a5d3cb78f5cf94b249a7e 100644
--- a/src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java
@@ -253,8 +253,8 @@ public class CorrectionIdentityAssessmentItemController extends FormBasicControl
}
ScoreEvaluation manualScoreEval = new ScoreEvaluation(score, passed,
- scoreEval.getAssessmentStatus(), scoreEval.getUserVisible(), scoreEval.getFullyAssessed(),
- scoreEval.getCurrentRunCompletion(), scoreEval.getCurrentRunStatus(), testSession.getKey());
+ scoreEval.getAssessmentStatus(), scoreEval.getUserVisible(), scoreEval.getCurrentRunCompletion(),
+ scoreEval.getCurrentRunStatus(), testSession.getKey());
courseAssessmentService.updateScoreEvaluation(courseNode, manualScoreEval, assessedUserCourseEnv,
getIdentity(), false, Role.coach);
}
diff --git a/src/main/java/org/olat/modules/portfolio/manager/PortfolioServiceImpl.java b/src/main/java/org/olat/modules/portfolio/manager/PortfolioServiceImpl.java
index 0daf6bf4abcf4982ad8402c03cbedfe96284e152..6bed5e5aa7aa9d40d267199d922978961a8fafc8 100644
--- a/src/main/java/org/olat/modules/portfolio/manager/PortfolioServiceImpl.java
+++ b/src/main/java/org/olat/modules/portfolio/manager/PortfolioServiceImpl.java
@@ -1441,7 +1441,7 @@ public class PortfolioServiceImpl implements PortfolioService {
if("CourseModule".equals(entry.getOlatResource().getResourceableTypeName())) {
ICourse course = CourseFactory.loadCourse(entry);
CourseNode courseNode = course.getRunStructure().getNode(binder.getSubIdent());
- ScoreEvaluation scoreEval= new ScoreEvaluation(totalScore.floatValue(), totalPassed, binderStatus, true, true, null, null, binder.getKey());
+ ScoreEvaluation scoreEval= new ScoreEvaluation(totalScore.floatValue(), totalPassed, binderStatus, true, null, null, binder.getKey());
UserCourseEnvironment userCourseEnv = AssessmentHelper.createAndInitUserCourseEnvironment(assessedIdentity, course);
courseAssessmentService.updateScoreEvaluation(courseNode, scoreEval, userCourseEnv, coachingIdentity, false,
Role.coach);
@@ -1495,7 +1495,7 @@ public class PortfolioServiceImpl implements PortfolioService {
AssessmentEvaluation eval = courseAssessmentService.getAssessmentEvaluation(pfNode, userCourseEnv);
ScoreEvaluation scoreEval = new ScoreEvaluation(eval.getScore(), eval.getPassed(), status, true,
- fullyAssessed, null, null, binder.getKey());
+ null, null, binder.getKey());
courseAssessmentService.updateScoreEvaluation(courseNode, scoreEval, userCourseEnv, coachingIdentity, false,
Role.coach);
} else {
diff --git a/src/main/java/org/olat/restapi/repository/course/CourseAssessmentWebService.java b/src/main/java/org/olat/restapi/repository/course/CourseAssessmentWebService.java
index c0454487ab0d4cb97115900711582f26efaeeac3..f65ff783b2554df2e50f827959d107e701898524 100644
--- a/src/main/java/org/olat/restapi/repository/course/CourseAssessmentWebService.java
+++ b/src/main/java/org/olat/restapi/repository/course/CourseAssessmentWebService.java
@@ -367,7 +367,7 @@ public class CourseAssessmentWebService {
importTestItems(course, nodeKey, requestIdentity, resultsVO);
} else {
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
- ScoreEvaluation scoreEval = new ScoreEvaluation(resultsVO.getScore(), Boolean.TRUE, Boolean.TRUE, Long.valueOf(nodeKey));//not directly pass this key
+ ScoreEvaluation scoreEval = new ScoreEvaluation(resultsVO.getScore(), Boolean.TRUE, Long.valueOf(nodeKey));//not directly pass this key
courseAssessmentService.updateScoreEvaluation(node, scoreEval, userCourseEnvironment, requestIdentity, true, Role.coach);
}
@@ -455,7 +455,7 @@ public class CourseAssessmentWebService {
// update scoring overview for the user in the current course
Float score = ac.getScore();
Boolean passed = ac.isPassed();
- ScoreEvaluation sceval = new ScoreEvaluation(score, passed, passed, Long.valueOf(nodeKey));//perhaps don't pass this key directly
+ ScoreEvaluation sceval = new ScoreEvaluation(score, passed, Long.valueOf(nodeKey));//perhaps don't pass this key directly
// assessment nodes are assessable
boolean incrementUserAttempts = true;
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
diff --git a/src/main/java/org/olat/upgrade/legacy/NewCachePersistingAssessmentManager.java b/src/main/java/org/olat/upgrade/legacy/NewCachePersistingAssessmentManager.java
index 8736281a9f09595a0a457544e50a32c48b0ce51c..3c75f5051b62c984ae542660901d8ed8ca6fce51 100644
--- a/src/main/java/org/olat/upgrade/legacy/NewCachePersistingAssessmentManager.java
+++ b/src/main/java/org/olat/upgrade/legacy/NewCachePersistingAssessmentManager.java
@@ -973,14 +973,14 @@ public class NewCachePersistingAssessmentManager {
log.debug("successfully saved node passed : " + scoreEvaluation.getPassed());
saveAssessmentID(courseNode, assessedIdentity, scoreEvaluation.getAssessmentID(), cpm);
log.debug("successfully saved node asssessmentId : " + scoreEvaluation.getPassed());
- saveNodeFullyAssessed(courseNode, identity, assessedIdentity, scoreEvaluation.getFullyAssessed(), cpm);
+// saveNodeFullyAssessed(courseNode, identity, assessedIdentity, scoreEvaluation.getFullyAssessed(), cpm);
log.debug("successfully saved node marked completely : " + scoreEvaluation.getPassed());
if (incrementUserAttempts) {
attempts = incrementNodeAttemptsProperty(courseNode, assessedIdentity, cpm);
log.debug("successfully saved user attemps : " + attempts);
}
- saveNodeFullyAssessed(courseNode, identity, assessedIdentity, scoreEvaluation.getFullyAssessed(), cpm);
- log.debug("successfully saved node fullyAssessed : " + scoreEvaluation.getFullyAssessed());
+// saveNodeFullyAssessed(courseNode, identity, assessedIdentity, scoreEvaluation.getFullyAssessed(), cpm);
+// log.debug("successfully saved node fullyAssessed : " + scoreEvaluation.getFullyAssessed());
DBFactory.getInstance().commitAndCloseSession();
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
diff --git a/src/test/java/org/olat/course/assessment/AssessmentManagerTest.java b/src/test/java/org/olat/course/assessment/AssessmentManagerTest.java
index 2dcb74a7cf99fcc0b5d600704fe24d654228124b..94f6b47810721c1667dcace21df5ef71f1a8599e 100644
--- a/src/test/java/org/olat/course/assessment/AssessmentManagerTest.java
+++ b/src/test/java/org/olat/course/assessment/AssessmentManagerTest.java
@@ -159,7 +159,7 @@ public class AssessmentManagerTest extends OlatTestCase {
String userComment = "UselessUserComment";
//store ScoreEvaluation for the assessableCourseNode and student
- ScoreEvaluation scoreEvaluation = new ScoreEvaluation(score,passed, fullyAssessed, assessmentID);
+ ScoreEvaluation scoreEvaluation = new ScoreEvaluation(score,passed, assessmentID);
IdentityEnvironment ienv = new IdentityEnvironment();
ienv.setIdentity(student);