From f850a71b59599a0f0e038bdabc5e3f047c5bae16 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 18 Nov 2015 15:30:39 +0800
Subject: [PATCH] =?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/helpers/exercise_helper.rb                 | 11 +++++++++++
 app/views/exercise/_exercise_form.html.erb     | 17 +++++++++--------
 app/views/exercise/_new_MC.html.erb            | 16 ++++++++--------
 app/views/exercise/_new_MCQ.html.erb           | 18 +++++++++---------
 .../exercise/create_exercise_question.js.erb   |  1 +
 5 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/helpers/exercise_helper.rb b/app/helpers/exercise_helper.rb
index 2c92ffad7..4cafa8e62 100644
--- a/app/helpers/exercise_helper.rb
+++ b/app/helpers/exercise_helper.rb
@@ -43,4 +43,15 @@ module ExerciseHelper
     return result
   end
 
+  def get_current_score exercise
+    score = 0
+    unless exercise.nil?
+      exercise.exercise_questions.each do |exercise_question|
+        score += exercise_question.question_score
+      end
+      return score
+    end
+    return score
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 8567c6641..61e288079 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -76,21 +76,21 @@
                         '<ul>'+
                         '<li class="ur_item">'+
                         '<label>选项<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                        '<input maxlength="200" type="text" name="question_answer[0]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                         '<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 maxlength="200" type="text" name="question_answer[1]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                         '<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 maxlength="200" type="text" name="question_answer[2]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                         '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                         '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                         '</li>'+
@@ -134,21 +134,21 @@
                         '<ul>'+
                         '<li class="ur_item">'+
                         '<label>选项<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                        '<input maxlength="200" type="text" name="question_answer[0]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                         '<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 maxlength="200" type="text" name="question_answer[1]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                         '<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 maxlength="200" type="text" name="question_answer[2]" placeholder="新建选项"/>'+
+                        '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                         '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                         '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                         '</li>'+
@@ -274,7 +274,7 @@
     //单选题
     function add_single_answer(doc)
     {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='新建选项'/>" +
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
                 "<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>");
     }
@@ -319,7 +319,8 @@
   <div id="polls_head_edit">
     <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
   </div>
-  <div class="mb5" style="display: none">目前试卷总分：<span class="c_red">20分</span></div>
+  <% current_score = get_current_score @exercise %>
+  <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>">目前试卷总分：<span class="c_red" id="current_score"><%=current_score %>分</span></div>
   <!-- 问题 -->
   <div id="poll_content">
     <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 09e9e27f1..158f8be96 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -18,29 +18,29 @@
       </li>
       <div class="cl"></div>
       <li class="ur_item">
-        <label>选项<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'>
+        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
         <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 maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'>
+        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
         <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 maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'/>
+        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
         <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 maxlength="200" type='text' name='question_answer[3]' placeholder='新建选项'/>
+        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
         <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
         <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
       </li>
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 9b5c4adef..f5a8257ca 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -8,7 +8,7 @@
   <div class="ur_editor_title">
     <label>问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="2" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
   </div>
   <div class="ur_editor_content">
     <ul>
@@ -18,29 +18,29 @@
       </li>
       <div class="cl"></div>
       <li class="ur_item">
-        <label>选项<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'>
+        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
         <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 maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'>
+        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
         <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 maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'>
+        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
         <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 maxlength="200" type='text' name='question_answer[3]' placeholder='新建选项'>
+        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
         <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
         <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
       </li>
diff --git a/app/views/exercise/create_exercise_question.js.erb b/app/views/exercise/create_exercise_question.js.erb
index 42077931c..224dc0a95 100644
--- a/app/views/exercise/create_exercise_question.js.erb
+++ b/app/views/exercise/create_exercise_question.js.erb
@@ -23,4 +23,5 @@ $("#poll_content").append("<div id='poll_questions_<%= @exercise_questions.id%>'
         "<% end%>" +
         "</div>" +
         "</div>");
+$("#current_score").html("<%=get_current_score @exercise %>分");
 <% end %>