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

extracted number of interventions per exercise into own variable

Browse Source
This commit is contained in:
Thomas Hille
2017-10-04 16:51:41 +02:00
parent f7e013ed89
commit 577f157996
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/exercises_controller.rb
View File

@ -24,6 +24,10 @@ class ExercisesController < ApplicationController
3 3
end end
def max_intervention_count_per_exercise
1
end
def java_course_token def java_course_token
"702cbd2a-c84c-4b37-923a-692d7d1532d0" "702cbd2a-c84c-4b37-923a-692d7d1532d0"
@ -167,7 +171,7 @@ class ExercisesController < ApplicationController
redirect_to(@exercise, alert: t('exercises.implement.no_files')) unless @exercise.files.visible.exists? redirect_to(@exercise, alert: t('exercises.implement.no_files')) unless @exercise.files.visible.exists?
user_solved_exercise = @exercise.has_user_solved(current_user) user_solved_exercise = @exercise.has_user_solved(current_user)
count_interventions_today = UserExerciseIntervention.where(user: current_user).where("created_at >= ?", Time.zone.now.beginning_of_day).count count_interventions_today = UserExerciseIntervention.where(user: current_user).where("created_at >= ?", Time.zone.now.beginning_of_day).count
user_got_intervention_in_exercise = ! UserExerciseIntervention.where(user: current_user, exercise: @exercise).empty? user_got_intervention_in_exercise = UserExerciseIntervention.where(user: current_user, exercise: @exercise).size >= max_intervention_count_per_exercise
user_got_enough_interventions = count_interventions_today >= max_intervention_count_per_day || user_got_intervention_in_exercise user_got_enough_interventions = count_interventions_today >= max_intervention_count_per_day || user_got_intervention_in_exercise
is_java_course = @course_token && @course_token.eql?(java_course_token) is_java_course = @course_token && @course_token.eql?(java_course_token)