From fdb38c1b87043b11c3a146b7b01eaf71e23c18d5 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 7 Jan 2015 15:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=EF=BC=8C=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb  | 14 +++++++++-----
 app/services/courses_service.rb | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index d3f0e8cef..4130ea902 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -140,22 +140,26 @@ module Mobile
 
         desc "课程老师列表"
         params do
+          requires :token, type: String
           requires :course_id, type: Integer, desc: "课程id"
         end
         get 'teachers' do
           cs = CoursesService.new
-          teachers = cs.course_teacher_or_student_list({role: 1}, params[:course_id],current_user)
-          {status: 0, data: teachers}
+          teachers = cs.course_teacher_or_student_list({role: '1'}, params[:course_id],current_user)
+          present :data, teachers, with: Mobile::Entities::User
+          present :status, 0
         end
 
         desc "课程学生列表"
         params do
+          requires :token, type: String
           requires :course_id, type: Integer, desc: "课程id"
         end
-        get 'teachers' do
+        get 'students' do
           cs = CoursesService.new
-          teachers = cs.course_teacher_or_student_list({role: 2}, params[:course_id],current_user)
-          {status: 0, data: teachers}
+          students = cs.course_teacher_or_student_list({role: '2'}, params[:course_id],current_user)
+          present :data, students, with: Mobile::Entities::User
+          present :status, 0
         end
 
         desc "返回单个课程"
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index d8dd8299b..485126ac4 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -72,7 +72,36 @@ class CoursesService
         #@subPage_title = ''
         @members = c.member_principals.includes(:roles, :principal).all.sort
     end
-    @members
+    users = []
+    @members.each do |m|
+      img_url = url_to_avatar(m.user)
+      gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
+      work_unit = get_user_work_unit m.user
+      location = get_user_location m.user
+      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction}
+    end
+    users
+  end
+
+  #获取用户的工作单位
+  def get_user_work_unit user
+    work_unit = ""
+    if user.user_extensions.identity == 0 || user.user_extensions.identity == 1
+      work_unit = user.user_extensions.school.name unless  user.user_extensions.school.nil?
+    elsif  user.user_extensions.identity == 3
+      work_unit = user.user_extensions.occupation
+    elsif user.user_extensions.identity == 2
+      work_unit = user.firstname
+    end
+    work_unit
+  end
+
+  #获取用户地区
+  def get_user_location user
+    location = ""
+    location << (user.user_extensions.location || '')
+    location << (user.user_extensions.location_city || '')
+    location
   end
 
   #课程通知列表