diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index eb4fdfa22..1a83c40c3 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -1,7 +1,7 @@ class ExerciseController < ApplicationController layout "base_courses" - before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit] + before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit,:update] before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list] def index @@ -26,12 +26,12 @@ class ExerciseController < ApplicationController end # 已提交问卷的用户不能再访问该界面 if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?) - redirect_to poll_index_url(:course_id=> @course.id) + redirect_to exercise_index_url(:course_id=> @course.id) else @can_edit_poll = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin? @percent = get_percent(@exercise,User.current) - poll_questions = @poll.poll_questions - @poll_questions = paginateHelper poll_questions,5 #分页 + exercise_questions = @exercise.exercise_questions + @exercise_questions = paginateHelper exercise_questions,5 #分页 respond_to do |format| format.html {render :layout => 'base_courses'} end @@ -44,9 +44,9 @@ class ExerciseController < ApplicationController :course_id => @course.id, :exercise_status => 1, :user_id => User.current.id, - :time => Time.now, - :end_time => Time.now, - :publish_time => Time.now, + :time => "", + :end_time => "", + :publish_time => "", :exercise_description => "" } @exercise = Exercise.create option @@ -87,6 +87,7 @@ class ExerciseController < ApplicationController @exercise.exercise_description = params[:exercise][:exercise_description] @exercise.time = params[:exercise][:time] @exercise.end_time = params[:exercise][:end_time] + @exercise.publish_time = params[:exercise][:publish_time] if @exercise.save respond_to do |format| format.js @@ -103,7 +104,7 @@ class ExerciseController < ApplicationController # 统计结果 def statistics_result @exercise = Exercise.find(params[:id]) - exercise_questions = @exercise.poll_questions + exercise_questions = @exercise.exercise_questions @exercise_questions = paginateHelper exercise_questions, 5 respond_to do |format| format.html{render :layout => 'base_courses'} @@ -127,7 +128,7 @@ class ExerciseController < ApplicationController :answer_position => i, :answer_text => answer } - @exercise_questions.poll_answers.new question_option + @exercise_questions.exercise_answers.new question_option end end # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1 @@ -137,7 +138,7 @@ class ExerciseController < ApplicationController # @exercise_question_num = params[:quest_num].to_i @exercise_questions.question_number = params[:quest_num].to_i + 1 end - if @poll_questions.save + if @exercise_questions.save respond_to do |format| format.js end @@ -184,7 +185,7 @@ class ExerciseController < ApplicationController @exercise_question = ExerciseQuestion.find params[:exercise_question] @exercise = @exercise_question.exercise exercise_questions = @exercise.exercise_questions.where("question_number > #{@exercise_question.question_number}") - poll_questions.each do |question| + exercise_questions.each do |question| question.question_number -= 1 question.save end @@ -202,7 +203,7 @@ class ExerciseController < ApplicationController @exercise.publish_time = Time.now if @exercise.save if params[:is_remote] - redirect_to poll_index_url(:course_id => @course.id) + redirect_to exercise_index_url(:course_id => @course.id) else respond_to do |format| format.js diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index 14a67bd29..21326e2c8 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -1,9 +1,4 @@ -<%= form_for(@exercise, - :html => { :multipart => true }, - :url => {:controller => 'exercise', - :action => 'update', - :course_id => @course.id - },:remote=>true ) do |f| %> +<%= form_for @exercise, :remote=>true do |f| %>
@@ -24,7 +19,7 @@
考试时长:分钟
- +
保存 diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index 7eec256c9..3a0230781 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -231,7 +231,7 @@ //添加标题时确定按钮 function add_poll_question(doc) { - var title = $.trim($("#poll_questions_title").val()); + var title = $.trim($("#question_title").val()); if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();} } //修改标题时确定按钮 diff --git a/app/views/exercise/edit.html.erb b/app/views/exercise/edit.html.erb index aef506ad8..0b20dc90e 100644 --- a/app/views/exercise/edit.html.erb +++ b/app/views/exercise/edit.html.erb @@ -1,2 +1 @@ -<%#= render :partial => 'exercise_form'%> -111 \ No newline at end of file +<%= render :partial => 'exercise_form'%> \ No newline at end of file diff --git a/app/views/exercise/update.js.erb b/app/views/exercise/update.js.erb new file mode 100644 index 000000000..65b8dd327 --- /dev/null +++ b/app/views/exercise/update.js.erb @@ -0,0 +1,4 @@ +$("#polls_head_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:exercise => @exercise}) %>"); +$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:exercise => @exercise}) %>"); +$("#polls_head_edit").hide(); +$("#polls_head_show").show(); \ No newline at end of file