diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 0eeffa588..75751e4f7 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -60,17 +60,17 @@ class ExerciseController < ApplicationController else @can_edit_excercise = !has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end end - @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first - if @exercise_user.nil? - eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) + unless @is_teacher @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first + if @exercise_user.nil? + eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false) + @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first + end + score = calculate_student_score(@exercise, User.current) + @exercise_user.update_attributes(:score => score) end # @percent = get_percent(@exercise,User.current) - exercise_questions = @exercise.exercise_questions - @exercise_questions = paginateHelper exercise_questions,5 #分页 - score = calculate_student_score(@exercise, User.current) - #eu = get_exercise_user(@exercise.id, User.current.id) - @exercise_user.update_attributes(:score => score) + @exercise_questions = @exercise.exercise_questions respond_to do |format| format.html {render :layout => 'base_courses'} end diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index 9c9916e60..9b07e0626 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -38,9 +38,9 @@ $("#show_student_result_div").on('click',show_result); <% else %> $("#show_student_result_div").attr("title","截止日期未到,暂不能查看学生答题结果"); - $("#student_name_id").attr("title","截止日期未到,暂不能查看学生答题结果"); - $("#student_id_id").attr("title","截止日期未到,暂不能查看学生答题结果"); - $("#student_class_id").attr("title","截止日期未到,暂不能查看学生答题结果"); + $("#student_name_<%= exercise.id%>").attr("title","截止日期未到,暂不能查看学生答题结果"); + $("#student_id_<%= exercise.id%>").attr("title","截止日期未到,暂不能查看学生答题结果"); + $("#student_class_<%= exercise.id%>").attr("title","截止日期未到,暂不能查看学生答题结果"); <% end %> }); function show_result() { @@ -56,13 +56,13 @@