From d851364e70d813a6011afbaa0a9a9f9037b8a057 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 28 Oct 2015 14:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=BC=80=E5=90=AF=E5=89=8D?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=83=BD=E7=9C=8B=E5=88=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb         | 2 ++
 app/helpers/application_helper.rb                  | 6 +++---
 app/views/student_work/_student_work_list.html.erb | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 2f828669c..25782ec4b 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -108,6 +108,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
       if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
@@ -128,6 +129,7 @@ class StudentWorkController < ApplicationController
       else
         @stundet_works = []
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7289d534b..84364b4f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2355,16 +2355,16 @@ module ApplicationHelper
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         if work.nil?
-          link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 #编程作业不能修改作品
-            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
           else
-            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
           end
         end
       end
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 2d0e9220c..e23fcceda 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -2,8 +2,11 @@
   <span class="c_dark f14 fb fl mr30">
       作品
       <font class="f12 c_red">
-        （<%= @stundet_works.count%>）
+        （<%= @student_work_count%>）
       </font>
+    <% if !@is_teacher && @stundet_works.empty?%>
+       <span class="f12 c_red">未提交</span>
+    <% end %>
   </span>
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
       <div class="hworkSearchBox">