From 863d7ed4b55ab286aea776bf4a7dabc6972f2348 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 14:34:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E9=80=89=E5=92=8C=E5=A1=AB?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 37 +++++++++++++------ app/views/exercise/_exercise_submit.html.erb | 8 ++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 0b12b917e..68222f8bd 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -3,9 +3,24 @@ $("#RSide").removeAttr("id"); $("#homework_page_right").css("min-height",$("#LSide").height()-30); $("#Container").css("width","1000px"); + var time = <%=exercise.time %>; + var total_seconds = time * 60; + getTime(total_seconds); }); - function getTime() { - + function getTime(total_seconds) { + var total_seconds = total_seconds - 1; + var hours = total_seconds / 60 / 60; + var hoursRound = Math.floor(hours); + var minutes = total_seconds /60 - (60 * hoursRound); + var minutesRound = Math.floor(minutes); + var seconds = total_seconds - (60 * 60 * hoursRound) - (60 * minutesRound); + var secondsRound = Math.round(seconds); + $("#rest_hours").html(hoursRound); + $("#rest_minutes").html(minutesRound); + $("#rest_seconds").html(secondsRound); + if(total_seconds >0) { + setTimeout("getTime("+total_seconds+");", 1000); + } }
@@ -15,7 +30,7 @@
开始时间：<%=format_time(exercise_user.start_at.to_s) %> 测验时长：<%=exercise.time %>分钟 - 剩余时长：1 小时 30 分钟 0 秒 + 剩余时长： 小时  分钟  秒
<%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
@@ -26,11 +41,11 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
">

单选题

- <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
+
第<%= list_index+1%>题.(<%= exercise_question.question_score %>分)
<%= exercise_question.question_title %>
@@ -65,7 +80,7 @@ }); } - <%= radio_button "poll_vote","poll_answer_id",exercise_choice.id,:class=>"ur_radio",:onclick =>"click_#{exercise_choice.id}(this);return false;",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %> + <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:onclick =>"click_#{exercise_choice.id}(this);return false;",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %> <%= convert_to_char((index+1).to_s)%>  <%= exercise_choice.choice_text%> @@ -81,11 +96,11 @@
">

多选题

- <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_with_index do |exercise_question,list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
+
第<%= list_index + 1 %>题.(<%= exercise_question.question_score %>分)
<%= exercise_question.question_title %>
@@ -136,11 +151,11 @@
">

填空题

- <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
+
第<%= list_index + 1%>题.(<%= exercise_question.question_score %>分)
<%= exercise_question.question_title %>
@@ -164,7 +179,7 @@ } - > + >
diff --git a/app/views/exercise/_exercise_submit.html.erb b/app/views/exercise/_exercise_submit.html.erb index e9c26a0b5..acbbea244 100644 --- a/app/views/exercise/_exercise_submit.html.erb +++ b/app/views/exercise/_exercise_submit.html.erb @@ -1,4 +1,4 @@ -<%= form_for("", +<%= form_for(exercise, :html => { :multipart => true }, :url => {:controller => 'exercise', :action => 'commit_exercise', @@ -7,8 +7,10 @@
提交
- - + <%= f.check_box :show_result, :value => exercise.show_result%> + <%= label_tag 'exercise_show_result', '允许学生查看测验结果' %> +
<% end %> From b0730dfb818ec5a441912839ca966d543998a271 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 20 Nov 2015 15:12:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_student.html.erb | 25 +++++++++++-------- .../_exercise_student_result.html.erb | 15 +++++------ app/views/exercise/_exercise_teacher.html.erb | 18 ++++++------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index 68222f8bd..af9896b01 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -8,6 +8,11 @@ getTime(total_seconds); }); function getTime(total_seconds) { + start_time = new Date($("#start_time").html()); + end_time = start_time + 60*60*<%=exercise.time %>; + now = new Date(); + //start = new Date(start_time); + //end_time = start_time; var total_seconds = total_seconds - 1; var hours = total_seconds / 60 / 60; var hoursRound = Math.floor(hours); @@ -27,8 +32,9 @@

<%= exercise.exercise_name%>

+
- 开始时间：<%=format_time(exercise_user.start_at.to_s) %> + 开始时间：<%=format_time(exercise_user.start_at.to_s)%> 测验时长：<%=exercise.time %>分钟 剩余时长： 小时  分钟  秒
@@ -36,17 +42,16 @@
- <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> - <% single_question_list = exercise.exercise_questions.where("question_type=3") %> + <% mc_question_list = exercise.exercise_questions.where("question_type=1").shuffle %> + <% mcq_question_list = exercise.exercise_questions.where("question_type=2").shuffle %> + <% single_question_list = exercise.exercise_questions.where("question_type=3").shuffle %>
">

单选题

<% mc_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= list_index+1%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
@@ -100,8 +105,7 @@
-
第<%= list_index + 1 %>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
@@ -155,8 +159,7 @@
-
第<%= list_index + 1%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分)
@@ -173,7 +176,7 @@ }, success: function (data) { var dataObj = eval(data); -// obj.value = dataObj.text; + obj.value = dataObj.text; } }); diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb index 8a723d75c..9ce136667 100644 --- a/app/views/exercise/_exercise_student_result.html.erb +++ b/app/views/exercise/_exercise_student_result.html.erb @@ -24,12 +24,11 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
">

单选题

- <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ @@ -62,12 +61,11 @@
">

多选题

- <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_wtih_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ @@ -100,12 +98,11 @@
">

填空题

- <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question,list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %> +
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %> √ diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb index b803519ce..606b14aae 100644 --- a/app/views/exercise/_exercise_teacher.html.erb +++ b/app/views/exercise/_exercise_teacher.html.erb @@ -22,12 +22,12 @@ <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
">

单选题

- <% mc_question_list.each do |exercise_question| %> + <% mc_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %>
+
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
@@ -54,12 +54,12 @@
">

多选题

- <% mcq_question_list.each do |exercise_question| %> + <% mcq_question_list.each_with_index do |exercise_question, index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %>
+
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
@@ -86,12 +86,12 @@
">

填空题

- <% single_question_list.each do |exercise_question| %> + <% single_question_list.each_with_index do |exercise_question, list_index| %>
-
第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)
- <%= exercise_question.question_title %>
+
第<%= list_index+1%>题：<%= exercise_question.question_title %>  (<%= exercise_question.question_score %>分) +
标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>