From 881854a2f00cd5cb039c2e7a98ec58b19bfa958f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb          | 12 ++++++++++--
 app/views/student_work/_student_work_title.html.erb |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index af2a25f1d..d14382ae8 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -14,13 +14,21 @@ class StudentWorkController < ApplicationController
     @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3
     if @show_all
       if @homework.homework_type == 1 || @is_teacher || User.current.admin?
-        @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+        if @order == "name"
+          @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+        else
+          @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+        end
       else
         my_work = @homework.student_works.where(:user_id => User.current.id)
         if my_work.empty?
           @stundet_works = []
         else
-          @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+          if @order == "name"
+            @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+          else
+            @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+          end
         end
       end
     else #学生
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 9e50ed72d..2a3a5e124 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -2,7 +2,10 @@
   <span class="c_dark f14 fb fl">学号</span>
 </li>
 <li class=" hwork_name f14 fb c_dark">
-  姓名
+  <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
+  <% if @show_all && @order == "name"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
 </li>
 <li class="hwork_tit">
   <span class="c_dark f14 fb fl">作品名称</span>