From dbe236032b677c035f12a1448ae6ac1d3c04c028 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 Nov 2015 21:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A2=98=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=85=88=E4=BF=9D=E5=AD=98=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_student.html.erb        |  2 +-
 app/views/exercise/_exercise_student_result.html.erb |  2 +-
 app/views/exercise/_new_question.html.erb            | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 0f51dfeb7..45d6ccf70 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -191,7 +191,7 @@
 
                       }
                   </script>
-                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,User.current.id).html_safe %>" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
                 </div>
               </div>
             </div>
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 32cb556b3..b9306b0d2 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -46,7 +46,7 @@
                         <tr>
                           <td>
                             <label>
-                              <%= radio_button "poll_vote","poll_answer_id",exercise_choice.id,:class=>"ur_radio",: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",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %>
                               <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
                             </label>
                           </td>
diff --git a/app/views/exercise/_new_question.html.erb b/app/views/exercise/_new_question.html.erb
index 6148c9bb9..faadb08a9 100644
--- a/app/views/exercise/_new_question.html.erb
+++ b/app/views/exercise/_new_question.html.erb
@@ -8,7 +8,9 @@
 <script type="text/javascript">
     function add_MC(){
         var forms = $("form.new_exercise_question");
-        if(forms.length > 0){
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
             alert("请先保存正在编辑的题目再新建。");
         } else{
             $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC', :locals => {:exercise=>exercise}) %>");
@@ -18,7 +20,9 @@
 
     function add_MCQ(){
         var forms = $("form.new_exercise_question");
-        if(forms.length > 0){
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
             alert("请先保存正在编辑的题目再新建。");
         } else{
             $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ', :locals => {:exercise=>exercise}) %>");
@@ -28,7 +32,9 @@
 
     function add_single(){
         var forms = $("form.new_exercise_question");
-        if(forms.length > 0){
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
             alert("请先保存正在编辑的题目再新建。");
         } else{
             $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single', :locals => {:exercise=>exercise}) %>");