From d583ca1d7073ea034fb39444935e171f89c338a7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 Nov 2015 09:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_submit.html.erb      |  7 +++----
 app/views/exercise/_exercise_submit_info.html.erb | 14 ++++++++++++--
 app/views/exercise/_exercise_teacher.html.erb     | 11 +++++------
 app/views/exercise/_new_MC.html.erb               |  2 +-
 app/views/exercise/_new_MCQ.html.erb              |  2 +-
 app/views/exercise/_new_single.html.erb           |  2 +-
 app/views/exercise/show.html.erb                  |  1 +
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/views/exercise/_exercise_submit.html.erb b/app/views/exercise/_exercise_submit.html.erb
index a8892b27e..a28c8917b 100644
--- a/app/views/exercise/_exercise_submit.html.erb
+++ b/app/views/exercise/_exercise_submit.html.erb
@@ -16,15 +16,14 @@
 <script type="text/javascript">
     function poll_submit() {
         var question_form = $("form.new_exercise_question");
-        <% current_score = get_current_score exercise %>
         if($("#polls_head_edit").is(":visible")){
             alert("请先保存测验标题及测验基本信息。");
         } else if(question_form.length > 0) {
             alert("请先保存正在编辑的题目。");
         } else{
-            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'exercise_submit_info', locals: { :score => current_score,:is_remote => false}) %>');
-            showModal('ajax-modal', '310px');
-            $('#ajax-modal').css('height','120px');
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'exercise_submit_info', locals: { :exercise => exercise}) %>');
+            showModal('ajax-modal', '400px');
+            //$('#ajax-modal').css('height','120px');
             $('#ajax-modal').siblings().remove();
             $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                     "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
diff --git a/app/views/exercise/_exercise_submit_info.html.erb b/app/views/exercise/_exercise_submit_info.html.erb
index 66d8da985..0d7e8928c 100644
--- a/app/views/exercise/_exercise_submit_info.html.erb
+++ b/app/views/exercise/_exercise_submit_info.html.erb
@@ -14,8 +14,18 @@
 <div id="popbox02">
   <div class="upload_con">
     <div class="upload_box">
-      <p class="polls_box_p">当前测验分数为<span class="c_red"><%=score %></span>分，
-        <br />
+      <% current_score = get_current_score exercise %>
+      <% question_count = exercise.exercise_questions.count %>
+      <% mc_count = exercise.exercise_questions.where("question_type=1").count %>
+      <% mcq_count = exercise.exercise_questions.where("question_type=2").count %>
+      <% single_count = exercise.exercise_questions.where("question_type=3").count %>
+      <p class="f14">当前测验
+        <% if question_count > 0 %>共有<%= question_count %>道题，其中<% end %>
+        <% if mc_count > 0 %><%= mc_count %>道单选、<% end %>
+        <% if mcq_count > 0 %><%= mcq_count %>道多选、<% end %>
+        <% if single_count > 0%><%= single_count %>道填空,<% end %>
+        总分为<span class="c_red"><%=current_score %></span>分。
+        <br /><br />
         是否确定提交该测验？
       </p>
       <div class="polls_btn_box">
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 18f62e403..4ddd5054d 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -12,15 +12,14 @@
       <div class="fontGrey2">
         <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
         <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
-        <% time = exercise_user.end_at - exercise_user.start_at %>
         <span class="fr">测验时长：<%=exercise.time %>分钟</span>
       </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
     </div>
-    <% mc_question_list = exercise_questions.where("question_type=1") %>
-    <% mcq_question_list = exercise_questions.where("question_type=2") %>
-    <% single_question_list = exercise_questions.where("question_type=3") %>
+    <% 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") %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
       <% mc_question_list.each do |exercise_question| %>
@@ -107,8 +106,8 @@
       <% end %>
     </div>
     <div class="ur_buttons">
-      <%= link_to l(:button_submit),exercise_index_path(:course_id => @course.id),:class => "ur_button_submit" %>
-      <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit fr"%>
+      <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => "ur_button_submit" %>
+      <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%>
     </div>
     <div class="cl"></div>
     <!--contentbox end-->
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 0b9543009..5d5170562 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -1,6 +1,6 @@
 <%= form_for(ExerciseQuestion.new,
              :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise_question.id),
+             :url=>create_exercise_question_exercise_path(exercise.id),
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 2f1f28395..96b1476ad 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -1,6 +1,6 @@
 <%= form_for(ExerciseQuestion.new,
              :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise_question.id),
+             :url=>create_exercise_question_exercise_path(exercise.id),
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index ec52fbcad..c97483bce 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -1,6 +1,6 @@
 <%= form_for(ExerciseQuestion.new,
              :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise_question.id),
+             :url=>create_exercise_question_exercise_path(exercise.id),
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
diff --git a/app/views/exercise/show.html.erb b/app/views/exercise/show.html.erb
index cee9b084c..f47710d1c 100644
--- a/app/views/exercise/show.html.erb
+++ b/app/views/exercise/show.html.erb
@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
 <% if @is_teacher %>
     <%= render :partial => 'exercise_teacher', :locals =>{:exercise =>@exercise, :exercise_questions => @exercise_questions} %>
 <% else %>