jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

This commit is contained in:
cxt 2015-11-20 20:23:21 +08:00
parent cc19c345e1 2435f06f44
commit b9460efa08
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/exercise_controller.rb
View File

@ -21,6 +21,10 @@ class ExerciseController < ApplicationController
end end
def show def show
unless User.current.member_of_course?(@course)
render_403
return
end
@exercise = Exercise.find params[:id] @exercise = Exercise.find params[:id]
@is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?) if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
@ -485,16 +489,16 @@ class ExerciseController < ApplicationController
# 问答题有多个答案 # 问答题有多个答案
if question.question_type == 3 if question.question_type == 3
if standard_answer.include?(answer.first.answer_text) if standard_answer.include?(answer.first.answer_text)
score1 = score+ question.question_score unless question.question_score.nil? score1 = score1+ question.question_score unless question.question_score.nil?
end end
elsif question.question_type == 1 elsif question.question_type == 1
if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id
score2 = score + question.question_score unless question.question_score.nil? score2 = score2 + question.question_score unless question.question_score.nil?
end end
else else
arr = get_mulscore(question, user) arr = get_mulscore(question, user)
if arr.to_i == standard_answer.exercise_choice_id if arr.to_i == standard_answer.exercise_choice_id
score3 = score + question.question_score unless question.question_score.nil? score3 = score3 + question.question_score unless question.question_score.nil?
end end
# ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id) # ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id)
# arr = [] # arr = []