Skip to content

Commit bfe33f8

Browse files
committed
Merge branch 'staging'
2 parents b555ded + 3d12437 commit bfe33f8

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/kotlin/ch/uzh/ifi/access/controller/ExampleController.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ch.uzh.ifi.access.controller
22

3+
import ch.uzh.ifi.access.model.constants.Command
34
import ch.uzh.ifi.access.model.constants.TaskStatus
45
import ch.uzh.ifi.access.model.dto.*
56
import ch.uzh.ifi.access.projections.TaskWorkspace
@@ -101,7 +102,7 @@ class ExampleController(
101102
val userRoles = roleService.getUserRoles(listOf(submission.userId!!))
102103
val isAdmin = roleService.isAdmin(userRoles, course)
103104
val submissionReceivedAt = LocalDateTime.now()
104-
if (exampleService.isSubmittedDuringInteractivePeriod(course, example, submissionReceivedAt) && !isAdmin) {
105+
if (exampleService.isSubmittedDuringInteractivePeriod(course, example, submissionReceivedAt) && !isAdmin && submission.command == Command.GRADE) {
105106
exampleQueueService.addToQueue(course, example, submission, submissionReceivedAt)
106107
exampleService.increaseInteractiveSubmissionCount(course, example)
107108
} else {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,10 @@ class ExampleService(
196196
return ExampleInformationDTO(
197197
participantsOnline,
198198
totalParticipants,
199-
numberOfReceivedSubmissions,
199+
maxOf(
200+
numberOfReceivedSubmissions,
201+
numberOfProcessedSubmissions
202+
),
200203
numberOfProcessedSubmissions,
201204
numberOfProcessedSubmissionsWithEmbeddings,
202205
passRatePerTestCase,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class SubmissionService(
5555
} else {
5656
submissions.forEach { submission ->
5757
submission.logs?.let { logs ->
58-
if (isExample(task) && submission.evaluation!!.task!!.status == TaskStatus.Interactive) {
58+
if (isExample(task) && submission.evaluation!!.task!!.status == TaskStatus.Interactive && submission.command == Command.GRADE) {
5959
submission.output = ""
6060
} else if (submission.command != Command.GRADE) {
6161
submission.output = logs

0 commit comments

Comments
 (0)