微信班级名改为课程名。班级名

app/api/mobile/entities/activity.rb

@@ -73,6 +73,12 @@ module Mobile
                   elsif ac.container_type == "Blog"
                     "发表博客"
                   end
+                when :syllabus_title
+                  if ac.container_type == "Course"
+                    course = get_course(ac.container_id)
+                    name = course.syllabus.nil? ? "":course.syllabus.title
+                    name
+                  end
                 when :course_project_id
                   if ac.container_type == "Course"
                     ac.container_id
@@ -145,6 +151,7 @@ module Mobile
       act_expose :latest_update #最新更新时间
       act_expose :course_project_id    #课程/项目ID
       act_expose :course_project_name    #课程/项目名字
+      act_expose :syllabus_title    #课程名字
       act_expose :activity_type_name     #课程问答区/项目缺陷等
       expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
         if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue"

app/api/mobile/entities/course.rb

@@ -107,6 +107,7 @@ module Mobile
       course_expose :current_user_is_member
       course_expose :current_user_is_teacher
       course_expose :work_unit
+      course_expose :syllabus_title
     end
   end
 end

app/controllers/news_controller.rb

@@ -220,7 +220,8 @@ class NewsController < ApplicationController
             if count == 0
               ws = WechatService.new
               content = @news.title
-              ws.class_notice m.user_id, "course_notice", @news.id, "#{l(:label_new_notice_template)}", @news.course.name, @news.author.show_name, format_time(@news.created_on), content, "点击查看通知详情"
+              name = @news.course.syllabus.nil? ? @news.course.name : @news.course.syllabus.title+" • "+@news.course.name
+              ws.class_notice m.user_id, "course_notice", @news.id, "#{l(:label_new_notice_template)}", name, @news.author.show_name, format_time(@news.created_on), content, "点击查看通知详情"
             end
           end
         end

app/models/homework_common.rb

@@ -77,7 +77,8 @@ class HomeworkCommon < ActiveRecord::Base
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new
-            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}", self.course.name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
+            name = self.course.syllabus.nil? ? self.course.name : self.course.syllabus.title+" • "+self.course.name
+            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}", name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
           end
           # end
         end

app/services/courses_service.rb

@@ -332,7 +332,7 @@ class CoursesService
     # unless (course.is_public == 1 ||  current_user.member_of_course?(course) || current_user.admin?)
     #   raise '403'
     # end
-    {:course => course,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0}
+    {:course => course,:syllabus_title => course.syllabus.nil? ? "":course.syllabus.title ,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0}
   end
 
   #创建课程
@@ -554,8 +554,10 @@ class CoursesService
         uid = user.id
         type = "review_class_member"
       end
+
+      name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
       ws = WechatService.new
-      ws.class_notice user.id, type, course.id, title, course.name, user.show_name, format_time(Time.now), content, remark,uid
+      ws.class_notice user.id, type, course.id, title,name, user.show_name, format_time(Time.now), content, remark,uid
 
     end
   end
@@ -650,8 +652,9 @@ class CoursesService
 
                     rolename = role_ids.include?("7") ? "助教" : "教师"
                     content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。"
+                    name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
                     ws = WechatService.new
-                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", course.name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
+                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
                   end
                 end
                 #--------------------------------------------

app/services/syllabuses_service.rb

@@ -69,7 +69,8 @@ class SyllabusesService
     if count == 0
       ws = WechatService.new
       title = "恭喜您创建班级成功。"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 1, "点击查看班级详情。"
+      name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
+      ws.create_class_notice user.id, "create_course_notice", course.id,title, name, user.show_name, 1, "点击查看班级详情。"
     end
   end