From c50d307e897974d09401b34b1544fcbeca505088 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 17:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=90=E5=91=98=E5=90=8E=E5=86=8D=E6=AC=A1=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9C=AA=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 14 +++++++++++
 .../_choose_group_member.html.erb             | 25 +++++++++++++++++++
 .../search_course_students.js.erb             |  5 ++--
 config/routes.rb                              |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 10431f01a..9e537d551 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1115,6 +1115,20 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def get_user_infor
+    req = Hash.new(false)
+    user = User.where("id = #{params[:user_id].to_i}").first
+    if user
+      req[:id] = user.id
+      req[:name] = user.show_name
+      req[:student_id] = user.user_extensions.student_id
+      req[:valid] = true
+    else
+      req[:valid] = false
+    end
+    render :json => req
+  end
+
   private
   def searchstudent_by_name  users, name
     mems = []
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index c47c31d9d..b76f94511 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -105,6 +105,31 @@
                 $("#choose_students_list").append(link);
             <% end %>
         <% end %>
+        var ids = $("#group_member_ids").val().split(',');
+        if (ids.length > 1){
+            for(var i=1; i<ids.length; i++) {
+                $.get(
+                        '/student_work/get_user_infor',
+                        {
+                            user_id: ids[i]
+                        },
+                        function (data) {
+                            if (data.valid) {
+                                var link = "<li id='choose_student_"+data.id+"' onclick='delete_student("+data.id+");'>"+data.name;
+                                if (data.student_id != "" ) {
+                                    link += "("+data.student_id+")";
+                                }
+                                link += "</li>";
+                                $("#choose_students_list").append(link);
+                            }
+                            else
+                            {
+
+                            }
+                        }
+                );
+            }
+        }
     });
 </script>
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index c7aa982b9..2ac4eeaab 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -7,7 +7,8 @@ $("#all_students_list").empty();
     link += "</li>";
     $("#all_students_list").append(link);
 
-    var str = "";
+    var str = $("#group_member_ids").val();
+    /*var str = "";
     var lists = $("#choose_students_list li");
     if(lists.length > 0) {
         for(var i=0; i<lists.length; i++) {
@@ -17,7 +18,7 @@ $("#all_students_list").empty();
                 str += ",";
         }
     }
-}
+}*/
     <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
         if (str.indexOf(<%=user.id.to_s %>) < 0) {
             $("#student_<%=user.id %>").one("click",function choose_student() {
diff --git a/config/routes.rb b/config/routes.rb
index 91ab5cffe..2c1362359 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,6 +329,7 @@ RedmineApp::Application.routes.draw do
       post 'last_codecomparetime'
       post 'set_score_rule'
       get 'work_canrepeat'
+      get 'get_user_infor'
     end
   end