From d407610740ba73698f3db4a49e3573d68db6b0bd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 Nov 2015 16:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E7=A9=BA=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_form.html.erb    | 27 ++++++++++++++-----
 app/views/exercise/_new_MCQ.html.erb          |  2 +-
 app/views/exercise/_new_single.html.erb       | 11 ++++++--
 app/views/exercise/_show_MC.html.erb          |  6 ++---
 app/views/exercise/_show_MCQ.html.erb         |  6 ++---
 app/views/exercise/_show_single.html.erb      | 25 +++++++++++++++++
 .../exercise/delete_exercise_question.js.erb  |  1 +
 .../exercise/update_exercise_question.js.erb  |  0
 config/routes.rb                              |  1 +
 9 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 app/views/exercise/delete_exercise_question.js.erb
 create mode 100644 app/views/exercise/update_exercise_question.js.erb

diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 61e288079..1d78fb435 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -61,7 +61,12 @@
 
     function insert_MC(quest_type,quest_num,quest_id){
         $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                        '<%#= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@exercise.id),:remote => true do |f|%>'+
+                        '<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'create_exercise_question',
+                      :course_id => @course.id
+             },:remote=>true ) do |f|%>'+
                         ' <div class="ur_editor radio"> '+
                         '<div class="ur_editor_title"> '+
                         '<label>问题：&nbsp;&nbsp;</label>'+
@@ -107,7 +112,7 @@
                         '</div>'+
                         '<div class="cl"></div>'+
                         '</div>'+
-                        '<%# end%>'
+                        '<% end%>'
         );
         $("#poll_questions_title").focus();
     }
@@ -119,7 +124,12 @@
 
     function insert_MCQ(quest_type,quest_num,quest_id){
         $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                        '<%#= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@exercise.id),:remote => true do |f|%>'+
+                        '<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'create_exercise_question',
+                      :course_id => @course.id
+             },:remote=>true ) do |f|%>'+
                         '<div class="ur_editor checkbox">'+
                         '<div class="ur_editor_title">'+
                         '<label>问题：&nbsp;&nbsp;</label>'+
@@ -165,7 +175,7 @@
                         '</div>'+
                         '<div class="cl"></div>'+
                         '</div>'+
-                        '<%# end%>'
+                        '<% end%>'
         );
         $("#poll_questions_title").focus();
     }
@@ -177,7 +187,12 @@
 
     function insert_SINGLE(quest_type,quest_num,quest_id){
         $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                        '<%#= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@exercise.id),:remote => true do |f|%>'+
+                        '<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'create_exercise_question',
+                      :course_id => @course.id
+             },:remote=>true ) do |f|%>'+
                         '<div class="ur_editor text ">'+
                         '<div class="ur_editor_title">'+
                         '<label for="ur_question_title">问题：&nbsp;&nbsp;</label>'+
@@ -198,7 +213,7 @@
                         '</div>'+
                         '<div class="cl"></div>'+
                         '</div>'+
-                        '<%# end%>'
+                        '<% end%>'
         );
         $("#poll_questions_title").focus();
     }
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index f5a8257ca..6e58d620e 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -47,7 +47,7 @@
       <div class="cl"></div>
       <li class="ur_item">
         <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input name="exercise_choice" placeholder="若标准答案为A，B,C，在答案输入框填入ABC即可" type="text">
+        <input name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
       </li>
       <div class="cl"></div>
     </ul>
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index f48c7673d..e4e1db695 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -1,8 +1,14 @@
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'create_exercise_question',
+                      :course_id => @course.id
+             },:remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
     <label>问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="3" type="hidden">
-    <input maxlength="250" class="questionTitle" name="questions_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
+    <input maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
   </div>
   <div class="ur_editor_content">
     <ul>
@@ -33,4 +39,5 @@
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 09575ab00..e7bf20206 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -4,7 +4,7 @@
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
 
-  <%#= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="chooseQuestionType('mc',<%=exercise_question.id%>);"></a>
@@ -31,8 +31,8 @@
 </div>
 <div id="div_mc_<%=exercise_question.id%>" style="width: 50px;border: 1px solid #cbcbcb; display:none;position: absolute;padding: 5px;background: white">
   <ul>
-    <li><a href="javascript:void(0);" onclick=" dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);">单选</a></li>
-    <!--<li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=poll_question.id%>);insert_MCQ('mc',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">多选</a></li>
+    <!--<li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=exercise_question.id%>);insert_MC('mc',<%#=exercise_question.question_number%>,<%#=exercise_question.id%>);">单选</a></li>
+    <li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=poll_question.id%>);insert_MCQ('mc',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">多选</a></li>
     <li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=poll_question.id%>);insert_SINGLE('mc',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单行主观</a></li>-->
   </ul>
 </div>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 9a7f82f54..f69b855bd 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -3,7 +3,7 @@
     <%= exercise_question.question_title %>
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
-  <%#= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="chooseQuestionType('mcq',<%=exercise_question.id%>);"></a>
@@ -32,9 +32,7 @@
   <ul>
 <!--
     <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%#=poll_question.id%>);insert_MC('mcq',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单选</a></li>
--->
-    <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);">多选</a></li>
-<!--
+    <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%#=exercise_question.id%>);insert_MCQ('mcq',<%#=exercise_question.question_number%>,<%#=exercise_question.id%>);">多选</a></li>
     <li><a href="javascript:void(0);" onclick=" dismiss('mcq',<%#=poll_question.id%>);insert_SINGLE('mcq',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单行主观</a></li>
 -->
   </ul>
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index e69de29bb..07ecce94d 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -0,0 +1,25 @@
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+  </div>
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="chooseQuestionType('single',<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div>
+    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+        候选答案：<%= exercise_choice.choice_text%><br />
+    <% end %>
+  </div>
+</div>
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_single_<%=exercise_question.id%>">
+</div>
+<div id="div_single_<%=exercise_question.id%>" style="width: 50px;border: 1px solid #cbcbcb; display:none;position: absolute;padding: 5px;background: white">
+  <ul>
+    <!--<li><a href="javascript:void(0);" onclick=" dismiss('single',<%#=poll_question.id%>);insert_MC('single',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单选</a></li>
+    <li><a href="javascript:void(0);" onclick=" dismiss('single',<%#=poll_question.id%>);insert_MCQ('single',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">多选</a></li>
+    <li><a href="javascript:void(0);" onclick=" dismiss('single',<%#=poll_question.id%>);insert_SINGLE('single',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单行主观</a></li>-->
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/exercise/delete_exercise_question.js.erb b/app/views/exercise/delete_exercise_question.js.erb
new file mode 100644
index 000000000..eb6300eb5
--- /dev/null
+++ b/app/views/exercise/delete_exercise_question.js.erb
@@ -0,0 +1 @@
+$("#poll_content").html("<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise}) %>");
\ No newline at end of file
diff --git a/app/views/exercise/update_exercise_question.js.erb b/app/views/exercise/update_exercise_question.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index b1e4725e6..8dba79d2c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,7 @@ RedmineApp::Application.routes.draw do
     end
 
     collection do #生成路径为 /exercise/方法名
+      delete 'delete_exercise_question'
     end
   end