From 85b11010d23861f11fea2de62580c2dcb9242054 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 14 Dec 2015 16:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C=E6=8A=A550?=
 =?UTF-8?q?0=E3=80=81=20=E5=AD=A6=E7=94=9F=E7=9C=8B=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E5=B7=B2=E6=88=AA=E6=AD=A2=E7=9A=84=E6=B5=8B=E9=AA=8C=E3=80=81?=
 =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        | 45 +++++++------------
 app/views/exercise/_exercise.html.erb         | 13 +++---
 .../_exercise_student_result.html.erb         |  2 +-
 app/views/layouts/base_courses.html.erb       |  2 +-
 4 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 2a75d0580..286330b4c 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -27,7 +27,7 @@ class ExerciseController < ApplicationController
     if @is_teacher || User.current.admin?
       exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
+      exercises = @course.exercises.where("exercise_status <> 1 ").order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
@@ -54,41 +54,26 @@ class ExerciseController < ApplicationController
     end
     @exercise = Exercise.find params[:id]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    if @exercise.exercise_status != 2 && (!(User.current.allowed_to?(:as_teacher,@course) || User.current.admin?))
-      render_403
-      return
-    end
     exercise_end = @exercise.end_time > Time.now
     if @exercise.time == -1
       @can_edit_excercise = exercise_end
     else
-      @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin?
+      @can_edit_excercise = !has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end
     end
     @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
-      # 学生点击的时候即创建关联,自动保存
-      #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
-
-    # 已提交问卷的用户不能再访问该界面
-=begin
-    if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
-    else
-=end
-      if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
-        eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
-        @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
-      end
-      # @percent = get_percent(@exercise,User.current)
-      exercise_questions = @exercise.exercise_questions
-      @exercise_questions = paginateHelper exercise_questions,5 #分页
-      score = calculate_student_score(@exercise, User.current)
-      eu = get_exercise_user(@exercise.id, User.current.id)
-      eu.update_attributes(:score => score)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
+    if @exercise_user.nil?
+      eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
+      @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
+    end
+    # @percent = get_percent(@exercise,User.current)
+    exercise_questions = @exercise.exercise_questions
+    @exercise_questions = paginateHelper exercise_questions,5 #分页
+    score = calculate_student_score(@exercise, User.current)
+    #eu = get_exercise_user(@exercise.id, User.current.id)
+    @exercise_user.update_attributes(:score => score)
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
     #end
   end
 
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index db412672c..30f986d92 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -24,11 +24,11 @@
         <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
     <%# end%>
     <% if exercise.exercise_status == 1 %>
-        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr10 ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
     <% elsif exercise.exercise_status == 2%>
-        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr10 ml5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
     <% else%>
-        <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+        <li class="pollsbtn fr mr10 pollsbtn_grey ml5">发布试卷</li>
     <% end%>
 
     <% if exercise.exercise_status == 1%>
@@ -42,13 +42,16 @@
     <% if exercise.exercise_status == 1 %>
         <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
         <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <% else%>
+    <% elsif exercise.exercise_status == 2 %>
         <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
         <li class="polls_date fr">已发布</li>
+    <% else %>
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已截止</li>
     <% end%>
 
 <% else%>
-    <% if exercise.exercise_status == 2%>
+    <% if exercise.exercise_status != 1%>
         <%# if has_commit%>
             <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
             <li class="pollsbtn_tip fl ml5">已答</li-->
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 529a73da3..58ebcaf20 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -78,7 +78,7 @@
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(standard_answer.first.exercise_choice_id.to_s) if !standard_answer.empty? %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c37af0dc1..eede16a16 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -188,7 +188,7 @@
           <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
         </div>
         <% end %>
-        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
+        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status<>1").count) %>
         <div class="subNav">
           <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
           <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>