From 8d0509d7f2c0cc74227f8049af04f765c38861bb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 Oct 2017 09:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=92=8C=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb                   | 6 +++++-
 app/views/homework_common/_homework_index_list.html.erb | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index cbd6761a3..fa53c9d17 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -644,7 +644,11 @@ class CoursesController < ApplicationController
         JOIN students_for_courses
         ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
         WHERE members.course_id = #{@course.id} AND members.course_group_id = #{@group.id} ORDER BY score desc")
-    
+    # if @order == "student_id"
+    #   @members = @course.members.where(:course_group_id => @group.id).joins("join user_extensions on members.user_id = user_extensions.user_id").select{|m| m.roles.to_s.include?("Student")}.reorder("student_id #{@sort}")
+    # else
+    #   @members = @course.members.where(:course_group_id => @group.id).joins("join users on members.user_id = users.id").select{|m| m.roles.to_s.include?("Student")}.reorder("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@sort}, login #{@b_sort}")
+    # end
     if q.nil? || q == ""
     else
       members = []
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index dab6f2359..d053432d7 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -29,7 +29,11 @@
             <div class="cl"></div>
             <p class="color-grey font-12 mt20">
 
-              <span>创建于<%=time_from_now homework_common.created_at %></span>
+              <% if homework_common.homework_detail_manual.try(:comment_status) == 0 %>
+                <span>创建于<%=time_from_now homework_common.created_at %></span>
+              <% else %>
+                  <span>发布于<%=time_from_now homework_common.publish_time %></span>
+              <% end %>
               <!--<span class="ml30"><%#=homework_common.homework_type_ch %></span>-->
               <% if [1,2,3,4,5,6].include?(homework_common.homework_detail_manual.try(:comment_status)) %>
                   <% if @is_teacher %>