From f1bb1bb8c251acd5f1ad906d1589d23562adca30 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 26 Nov 2015 14:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=8C=E6=AF=8F=E4=B8=AA=E6=B5=8B?=
 =?UTF-8?q?=E9=AA=8C=E5=90=8D=E5=AD=97=E5=89=8D=E5=A2=9E=E5=8A=A0=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=8F=91=E5=B8=83=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb      |  4 ++--
 app/views/exercise/_exercise.html.erb       | 11 ++++-------
 app/views/exercise/_exercises_list.html.erb |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index d1df22dff..0b1a035c1 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -13,9 +13,9 @@ class ExerciseController < ApplicationController
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     if @is_teacher
-      exercises = @course.exercises
+      exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where(:exercise_status => 2)
+      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index 40654d327..d7a457047 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -8,7 +8,7 @@
         <%# else %>
             <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
         <%# end %>
-        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%= link_to (index+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
       </div>
     </li>
 
@@ -16,8 +16,10 @@
 
     <% if exercise.exercise_status == 1 %>
         <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
+        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
     <% else%>
         <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已发布</li>
     <% end%>
 
     <%# if exercise.exercise_status == 2 %>
@@ -31,11 +33,6 @@
     <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
         <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
     <%# end%>
-
-
-    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
-
-
     <% if exercise.exercise_status == 1 %>
         <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
     <% elsif exercise.exercise_status == 2%>
@@ -59,5 +56,5 @@
             <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
         <%#end%>
     <% end%>
-    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
+    <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb
index f277ebdf5..89964f032 100644
--- a/app/views/exercise/_exercises_list.html.erb
+++ b/app/views/exercise/_exercises_list.html.erb
@@ -10,9 +10,9 @@
 <div class="cl"></div>
 <div id="polls_list" class="polls_list">
 
-  <% @exercises.each do |exercise|%>
+  <% @exercises.each_with_index do |exercise,index|%>
       <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
-        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
+        <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
       </ul>
       <div class="cl"></div>
   <% end%>