htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadline bug for admins and teachers

Browse Source
This commit is contained in:
Sebastian Serth
2020-05-20 12:10:35 +02:00
parent c807f32c2a
commit a77a5ff76d
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/exercises/statistics.html.slim
View File

@ -61,12 +61,13 @@ h1 = @exercise
td = link_to_if symbol==:external_users && policy(user).statistics?, label, {controller: "exercises", action: "statistics", external_user_id: user.id, id: @exercise.id} td = link_to_if symbol==:external_users && policy(user).statistics?, label, {controller: "exercises", action: "statistics", external_user_id: user.id, id: @exercise.id}
td = us['maximum_score'] or 0 td = us['maximum_score'] or 0
td.align-middle td.align-middle
- latest_user_submission = submissions.where(user: user).latest - latest_user_submission = submissions.where(user: user).final.latest
- if latest_user_submission.before_deadline? - if latest_user_submission.present?
.unit-test-result.positive-result.before_deadline - if latest_user_submission.before_deadline?
- elsif latest_user_submission.within_grace_period? .unit-test-result.positive-result.before_deadline
.unit-test-result.unknown-result.within_grace_period - elsif latest_user_submission.within_grace_period?
- elsif latest_user_submission.after_late_deadline? .unit-test-result.unknown-result.within_grace_period
.unit-test-result.negative-result.after_late_deadline - elsif latest_user_submission.after_late_deadline?
.unit-test-result.negative-result.after_late_deadline
td = us['runs'] if policy(@exercise).detailed_statistics? td = us['runs'] if policy(@exercise).detailed_statistics?
td = @exercise.average_working_time_for(user.id) or 0 if policy(@exercise).detailed_statistics? td = @exercise.average_working_time_for(user.id) or 0 if policy(@exercise).detailed_statistics?

17
app/views/external_users/statistics.html.slim
View File

@ -4,9 +4,8 @@ h1 = t('.title')
- exercises = Exercise.where(id: submissions.joins(:exercise).group(:exercise_id).select(:exercise_id).distinct) - exercises = Exercise.where(id: submissions.joins(:exercise).group(:exercise_id).select(:exercise_id).distinct)
- if !policy(exercises.first).detailed_statistics? - if !policy(exercises.first).detailed_statistics?
- submissions = submissions.final - submissions = submissions.final
- latest_viewable_submission = submissions.latest
- if latest_viewable_submission && policy(latest_viewable_submission).show_study_group? - if submissions.any?
.table-responsive .table-responsive
table.table.table-striped.sortable table.table.table-striped.sortable
thead thead
@ -26,12 +25,14 @@ h1 = t('.title')
td = link_to exercise, controller: "exercises", action: "statistics", external_user_id: @user.id, id: exercise.id td = link_to exercise, controller: "exercises", action: "statistics", external_user_id: @user.id, id: exercise.id
td = stats["maximum_score"] or 0 td = stats["maximum_score"] or 0
td.align-middle td.align-middle
- if latest_viewable_submission.before_deadline? - latest_viewable_submission = submissions.where(exercise: exercise).final.latest
.unit-test-result.positive-result.before_deadline - if latest_viewable_submission.present?
- elsif latest_viewable_submission.within_grace_period? - if latest_viewable_submission.before_deadline?
.unit-test-result.unknown-result.within_grace_period .unit-test-result.positive-result.before_deadline
- elsif latest_viewable_submission.after_late_deadline? - elsif latest_viewable_submission.within_grace_period?
.unit-test-result.negative-result.after_late_deadline .unit-test-result.unknown-result.within_grace_period
- elsif latest_viewable_submission.after_late_deadline?
.unit-test-result.negative-result.after_late_deadline
td = stats["runs"] or 0 if policy(exercises.first).detailed_statistics? td = stats["runs"] or 0 if policy(exercises.first).detailed_statistics?
td = stats["working_time"] or 0 if policy(exercises.first).detailed_statistics? td = stats["working_time"] or 0 if policy(exercises.first).detailed_statistics?
- else - else