From 3d3d50f1eaa64bcf57ffe6173ed423da48fbba9b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 Nov 2015 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb  |  4 +-
 app/views/exercise/_edit_MC.html.erb    | 63 +++++++++++++++++++++++++
 app/views/exercise/_new_single.html.erb |  6 +--
 config/routes.rb                        |  1 +
 4 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 2bc8612a4..ebd3d9d2b 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -166,7 +166,7 @@ class ExerciseController < ApplicationController
   # params[:question_answer]  eg:A、B、C选项
   def update_exercise_question
     @exercise_question = ExerciseQuestion.find params[:exercise_question]
-    @exercise_questions.question_title = params[:exercise_questions_title].nil? || params[:exercise_questions_title].empty? ? l(:label_enter_single_title) : params[:exercise_questions_title]
+    @exercise_question.question_title = params[:exercise_questions_title].nil? || params[:exercise_questions_title].empty? ? l(:label_enter_single_title) : params[:exercise_questions_title]
     ################处理选项
     if params[:question_answer]
       @exercise_question.exercise_answers.each do |answer|
@@ -182,7 +182,7 @@ class ExerciseController < ApplicationController
           question.save
         else
           question_option = {
-              :exercise_choices_id => i,
+              :exercise_choice_id => i,
               :answer_text => answer
           }
           @exercise_question.exercise_answers.new question_option
diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index e69de29bb..5a406537b 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -0,0 +1,63 @@
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[0]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                  <li class="ur_item">
+                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                  </li>
+                  <div class="cl"></div>
+              <% end %>
+          </div>
+          <li class="ur_item">
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+          </li>
+          <div class="cl"></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index e4e1db695..4d9baf729 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -19,17 +19,17 @@
       <div class="cl"></div>
       <li class="ur_item">
         <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="question_answer[0]" placeholder="请输入候选答案一" type="text">
+        <input  name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
         <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a> <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a> </li>
       <div class="cl"></div>
       <li class="ur_item">
         <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="question_answer[1]" placeholder="请输入候选答案二（选填）" type="text">
+        <input  name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
         <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a> <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a> </li>
       <div class="cl"></div>
       <li class="ur_item">
         <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input  name="question_answer[2]" placeholder="请输入候选答案三（选填）" type="text">
+        <input  name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
         <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a> <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a> </li>
       <div class="cl"></div>
     </ul>
diff --git a/config/routes.rb b/config/routes.rb
index 8dba79d2c..422f470d5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -157,6 +157,7 @@ RedmineApp::Application.routes.draw do
 
     collection do #生成路径为 /exercise/方法名
       delete 'delete_exercise_question'
+      post 'update_exercise_question'
     end
   end