From dcc37ef847c52769b93526506f5a144632e39f8a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 13 Jul 2016 16:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8B=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9A=82=E6=97=A0=E5=88=86=E7=8F=AD=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 22 ++++++++++++++++------
 app/helpers/student_work_helper.rb         |  4 ++++
 config/locales/zh.yml                      |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 4c3a608de..1d0b80f70 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -381,14 +381,24 @@ class StudentWorkController < ApplicationController
     @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
 
-    course_group = CourseGroup.find_by_id(@group) if @group
-    if course_group
-      group_students = course_group.users
-      if group_students.empty?
-        student_in_group = '(0)'
+    if @group
+      if @group == "0"
+        none_group_students = @course.members.select{ |member| member.course_group_id == 0 }
+        if none_group_students.empty?
+          student_in_group = '(0)'
+        else
+          student_in_group = '(' + none_group_students.map{ |member| member.user_id }.join(',')  + ')'
+        end
       else
-        student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
+        course_group = CourseGroup.find_by_id(@group)
+        group_students = course_group.users
+        if group_students.empty?
+          student_in_group = '(0)'
+        else
+          student_in_group = '(' + group_students.map{ |user| user.id }.join(',')  + ')'
+        end
       end
+
       #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
       if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.has_committed.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index 42a3a6538..4f0a2ca6d 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -101,6 +101,10 @@ module StudentWorkHelper
     if course.course_groups && !course.course_groups.empty?
       base = []
       base << l(:label_chose_group)
+      base << -1
+      result << base
+      base = []
+      base << l(:label_no_group)
       base << 0
       result << base
       course.course_groups.each do |group|
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9c19fcbbb..dbb3ff074 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2101,6 +2101,7 @@ zh:
   label_file_lost_list: 缺失文件列表
   lable_unset: 未设置
   label_chose_group: 请选择分班
+  label_no_group: 暂无
 
   label_hostedz_organization: 主办单位
   label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室