Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
GitLab is undergoing maintenance
You are on a read-only GitLab instance.
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
1541c548
Commit
1541c548
authored
5 years ago
by
uhensler
Browse files
Options
Downloads
Patches
Plain Diff
OO-4285: Save score only if user has role participant
parent
337e8884
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
+26
-0
26 additions, 0 deletions
...ourse/assessment/manager/CourseAssessmentServiceImpl.java
with
26 additions
and
0 deletions
src/main/java/org/olat/course/assessment/manager/CourseAssessmentServiceImpl.java
+
26
−
0
View file @
1541c548
...
@@ -165,6 +165,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -165,6 +165,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateScoreEvaluation
(
CourseNode
courseNode
,
ScoreEvaluation
scoreEvaluation
,
public
void
updateScoreEvaluation
(
CourseNode
courseNode
,
ScoreEvaluation
scoreEvaluation
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
,
boolean
incrementAttempts
,
Role
by
)
{
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
,
boolean
incrementAttempts
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
saveScoreEvaluation
(
courseNode
,
coachingIdentity
,
assessedIdentity
,
new
ScoreEvaluation
(
scoreEvaluation
),
am
.
saveScoreEvaluation
(
courseNode
,
coachingIdentity
,
assessedIdentity
,
new
ScoreEvaluation
(
scoreEvaluation
),
...
@@ -187,6 +189,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -187,6 +189,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateCurrentCompletion
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
public
void
updateCurrentCompletion
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Double
currentCompletion
,
AssessmentRunStatus
runStatus
,
Role
by
)
{
Double
currentCompletion
,
AssessmentRunStatus
runStatus
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
updateCurrentCompletion
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
currentCompletion
,
runStatus
,
am
.
updateCurrentCompletion
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
currentCompletion
,
runStatus
,
...
@@ -196,6 +200,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -196,6 +200,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateCompletion
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Double
completion
,
public
void
updateCompletion
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Double
completion
,
AssessmentEntryStatus
runStatus
,
Role
by
)
{
AssessmentEntryStatus
runStatus
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
updateCompletion
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
completion
,
runStatus
,
by
);
am
.
updateCompletion
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
completion
,
runStatus
,
by
);
...
@@ -204,6 +210,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -204,6 +210,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateFullyAssessed
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
public
void
updateFullyAssessed
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Boolean
fullyAssessed
,
AssessmentEntryStatus
status
,
Role
by
)
{
Boolean
fullyAssessed
,
AssessmentEntryStatus
status
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
am
.
updateFullyAssessed
(
courseNode
,
userCourseEnvironment
,
fullyAssessed
,
status
,
by
);
am
.
updateFullyAssessed
(
courseNode
,
userCourseEnvironment
,
fullyAssessed
,
status
,
by
);
}
}
...
@@ -217,6 +225,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -217,6 +225,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
incrementAttempts
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Role
by
)
{
public
void
incrementAttempts
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
incrementNodeAttempts
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
by
);
am
.
incrementNodeAttempts
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
by
);
...
@@ -225,6 +235,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -225,6 +235,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateAttempts
(
CourseNode
courseNode
,
Integer
userAttempts
,
public
void
updateAttempts
(
CourseNode
courseNode
,
Integer
userAttempts
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
,
Role
by
)
{
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
if
(
userAttempts
!=
null
)
{
if
(
userAttempts
!=
null
)
{
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
...
@@ -242,6 +254,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -242,6 +254,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updatedUserComment
(
CourseNode
courseNode
,
String
userComment
,
public
void
updatedUserComment
(
CourseNode
courseNode
,
String
userComment
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
if
(
userComment
!=
null
)
{
if
(
userComment
!=
null
)
{
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
...
@@ -259,6 +273,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -259,6 +273,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateCoachComment
(
CourseNode
courseNode
,
String
coachComment
,
public
void
updateCoachComment
(
CourseNode
courseNode
,
String
coachComment
,
UserCourseEnvironment
userCourseEnvironment
)
{
UserCourseEnvironment
userCourseEnvironment
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
if
(
coachComment
!=
null
)
{
if
(
coachComment
!=
null
)
{
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
...
@@ -276,6 +292,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -276,6 +292,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
addIndividualAssessmentDocument
(
CourseNode
courseNode
,
File
document
,
String
filename
,
public
void
addIndividualAssessmentDocument
(
CourseNode
courseNode
,
File
document
,
String
filename
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
if
(
document
!=
null
)
{
if
(
document
!=
null
)
{
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
...
@@ -286,6 +304,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -286,6 +304,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
removeIndividualAssessmentDocument
(
CourseNode
courseNode
,
File
document
,
public
void
removeIndividualAssessmentDocument
(
CourseNode
courseNode
,
File
document
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
UserCourseEnvironment
userCourseEnvironment
,
Identity
coachingIdentity
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
if
(
document
!=
null
)
{
if
(
document
!=
null
)
{
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
...
@@ -296,6 +316,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -296,6 +316,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
updateLastModifications
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
public
void
updateLastModifications
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
,
Identity
identity
,
Role
by
)
{
Identity
identity
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
updateLastModifications
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
by
);
am
.
updateLastModifications
(
courseNode
,
assessedIdentity
,
userCourseEnvironment
,
by
);
...
@@ -311,6 +333,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -311,6 +333,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
void
saveScoreEvaluation
(
CourseNode
courseNode
,
Identity
identity
,
ScoreEvaluation
scoreEvaluation
,
public
void
saveScoreEvaluation
(
CourseNode
courseNode
,
Identity
identity
,
ScoreEvaluation
scoreEvaluation
,
UserCourseEnvironment
userCourseEnvironment
,
boolean
incrementUserAttempts
,
Role
by
)
{
UserCourseEnvironment
userCourseEnvironment
,
boolean
incrementUserAttempts
,
Role
by
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
saveScoreEvaluation
(
courseNode
,
identity
,
assessedIdentity
,
scoreEvaluation
,
userCourseEnvironment
,
am
.
saveScoreEvaluation
(
courseNode
,
identity
,
assessedIdentity
,
scoreEvaluation
,
userCourseEnvironment
,
...
@@ -341,6 +365,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
...
@@ -341,6 +365,8 @@ public class CourseAssessmentServiceImpl implements CourseAssessmentService, Nod
@Override
@Override
public
boolean
onNodeVisited
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
)
{
public
boolean
onNodeVisited
(
CourseNode
courseNode
,
UserCourseEnvironment
userCourseEnvironment
)
{
if
(!
userCourseEnvironment
.
isParticipant
())
return
false
;
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnvironment
.
getCourseEnvironment
().
getAssessmentManager
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
Identity
assessedIdentity
=
userCourseEnvironment
.
getIdentityEnvironment
().
getIdentity
();
am
.
updateLastVisited
(
courseNode
,
assessedIdentity
,
new
Date
());
am
.
updateLastVisited
(
courseNode
,
assessedIdentity
,
new
Date
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment