Skip to content

Commit b555ded

Browse files
committed
show correct score when switching user
1 parent a065f4a commit b555ded

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/main/kotlin/ch/uzh/ifi/access/projections/TaskOverview.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ interface TaskOverview {
2828
@get:Value("#{@pointsService.calculateAvgTaskPoints(target.slug)}")
2929
val avgPoints: Double?
3030

31-
@get:Value("#{@courseService.calculateTaskPoints(target.id)}")
31+
@get:Value("#{@courseService.calculateTaskPoints(target.id, target.userId)}")
32+
3233
val points: Double?
3334

3435
@get:Value("#{@courseService.getRemainingAttempts(target.id, target.maxAttempts)}")

src/main/kotlin/ch/uzh/ifi/access/service/CourseService.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ class CourseService(
224224
return newEvent
225225
}
226226

227-
fun calculateTaskPoints(taskId: Long?): Double {
228-
val userId = roleService.getUserId() ?: return 0.0
229-
return pointsService.calculateTaskPoints(taskId, userId)
227+
fun calculateTaskPoints(taskId: Long?, userId: String?): Double {
228+
val id = userId ?: roleService.getUserId() ?: return 0.0
229+
return pointsService.calculateTaskPoints(taskId, id)
230230
}
231231

232232

0 commit comments

Comments
 (0)