Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/api/mobile/apis/courses.rb

@@ -419,6 +419,53 @@ module Mobile
 
         end
 
+        desc "获取班级某成员角色信息"
+        params do
+          requires :id, type: Integer
+          requires :token, type: String
+          requires :user_id, type: Integer
+        end
+        post 'get_member_info' do
+          authenticate!
+
+          c = Course.find("#{params[:id]}")
+
+          my_member = c.member_principals.where("users.id=#{params[:user_id]}").first
+
+          if my_member && my_member.roles[0]
+            present :course_id,params[:id]
+            present :user_id,params[:user_id]
+            present :member_info,my_member, with: Mobile::Entities::ProjectMember
+            present :status, 0
+          else
+            present :status, -1
+          end
+
+        end
+
+        desc "修改班级某成员角色信息"
+        params do
+          requires :id, type: Integer
+          requires :token, type: String
+          requires :user_id, type: Integer
+          requires :role_id, type: Integer
+        end
+        post 'edit_member_role' do
+          authenticate!
+
+          c = Course.find("#{params[:id]}")
+
+          #7教辅 9教师 10学生
+          if c.tea_id == params[:user_id] || c.tea_id != current_user.id  || !(params[:role_id] == 7 || params[:role_id] == 9 || params[:role_id] == 10)
+            present :status, -1
+          else
+
+            cs = CoursesService.new
+            status = cs.modify_user_course_role params
+            present :status, status
+          end
+        end
+
       end
     end
   end

app/api/mobile/apis/projects.rb

@@ -29,7 +29,7 @@ module Mobile
             ps = ProjectsService.new
             project = ps.show_project(params,current_user)
 
-            if project[:status] != 9
+            if project[:status] == 9
               {status:-1, message: '该项目不存在或已被删除啦' }
             else
               present :data, project, with: Mobile::Entities::Project,user: current_user
@@ -40,84 +40,143 @@ module Mobile
 
         desc "获取项目动态"
         params do
+          requires :id, type: Integer
           requires :token, type: String
-
         end
-        post 'auth' do
+        post 'activities' do
           authenticate!
 
-          auth = 0
+          user = current_user
 
-          if (current_user.user_extensions && current_user.user_extensions.identity == 0 && current_user.allowed_to?(:add_course, nil, :global => true))
-            auth = 1
+          project_types = "('Message','Issue','Project')"
+          activities = UserActivity.where("(container_type = 'Project' and container_id = #{params[:id]} and act_type in #{project_types})").order('updated_at desc')
+
+          page = params[:page] ? params[:page] : 0
+          all_count = activities.count
+          activities = activities.limit(10).offset(page * 10)
+          count = activities.count
+          present :data, activities, with: Mobile::Entities::Activity,user: user
+          present :all_count, all_count
+          present :count, count
+          present :page, page
+          present :status, 0
+        end
+
+        desc "获取项目成员"
+        params do
+          requires :id, type: Integer
+          requires :token, type: String
+        end
+        post 'members' do
+          authenticate!
+
+          project = Project.find("#{params[:id]}")
+          members = project.member_principals
+
+          master_members = project.member_principals.includes(:roles, :principal).where("member_roles.role_id=3").all.sort
+
+          master_members.each do |m|
+            if m.user_id == project.user_id
+              master_members.delete(m)
+              master_members.insert(0,m)
+              break
+            end
           end
 
-          present :auth, auth
+          develop_members = project.member_principals.includes(:roles, :principal).where("member_roles.role_id=4").all.sort
+          report_members = project.member_principals.includes(:roles, :principal).where("member_roles.role_id=5").all.sort
+
+          present :master_members,master_members, with: Mobile::Entities::ProjectMember
+          present :develop_members,develop_members, with: Mobile::Entities::ProjectMember
+          present :report_members,report_members, with: Mobile::Entities::ProjectMember
+          present :status, 0
         end
 
-        desc "获取项目"
+        desc "获取项目某成员角色信息"
         params do
+          requires :id, type: Integer
           requires :token, type: String
+          requires :user_id, type: Integer
         end
-        post 'auth' do
+        post 'get_member_info' do
           authenticate!
 
-          auth = 0
+          project = Project.find("#{params[:id]}")
 
-          if (current_user.user_extensions && current_user.user_extensions.identity == 0 && current_user.allowed_to?(:add_course, nil, :global => true))
-            auth = 1
-          end
+          my_member = project.member_principals.where("users.id=#{params[:user_id]}").first
 
-          present :auth, auth
-        end
-
-        desc "新建大纲"
-        params do
-          requires :token, type: String
-          requires :title, type: String, desc: '大纲标题'
-          requires :courses, type: Array[String], desc: '课程名'
-        end
-        post do
-          authenticate!
-
-          ss  = SyllabusesService.new
-
-          sy = ss.create(current_user, params[:title],
-                         params[:courses].map{|c| {name: c} })
-
-          if sy.new_record?
-            {status:-1, message: '创建大纲失败' }
-          else
-            present :data, sy, with: Mobile::Entities::Syllabus,user: current_user
+          if my_member && my_member.roles[0]
+            present :project_id,params[:id]
+            present :user_id,params[:user_id]
+            present :member_info,my_member, with: Mobile::Entities::ProjectMember
             present :status, 0
+          else
+            present :status, -1
           end
 
         end
 
-        desc '编辑大纲'
+        desc "修改项目某成员角色信息"
         params do
+          requires :id, type: Integer
           requires :token, type: String
-          requires :title, type: String, desc: '大纲标题'
-          # requires :add_courses, type: Array[String], desc: '课程名'
-          # requires :modify_courses, type: Array[Integer,String], desc: '课程名'
+          requires :user_id, type: Integer
+          requires :role_id, type: Integer
         end
-        post ':id/edit' do
-
+        post 'edit_member_role' do
           authenticate!
 
-          ss  = SyllabusesService.new
+          project = Project.find("#{params[:id]}")
 
-          #修改课程大纲
-          status = ss.edit(current_user, params)
+          my_member = project.member_principals.where("users.id=#{current_user.id}").first
 
-          if status == -1
-            {status:status, message: '修改课程信息失败' }
+          #3管理 4开发 5报告
+          if !(my_member && my_member.roles[0] && my_member.roles[0].id == 3 ) || project.user_id == params[:user_id] || !(params[:role_id] == 3 || params[:role_id] == 4 || params[:role_id] == 5)
+            present :status, -1
           else
+            ps = ProjectsService.new
+
+            status = ps.modify_user_project_role params
+
             present :status, status
           end
         end
-      end
 
+        desc "新建项目"
+        params do
+          requires :token, type: String
+          requires :name, type: String, desc: '项目名称'
+        end
+        post 'create' do
+          authenticate!
+
+          ps = ProjectsService.new
+
+          status = ps.createNewProject params,current_user
+
+
+
+          present :status, 0
+
+        end
+
+        desc "加入项目"
+        params do
+          requires :token, type: String
+          requires :invite_code, type: String, desc: '邀请码'
+        end
+        post "join" do
+          authenticate!
+
+          # ps = ProjectsService.new
+          # status = ps.join_project({role: "5", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
+          #
+          # present :status, status
+
+          {status:-1, message: '该功能将在近日开发，敬请期待！' }
+        end
+
+      end
     end
   end
 end

app/api/mobile/entities/course.rb

@@ -86,6 +86,15 @@ module Mobile
       expose :my_homework,using: Mobile::Entities::Homework  do |f, opt|
         f[:my_homework] if f.is_a?(Hash) && f.key?(:my_homework)
       end
+      expose :is_creator, if: lambda { |instance, options| options[:user] } do |instance, options|
+        if instance[:course]
+          course = instance[:course]
+        else
+          course = instance
+        end
+        current_user = options[:user]
+        course.tea_id == current_user.id
+      end
       course_expose :current_user_is_member
       course_expose :current_user_is_teacher
       course_expose :work_unit

app/api/mobile/entities/project.rb

@@ -3,13 +3,27 @@ module Mobile
     class Project < Grape::Entity
       expose :name
       expose :id
+      expose :user_id
+      # expose :invite_code
+      # expose :qrcode
       expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options|
         current_user = options[:user]
-        can_setting = instance.user_id == current_user.id ? true : false
-        can_setting = false if instance.id.nil?
+
+        my_member = instance.member_principals.where("users.id=#{current_user.id}").first
+        can_setting = false
+        if my_member && my_member.roles[0] && my_member.roles[0].id == 3
+          can_setting = true
+        end
         can_setting
       end
 
+      expose :is_creator, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+
+        current_user.id == instance.user_id
+      end
+
+
       expose :member_count, if: lambda { |instance, options| options[:user] } do |instance, options|
         instance.members.count
       end

app/api/mobile/entities/project_member.rb

@@ -0,0 +1,35 @@
+module Mobile
+  module Entities
+    class ProjectMember < Grape::Entity
+      include Redmine::I18n
+      include ApplicationHelper
+      include ApiHelper
+      def self.member_expose(f)
+        expose f do |u,opt|
+          if u.is_a?(Hash) && u.key?(f)
+            u[f]
+          elsif u.is_a?(::Member)
+            if u.respond_to?(f)
+              u.send(f)
+            else
+              case f
+                when :roles_id
+                  u.roles[0].id
+              end
+            end
+          end
+
+        end
+      end
+
+      expose :user, using: Mobile::Entities::User do |c, opt|
+        if c.is_a?(::Member)
+          c.user
+        end
+      end
+
+      member_expose :roles_id
+
+    end
+  end
+end

app/api/mobile/entities/user.rb

@@ -24,10 +24,12 @@ module Mobile
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
                 when :student_num
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.student_id
-                when :realname
-                  u.nil? ? "" : get_user_realname(u)
+                when :real_name
+                  u.nil? ? "" : get_user_realname(u).gsub(/\s*/,"");
                 when :name
                   u.nil? ? "" : u.show_name
+                when :roles_id
+                  u[:roles_id].nil? ? nil : u.roles_id
               end
             end
           end
@@ -37,11 +39,13 @@ module Mobile
 
       expose :id 
       #头像
-      user_expose :img_url
-      #昵称
       expose :nickname
       #真名
-      user_expose :realname
+      user_expose :img_url
+      #昵称
+      expose :realname
+      #昵称
+      user_expose :real_name
       #性别
       user_expose :gender
       #我的二维码
@@ -62,6 +66,8 @@ module Mobile
 
       user_expose :role_name
 
+      user_expose :roles_id
+
       user_expose :name
 
     end

app/controllers/projects_controller.rb

@@ -238,6 +238,7 @@ class ProjectsController < ApplicationController
       #end
       @project.members << m
       @project.project_infos << project_info
+      send_wechat_create_project_notice User.current,@project
       #end
       respond_to do |format|
         format.html {

app/controllers/school_controller.rb

@@ -203,6 +203,7 @@ class SchoolController < ApplicationController
       end
     end
 
+
     render :json =>status
   end
 end

app/controllers/wechats_controller.rb

@@ -8,10 +8,12 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-    if join_request(request)
+    if join_class_request(request)
       sendBindClass(request, {invite_code: content})
+    # elsif join_project_request(request)
+    #   sendBindProject(request, {invite_code: content})
     else
-      request.reply.text '您的意见已收到，感谢您的反馈！'
+      request.reply.text "您的意见已收到，非常感谢~ \n更多问题可以通过以下方式联系我们：\n官方QQ群：173184401\n我们会认真聆听您的意见和建议。"
     end
   end
 
@@ -143,11 +145,17 @@ class WechatsController < ActionController::Base
   end
 
   on :click, with: 'PROJECT' do |request, key|
-    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+    request.reply.text "该功能将在近日开发，敬请期待！"
   end
 
   on :click, with: 'JOIN_PROJECT' do |request, key|
-    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+    request.reply.text "该功能将在近日开发，敬请期待！"
+    # uw = user_binded?(request[:FromUserName])
+    # unless uw
+    #   sendBind(request)
+    # else
+    #   request.reply.text "请直接回复6位项目邀请码\n(不区分大小写):"
+    # end
   end
 
   on :click, with: 'JOIN_CLASS' do |request, key|
@@ -159,12 +167,18 @@ class WechatsController < ActionController::Base
     end
   end
 
-  def join_request(request)
+  def join_class_request(request)
     openid = request[:FromUserName]
     wl = WechatLog.where("openid = '#{openid}' and request_raw like '%\"Event\":\"click\"%'").order('id desc').first
     wl && JSON(wl.request_raw)["EventKey"] == 'JOIN_CLASS'
   end
 
+  def join_project_request(request)
+    openid = request[:FromUserName]
+    wl = WechatLog.where("openid = '#{openid}' and request_raw like '%\"Event\":\"click\"%'").order('id desc').first
+    wl && JSON(wl.request_raw)["EventKey"] == 'JOIN_PROJECT'
+  end
+
   def sendBindClass(request, params)
     begin
       uw = user_binded?(request[:FromUserName])
@@ -180,6 +194,21 @@ class WechatsController < ActionController::Base
     end
   end
 
+  def sendBindProject(request, params)
+    begin
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        return sendBind(request)
+      else
+        return join_project(params, uw.user, request)
+      end
+    rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
+      return request.reply.text e
+    end
+  end
+
   def default_msg(request)
     uw = user_binded?(request[:FromUserName])
     if uw && uw.user
@@ -234,6 +263,36 @@ class WechatsController < ActionController::Base
 
   end
 
+  def join_project(params, user, request)
+    project = nil
+    project = Project.where(qrcode: params[:ticket]).first if params[:ticket]
+    project = Project.where(invite_code: params[:invite_code]).first if params[:invite_code]
+    raise "项目不存在，请确认您的邀请码是否输入正确，谢谢！" unless project
+
+    #取出用户角色类型
+    role = 5
+
+    ps = ProjectsService.new
+    status = ps.join_project({invite_code: project.invite_code}, user)
+    if status[:state] != 0
+      raise ProjectService::JoinProjectError.message(status)
+    end
+
+    creator = User.find(project.user_id)
+
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入项目，开始研发吧！',
+                                                             content: "项目名称：#{project.name}\n发起人：#{creator.name}\n进入项目，和小伙伴轻松的研发吧！"} }
+    return request.reply.news(news) do |article, n, index| # article is return object
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/project?id='+project.id.to_s}&response_type=code&scope=snsapi_base&state=myproject#wechat_redirect"
+      pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
+      article.item title: "#{n[:title]}",
+                   description: n[:content],
+                   pic_url: pic_url,
+                   url: url
+    end
+
+  end
+
   ###  controller method
   module Controllers
     def get_bind
@@ -304,6 +363,8 @@ class WechatsController < ActionController::Base
       else
         if params[:state] == 'myclass'
           @course_id = params[:id];
+        elsif params[:state] == 'myproject'
+          @project_id = params[:id];
         end
 
         session[:wechat_openid] = open_id

app/services/courses_service.rb

@@ -89,7 +89,8 @@ class CoursesService
         @members = searchTeacherAndAssistant(c)
       when '2'
         #@subPage_title = l :label_student_list
-        @members = searchStudent(c)
+        # @members = searchStudent(c)
+        @members = searchmember_by_name(student_homework_score(0,c.id, 0,"desc"),"")
       else
         #@subPage_title = ''
         @members = c.member_principals.includes(:roles, :principal).all.sort
@@ -104,6 +105,7 @@ class CoursesService
                 :work_unit => work_unit, :mail => m.user.mail, :location => location,
                 role_name: m.roles.first.name,
                 name: m.user.show_name,
+                roles_id: m.roles[0].id,
                 :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
     end
     users
@@ -954,5 +956,49 @@ class CoursesService
   #   student_works[index + 1 .. index + n]
   # end
 
+  #修改班级成员角色
+  def modify_user_course_role params
+    status = -1
+
+    c = Course.find("#{params[:id]}")
+
+    member = c.member_principals.includes(:roles, :principal).where("user_id=?",params[:user_id]).first
+
+    if member
+        role = Role.find(params[:role_id])
+
+        member.member_roles[0].role_id = params[:role_id]
+
+        # 这里的判断只能通过角色名，可以弄成常量
+        if params[:role_id] == 10
+          StudentsForCourse.create(:student_id => params[:user_id], :course_id =>params[:id])
+        else
+          joined = StudentsForCourse.where('student_id = ? and course_id = ?', params[:user_id],params[:id])
+          joined.each do |join|
+            join.delete
+          end
+          member.course_group_id = 0
+        end
+        if role.allowed_to?(:is_manager)
+          courseInfo = CourseInfos.new(:user_id => params[:user_id], :course_id => params[:id])
+          courseInfo.save
+        else
+          user_admin = CourseInfos.where("user_id = ? and course_id = ?", params[:user_id], params[:id])
+          if user_admin.size > 0
+            user_admin.each do |user|
+              user.destroy
+            end
+          end
+        end
+
+        Role.givable.all[3..5]
+
+        if member.member_roles[0].save
+          status = 0
+        end
+    end
+    status
+  end
+
 end
 

app/services/projects_service.rb

@@ -3,30 +3,7 @@
 class ProjectsService
 
   include ApplicationHelper
-  # include CoursesHelper
 
-  def judge_can_setting(sy,user)
-    sy[:can_setting] = sy[:user_id] == user.id ? true : false
-
-    sy[:can_setting] = false if sy[:id].nil?
-
-    sy.courses.each do |c|
-      c[:can_setting] = false
-
-      member = c.members.where("user_id=#{user.id} and course_id=#{c.id}")[0]
-      roleName = member.roles[0].name if member
-
-      if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
-        c[:can_setting] = true
-      end
-
-      if c.tea_id == user.id
-        c[:can_setting] = true
-      end
-    end
-
-    sy
-  end
   #获取指定用户的项目列表
   def user_projects(user)
     projects = user.projects.not_deleted.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updated_at ").order("updated_at desc")
@@ -36,103 +13,130 @@ class ProjectsService
   #显示项目
   def show_project(params,current_user)
     project = Project.find(params[:id])
-    # course.generate_invite_code
-    # course.generate_qrcode
+    # project.generate_invite_code
+    # project.generate_qrcode
 
-    # 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}
     project
   end
 
-  def after_create_course(course, user)
-    #unless User.current.admin?
-    r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-    m = Member.new(:user => user, :roles => [r])
-    m.project_id = -1
-    course_info = CourseInfos.new(:user_id => user.id, :course_id => course.id)
-    #user_grades = UserGrade.create(:user_id => User.current.id, :course_id => @course.id)
-    course.members << m
-    course.course_infos << course_info
-  end
-
-  def send_wechat_create_class_notice user,course
-    count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count
+  def send_wechat_create_project_notice user,project
+    count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count
     if count == 0
       ws = WechatService.new
-      title = "恭喜您创建班级成功。"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情。"
+      title = "恭喜您创建项目成功。"
+      ws.create_project_notice user.id, "create_project_notice", project.id,title, project.name, format_time(project.created_on),"点击查看项目详情。"
     end
   end
 
-  #创建大纲
-  # params {title: '大纲名称', [{course}, {course}]}
-  def create(user, title, courses = [])
-    sy = Syllabus.new(title: title, user_id: user.id)
-    ActiveRecord::Base.transaction() do
-      sy.save!
 
-      courses.each do |course|
-        if ::Course === course
-          course.syllabus_id = sy.id
-          course.save!
-          send_wechat_create_class_notice user,course
-        elsif Hash === course
-          c = ::Course.new(course)
-          c.tea_id = user.id
-          c.syllabus_id = sy.id
-          c.update_default_value
-          c.is_public = 0
-          c.save!
-          after_create_course(c, user)
-          send_wechat_create_class_notice user,c
-        end
-      end
-
-    end
-    sy[:can_setting] = true
-    sy
-  end
-
-  #修改课程大纲的名称、班级名称、新增班级
-  def edit(user, option)
-    courses = []
+  def createNewProject params,user
     status = -1
-    syllabus_id = option[:id]
+    issue_custom_fields = IssueCustomField.sorted.all
+    trackers = Tracker.sorted.all
+    project = Project.new
 
-    sy = Syllabus.where("id=?",option[:id]).first
+    project[:name] = params[:name]
+    project[:description] = ''
+    project[:is_public] = '1'  #公开
+    project[:project_type] = 0
+    project[:project_new_type] = 1
+    project[:identifier] = Project.next_identifier if Setting.sequential_project_identifiers?
 
-    if sy && sy.user_id == user.id
-      syllabus_title = option[:title]
+    project.organization_id = params[:organization_id]
+    project.user_id = user.id
 
-      sy.title = syllabus_title
-      sy.save!
-      #修改班级名称
-      modify_courses = option[:modify_courses]
-      modify_courses.each do |c|
-        course = Course.where("id=?",c.id).first
+    # if validate_parent_id && @project.save
+    if project.save
+      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+      m = Member.new(:user => user, :roles => [r])
+      # project's score
+      if ProjectScore.where("project_id=?", project.id).first.nil?
+        ProjectScore.create(:project_id => project.id, :score => false)
+      end
+      # end
+      project_info = ProjectInfo.new(:user_id => user.id, :project_id => project.id)
+      user_grades =  UserGrade.create(:user_id => user.id, :project_id => project.id)
+      project_status = ProjectStatus.create(:project_id => project.id, :watchers_count => 0, :changesets_count => 0, :project_type => project.project_type,:grade => 0)
+      project.members << m
+      project.project_infos << project_info
+      status = 0
 
-        if course && course.tea_id == user.id
-          course.name = c.name
-          !course.save
+      send_wechat_create_project_notice user,project
+    end
+    status
+  end
+
+  #修改项目成员角色
+  def modify_user_project_role params
+    status = -1
+
+    project = Project.find("#{params[:id]}")
+
+    member = project.member_principals.includes(:roles, :principal).where("user_id=?",params[:user_id]).first
+
+    if member
+      member.member_roles[0].role_id = params[:role_id]
+
+
+      role = Role.find(params[:role_id])
+      if role.allowed_to?(:is_manager)
+        projectInfo = ProjectInfo.new(:user_id => member.user_id, :project_id => project.id)
+        projectInfo.save
+      else
+        user_admin = ProjectInfo.where("user_id = ? and project_id = ?", member.user_id, project.id)
+        if user_admin.size > 0
+          user_admin.each do |user|
+            user.destroy
+          end
         end
       end
 
-      #新增班级
-      add_courses = option[:add_courses]
-      add_courses.each do |c|
-        course = Course.new()
-        course.name = c
-        course.tea_id = user.id
-        course.syllabus_id = sy.id
-        course.update_default_value
-        course.is_public = 0
-        course.save!
-        after_create_course(course, user)
-        send_wechat_create_class_notice user,course
+      if member.member_roles[0].save
+        status = 0
       end
-      status = 0
+    end
+    status
+  end
+
+  class JoinProjectError < Errors
+    define_error [
+                     0, '加入成功',
+                     1, '您的邀请码不正确',
+                     2, '您还未登录',
+                     3, '您已经是该项目的管理人员',
+                     4, '您已经是该项目的开发人员',
+                     5, '您已经是该项目的报告人员',
+                     6, '该项目不存在或已被删除啦',
+                     '未知错误，请稍后再试'
+                 ]
+  end
+
+  def join_project params,current_user
+    status = -1
+    project = project.find_by_invite_code(params[:invite_code]) if params[:invite_code]
+
+    if project
+      if project[:is_delete] == 1
+        status = 6
+      else
+        if current_user.member_of?(project) #如果已经是成员
+          member = project.member_principals.includes(:roles, :principal).where("user_id=?",current_user.id).first
+          status = member.member_roles[0].role_id
+        else
+          if params[:invite_code].present?
+            members = []
+            members << Member.new(:role_ids => [5], :user_id => current_user.id)
+            project.members << members
+            projectInfo = ProjectInfo.new(:user_id => current_user.id, :project_id => project.id)
+            projectInfo.save
+            status = 0
+          else
+            status = 4
+          end
+        end
+      end
+    else
+      status = 4
     end
     status
   end

app/services/wechat_service.rb

@@ -323,4 +323,41 @@ class WechatService
     end
   end
 
+  def create_project_notice(user_id, type, id, first, key1, key2,remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = {
+          touser:uw.openid,
+          template_id:Wechat.config.create_project_notice,
+          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/project?id="+id.to_s,
+          topcolor:"#FF0000",
+          data:{
+              first: {
+                  value:first,
+                  color:"#707070"
+              },
+              keyword1:{
+                  value:key1,
+                  color:"#707070"
+              },
+              keyword2:{
+                  value:key2,
+                  color:"#707070"
+              },
+              remark:{
+                  value:remark,
+                  color:"#707070"
+              }
+          }
+      }
+      #data = three_keys_template uw.openid,Wechat.config.create_class_notice, type, id, first, key1, key2, key3, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[wechat_create_project_notice] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
 end

app/views/wechats/user_activities.html.erb

@@ -18,6 +18,8 @@
     window.g_redirect_path = '<%= @path %>';
     <% if @course_id %>
     window.g_courseid = <%= @course_id %>;
+    <% elsif @project_id %>
+    window.g_projectid = <%= @project_id %>;
     <% end %>
   </script>
 

config/menu.yml.production

@@ -2,18 +2,22 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
  -
-  name: "我的课程"
+  name: "我的群组"
   sub_button:
   -
     type: "view"
-    name: "课程"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
+    name: "我的课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
+  -
+    type: "click"
+    name: "我的项目"
+    url:  "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=project_list#wechat_redirect"
   -
     type: "view"
-    name: "资源"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
+    name: "我的宝库"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
 
  -
   name: "更多"
@@ -24,9 +28,13 @@ button:
     key:  "JOIN_CLASS"
   -
     type: "click"
-    name: "反馈"
-    key:  "FEEDBACK"
+    name: "加入项目"
+    key:  "JOIN_PROJECT"
   -
     type: "view"
     name: "历史推文"
     url:  "http://mp.weixin.qq.com/mp/getmasssendmsg?__biz=MzIwOTM2NDkxMA==#wechat_webview_type=1&wechat_redirect"
+  -
+    type: "click"
+    name: "联系我们"
+    key:  "FEEDBACK"

config/wechat.yml.template

@@ -2,19 +2,11 @@ default: &default
 #  corpid: "corpid"
 #  corpsecret: "corpsecret"
 #  agentid:  1
-#
-#-  # guange test
-  #appid: "wxf694495398c7d470"
-  #secret: "743e038392f1d89540e95f8f7645849a"
 
   #production
   appid: "wx8e1ab05163a28e37"
   secret: "beb4d3bc4b32b3557811680835357841"
 
-  #test
-#  appid: "wxc09454f171153c2d"
-#  secret: "dff5b606e34dcafe24163ec82c2715f8"
-
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
@@ -22,24 +14,14 @@ default: &default
   #production
   encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
-#
-#  #template
+
+  #template
   binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
   journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
   homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
   class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
   create_class_notice: "2GtJJGzzNlNy2i0UrsjEDlvfSVIUXQfSo47stpcQAVw"
-
-  #test
-#  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
-#  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
-#
-#  #template
-#  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-#  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-#  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-#  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
-#  create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I"
+  create_project_notice: "R2ZaQKJfDJgujPcHWPzadKHIRkIyj2CjX2o_qIuRqig"
 
 production:
   <<: *default

config/wechat.yml.test

@@ -2,26 +2,26 @@ default: &default
 #  corpid: "corpid"
 #  corpsecret: "corpsecret"
 #  agentid:  1
-# Or if using public account, only need above two line
 
-  # guange test
-  #appid: "wxf694495398c7d470"
-  #secret: "743e038392f1d89540e95f8f7645849a"
-
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+  #test
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
 
   token:    "123456"
-  access_token: ".access_token"
+  access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "tmp/wechat_jsapi_ticket"
+
+  #test
+  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
-  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
-  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
-  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
+  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
+  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
+  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
+  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I"
+  create_project_notice: "R2ZaQKJfDJgujPcHWPzadKHIRkIyj2CjX2o_qIuRqig"
 
 production:
   <<: *default

lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb

@@ -10,7 +10,7 @@ module Redmine
         def acts_as_watchable(options = {})
           return if self.included_modules.include?(Redmine::Acts::Watchable::InstanceMethods)
           class_eval do
-            has_many :watchers,  :dependent => :delete_all
+            has_many :watchers, :as => :watchable, :dependent => :delete_all
             has_many :watcher_users, :through => :watchers, :source => :user, :validate => false
 
             scope :watched_by, lambda { |user_id|
@@ -51,7 +51,7 @@ module Redmine
             #通过model层删除以触发before_destroy事件 -by zjc
             watchers = Watcher.find_by_sql  "select * from `watchers` where watchable_type = 'Principal' AND watchable_id = #{self.id} AND user_id = #{user.id}"
             watchers.each do |watcher|
-               watcher.destroy
+              watcher.destroy
             end
             #Watcher.delete_all "watchable_type = 'Principal' AND watchable_id = #{self.id} AND user_id = #{user.id}"
           else

public/assets/wechat/class.html

@@ -31,12 +31,16 @@
         <div class="member-banner f13 c-grey3">授课老师</div>
 
         <div class="class-member-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
-            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img src="/images/wechat/setting.png" ng-show = "course.is_creator && teacher.id != course.tea_id" width="15" class="fr mr10" style="margin-top:7px;" ng-click="onSetting(teacher)" />
+            <span class = "fr mr25 mt5" ng-show ="teacher.id == course.tea_id">管理员</span>
+            <span ng-class="['fr','mt5',{'mr10': course.is_creator,'mr25': !course.is_creator}]" ng-show ="teacher.id != course.tea_id && teacher.roles_id == 7">教辅</span>
             <div class="cl"></div>
         </div>
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
             <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img src="/images/wechat/setting.png" ng-show = "course.is_creator" width="15" class="class-list-setting" ng-click="onSetting(student)" />
             <div class="cl"></div>
         </div>
     </div>
@@ -50,8 +54,8 @@
 
     <div ng-class="{'undis': !showTestcase}">
         <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 undis" ng-click="sendFile(r,3)">发送</a><div class="cl"></div></div>
-        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验，<br />
-            请登录Trustie网站，在PC浏览器中上传小测验。</p>
+        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无测验，<br />
+            请登录Trustie网站，在PC浏览器中上传测验。</p>
     </div>
 
 

public/assets/wechat/class_list.html

@@ -35,7 +35,7 @@
     <div class="bottom-tab-wrap mt10">
         <a ng-click="newClass()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>
         <a ng-click="joinClass()" class="weixin-tab link-blue2 border-top">加入班级</a>
-        <a ng-click="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
+        <!--<a ng-click="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>-->
     </div>
 
     <my-alert message="alertService_1.message" title="alertService_1.title" visible="alertService_1.visible" cb="alertService_1.cb"></my-alert>

public/assets/wechat/edit_class_member.html

@@ -0,0 +1,21 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
+        <div class="blue-title">角色变更</div>
+        <div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+        <ul class="class-list f13 c-grey3">
+            <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 9}]"></span></li>
+            <li><span class="fl ml10 class-list-name hidden">教辅</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 7}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 10}]"></span></li>
+        </ul>
+        <div class="bottom-tab-wrap mt10">
+            <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
+            <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>
+        </div>
+    </div>
+
+
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>

public/assets/wechat/edit_project_member.html

@@ -0,0 +1,21 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
+    <div class="blue-title">角色变更</div>
+    <div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.real_name == "" ? current_edit_member.user.name : current_edit_member.user.real_name}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+    <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+    <ul class="class-list f13 c-grey3">
+        <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-click="selectRole(3)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 3}]"></span></li>
+        <li><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-click="selectRole(4)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 4}]"></span></li>
+        <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">报告人员</span><span ng-click="selectRole(5)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 5}]"></span></li>
+    </ul>
+    <div class="bottom-tab-wrap mt10">
+        <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
+        <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>
+    </div>
+</div>
+
+
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>

public/assets/wechat/homework_detail.html

@@ -1,86 +1,86 @@
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<div loading-spinner></div>
-<div ng-if="homework.act_type == 'HomeworkCommon'">
-    <div class="post-container">
-        <div class="post-wrapper" style="margin-top:0;">
-            <div class="post-main">
-                <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                <div class="post-dynamic-author hidden fl">
-                    {{homework.author.realname}}
-                    <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                    <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                </div>
-                <div class="cl"></div>
-                <div class="ml40">
-                    <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
-                    <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
-                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
-                    <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
-                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
-                    <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
-                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
-                <div class="cl"></div>
-                </div>
-                <div class="fr f13">
-                    <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
-                    <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.comment_count}}</span></a>
-                </div>
-                <div class="cl"></div>
-            </div>
-            <div class="mb50" id="all_homework_reply">
-
-                <div ng-if="homework.all_children == ''" style="border-top:1px solid #ccc;"></div>
-                <div class="post-reply-wrap" ng-repeat="journal in homework.all_children">
-                    <div class="post-reply-row">
-                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
-                        </div>
-                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
-                        <div class="cl"></div>
-
-                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
-                            <!--<ul ng-if="journal.parents_reply_top[0]" ng-include="'comment_reply'"  ng-init="i=0;journal=journal"></ul>-->
-                            <comment-reply i="0" journal="journal" ></comment-reply>
-                            <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
-                            <div class="ml5 mr5 mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                <div class="post-reply-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
-                                </div>
-                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
-                                <div class="cl"></div>
-                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
-                                <div class="cl"></div>
-                            </div>
-                        </div>
-
-                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
-                        <div class="cl"></div>
-                    </div>
-                </div>
-                <div ng-if="has_more">
-                    <div id="more_reply" class="more-events mt10" ng-click="showMoreReply(0,homework);">更多</div>
-                </div>
-            </div>
-
-            <div id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row border-bottom-none">
-                    <div class="post-input-container">
-                        <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
-                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
-                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
-                        <div class="cl"></div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
+<div ng-if="homework.act_type == 'HomeworkCommon'">
+    <div class="post-container">
+        <div class="post-wrapper" style="margin-top:0;">
+            <div class="post-main">
+                <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{homework.author.realname}}
+                    <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
+                    <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
+                    <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
+                <div class="cl"></div>
+                </div>
+                <div class="fr f13">
+                    <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                    <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.comment_count}}</span></a>
+                </div>
+                <div class="cl"></div>
+            </div>
+            <div class="mb50" id="all_homework_reply">
+
+                <div ng-if="homework.all_children == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in homework.all_children">
+                    <div class="post-reply-row">
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-reply-author hidden fl">
+                            {{journal.user.realname}}
+                        </div>
+                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
+                            <!--<ul ng-if="journal.parents_reply_top[0]" ng-include="'comment_reply'"  ng-init="i=0;journal=journal"></ul>-->
+                            <comment-reply i="0" journal="journal" ></comment-reply>
+                            <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
+                            <div class="ml5 mr5 mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
+                                <div class="post-reply-author hidden fl ng-binding">
+                                    {{reply_bottom.user.realname}}
+                                </div>
+                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
+                                <div class="cl"></div>
+                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+                <div ng-if="has_more">
+                    <div id="more_reply" class="more-events mt10" ng-click="showMoreReply(0,homework);">更多</div>
+                </div>
+            </div>
+
+            <div id="post_input_1" class="post-input-wrap post-box-shadow">
+                <div class="post-reply-row border-bottom-none">
+                    <div class="post-input-container">
+                        <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
 </div>

public/assets/wechat/myresource.html

@@ -32,15 +32,15 @@
         <p ng-show="homeworks_tag == true && homeworks.length<=0" class="class-test-tip">暂无作业，<br />
             请登录Trustie网站，在PC浏览器中创建作业。</p>
     </div>
-    <div ng-class="{'undis': currentTab!=3}">
-        <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,3)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
-            <span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源：{{r.coursename}}</span><div class="cl"></div>
-        </div>
-        <div ng-if="exercise_has_more">
-            <div id="more_exercises" class="more-events mt10" ng-click="loadResourceData(3,exercise_page+1);">更多</div>
-        </div>
-        <p ng-show="exercises_tag == true && exercise.length<=0" class="class-test-tip">暂无测验，<br />
-            请登录Trustie网站，在PC浏览器中创建测验。</p>
-    </div>
+    <!--<div ng-class="{'undis': currentTab!=3}">-->
+        <!--<div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,3)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>-->
+            <!--<span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源：{{r.coursename}}</span><div class="cl"></div>-->
+        <!--</div>-->
+        <!--<div ng-if="exercise_has_more">-->
+            <!--<div id="more_exercises" class="more-events mt10" ng-click="loadResourceData(3,exercise_page+1);">更多</div>-->
+        <!--</div>-->
+        <!--<p ng-show="exercises_tag == true && exercise.length<=0" class="class-test-tip">暂无测验，<br />-->
+            <!--请登录Trustie网站，在PC浏览器中创建测验。</p>-->
+    <!--</div>-->
 
 </div>

public/assets/wechat/new_project.html

@@ -0,0 +1,11 @@
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <div class="blue-title">新建项目</div>
+    <form novalidate name="classForm">
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="例如：团队写作方法与机制研究" /></div>
+        <a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
+    </form>
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>

public/assets/wechat/project.html

@@ -1,60 +1,132 @@
 <div class="post-container">
     <div loading-spinner></div>
-    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
+    <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{project.name}}</span><span  ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
     <div class="tab-wrap">
         <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
     </div>
-    <!--<div class="slice3 fl"></div>-->
+
+    <div ng-class="{'undis': currentTab != 1}">
+        <div ng-repeat="act in project_activities">
+            <div ng-if="act.container_type=='Project' ">
+                <div ng-if="act.act_type=='Issue'">
+                    <div class="post-container">
+                        <div class="post-wrapper">
+                            <div class="post-main">
+                                <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
+                                    <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                    <div class="post-dynamic-author hidden fl">
+                                        <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                        <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                        <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                        <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                    </div>
+                                    <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                                    <div class="cl"></div>
+                                    <div class="post-dynamic-title c-grey3 hidden mt12 fb">【问题】{{act.subject|safeHtml}}</div>
+                                    <div class="post-content c-grey3 mt10 mb10">
+                                        <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                        <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
+                                        <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
+                                    </div>
+                                    <div class="cl"></div>
+                                </div>
+                                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                                <div class="fr f13">
+                                    <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                                    <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                    <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                </div>
+                                <div class="fr mr25 f13">
+                                    <a ng-if="!act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                                    <a ng-if="act.reply_count" ng-click="goDetail('issues',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                                </div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
 
 
-    <!--<div ng-repeat="menu in menus">-->
-    <!--<div id="class_tab_1" ng-class="[{'class-detail-tab': isTeacher},{'class-detail-tab3': !isTeacher},{'class-tab-active':currentTab==$index+1}]" ng-click="tab($index+1);"><a herf="javascript:void(0);">{{menu}}</a></div>-->
-    <!--<div ng-if="!$last" class="slice2 fl">-->
-    <!--<div class="slice-line2"></div>-->
-    <!--</div>-->
-    <!--</div>-->
+                <div ng-if="act.act_type=='Message'">
+                    <div class="post-container">
+                        <div class="post-wrapper">
+                            <div class="post-main">
+                                <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
+                                    <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                    <div class="post-dynamic-author hidden fl">
+                                        <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                                        <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                        <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                        <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                    </div>
+                                    <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
+                                    <div class="cl"></div>
+                                    <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                                    <div class="post-content c-grey3 mt10 mb10">
+                                        <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                                    </div>
+                                    <div class="cl"></div>
+                                </div>
+                                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+                                <div class="fr f13">
+                                    <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                                    <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                    <div ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
+                                </div>
+                                <div class="fr mr25 f13">
+                                    <a ng-if="!act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                                    <a ng-if="act.reply_count" ng-click="goDetail('project_discussion',act.act_id, act.id)"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                                </div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
 
-    <!--<div class="slice3 fl"></div>-->
-    <!--<div class="cl"></div>-->
-    <div class="class-search-wrap">
-        <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
-            <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
+                <div ng-if="act.act_type=='Project'">
+                    <div class="post-container">
+                        <div class="post-wrapper">
+                            <div class="post-main">
+                                <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
+                                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                                <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div ng-if="project_has_more">
+            <div id="more_project_activities" class="more-events mt10" ng-click="getActivities(project_activities_page+1);">更多</div>
         </div>
     </div>
 
-    <div ng-class="{'undis': !showResources}">
-        <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r,1)">发送</a><div class="cl"></div></div>
-        <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件，<br />
-            请登录Trustie网站，在PC浏览器中上传课件。</p>
-    </div>
-    <div ng-class="{'undis': !showClassMate}">
-        <div class="member-banner f13 c-grey3">授课老师</div>
-
-        <div class="class-member-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
-            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+    <div ng-class="{'undis': currentTab != 2}">
+        <div class="class-search-wrap">
+            <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
+                <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
+            </div>
+        </div>
+        <div class="member-banner f13 c-grey3">管理人员({{project_master_members.length}})</div>
+        <div class="class-member-row f13 c-grey3" ng-repeat="master in project_master_members|filter:searchText">
+            <img ng-src="/images/wechat/{{master.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{master.user.real_name == "" ? master.user.name : master.user.real_name }}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{master.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting" width="15" class="class-list-setting" ng-click="onSetting(master)" />
             <div class="cl"></div>
         </div>
-        <div class="member-banner f13 mt10 c-grey3">我的同学</div>
-        <div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
-            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+        <div class="member-banner f13 mt10 c-grey3">开发人员({{project_develop_members.length}})</div>
+        <div class="class-member-row f13 c-grey3" ng-repeat="develop in project_develop_members|filter:searchText">
+            <img ng-src="/images/wechat/{{develop.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{develop.user.real_name == "" ? develop.user.name : develop.user.real_name}}</span><img ng-src="/images/wechat/{{develop.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting " width="15" class="class-list-setting" ng-click="onSetting(develop)" />
+            <div class="cl"></div>
+        </div>
+        <div class="member-banner f13 mt10 c-grey3">报告人员({{project_report_members.length}})</div>
+        <div class="class-member-row f13 c-grey3" ng-repeat="report in project_report_members|filter:searchText">
+            <img ng-src="/images/wechat/{{report.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{report.user.real_name == "" ? report.user.name : report.user.real_name}}</span><img ng-src="/images/wechat/{{report.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting " width="15" class="class-list-setting" ng-click="onSetting(report)" />
             <div class="cl"></div>
         </div>
     </div>
 
-    <div ng-class="{'undis': !showHomework}">
-        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 " ng-click="sendFile(r,2)">发送</a><div class="cl"></div></div>
-        <p ng-show="homeworks_tag == true && homeworks.length<=0" class="class-test-tip">暂无作业，<br />
-            请登录Trustie网站，在PC浏览器中上传作业。</p>
-
-    </div>
-
-    <div ng-class="{'undis': !showTestcase}">
-        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 undis" ng-click="sendFile(r,3)">发送</a><div class="cl"></div></div>
-        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验，<br />
-            请登录Trustie网站，在PC浏览器中上传小测验。</p>
-    </div>
-
-
-
     <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>

public/assets/wechat/project_invite_code.html

@@ -0,0 +1,16 @@
+<div class="post-container">
+    <div class="qr-code-wrap">
+        <div class="qr-code-box">
+            <div class="share-class-name">{{project.name}}</div>
+            <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{project.qrcode}}" width="152" class="qr-code-img" /></div>
+            <div class="invitation-code-wrap">邀请码：{{project.invite_code}}</div>
+        </div>
+    </div>
+    <div class="share-code-wrap">
+        <!--<a ng-click="share()" href="javascript:void(0);" class="share-code-btn">分享邀请码</a>-->
+        <p/>
+        <div class="share-code-instruction"> 1.点击右上角"发送给朋友"，邀请朋友加入项目<br />
+            2.长按二维码，通过“识别图中二维码”功能加入项目<br />
+            3.通过“加入项目”菜单输入邀请码加入项目（长按邀请码可以复制哦~）</div>
+    </div>
+</div>

public/assets/wechat/project_list.html

@@ -5,7 +5,7 @@
     <div>
         <div class="course-diff-row"><span class="c-blue f13 ml10">我创建的项目</span></div>
         <div  ng-repeat="project in projects" style="position:relative;">
-            <div ng-click="goProject(project.id)" ng-show="project.can_setting" class="course-list-row f13 c-grey3 border-top-none">
+            <div ng-click="goProject(project.id)" ng-show="project.is_creator" class="course-list-row f13 c-grey3 border-top-none">
                 <span class="fl ml15 class-list-name hidden">{{project.name}}</span>
                 <span class="fr c-grey4 mr10">&gt;</span>
                 <span class="students-amount f12 fr mt10 mr5">{{project.member_count}}人</span>
@@ -18,7 +18,7 @@
     <div>
         <div class="course-diff-row mt10"><span class="c-blue f13 ml10">我参与的项目</span></div>
         <div ng-click="goProject(project.id)"  ng-repeat="project in projects" style="position:relative;">
-            <div ng-show="!project.can_setting" class="course-list-row f13 c-grey3 border-top-none">
+            <div ng-show="!project.is_creator" class="course-list-row f13 c-grey3 border-top-none">
                 <span class="fl ml15 class-list-name hidden">{{project.name}}</span>
                 <span class="fr c-grey4 mr10">&gt;</span>
                 <span class="students-amount f12 fr mt10 mr5">{{project.member_count}}人</span>

public/javascripts/wechat/controllers/activity.js

@@ -1,199 +1,199 @@
-
-app.controller('ActivityController',
-    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
-    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
-    $scope.replaceUrl = function(url){
-        return url;
-    };
-
-    $scope.menus = ['所有动态', '课程动态', '项目动态'];
-
-    $scope.alertService = alertService.create();
-    console.log("ActivityController load");
-
-    $scope.page = rms.get('page') || 0;
-    $scope.activities = rms.get("activities") || [];
-    $scope.has_more = rms.get("has_more");
-
-    $scope.course_page = rms.get('course_page') || 0;
-    $scope.course_activities = rms.get("course_activities") || [];
-    $scope.course_has_more = rms.get("course_has_more");
-
-    $scope.project_page = rms.get('project_page') || 0;
-    $scope.project_activities = rms.get("project_activities") || [];
-    $scope.project_has_more = rms.get("project_has_more");
-
-    $scope.loadActData = function(index,page){
-        container_type = "All";
-        switch(index){
-            case 1:
-                container_type = "All";
-                $scope.page = page;
-                break;
-            case 2:
-                container_type = "Course";
-                $scope.course_page = page;
-                break;
-            case 3:
-                container_type = "Project";
-                $scope.project_page = page;
-                break;
-        }
-
-        $http({
-            method: 'POST',
-            url: apiUrl+ "activities",
-            data: {token: auth.token(), page: page, container_type: container_type}
-        }).then(function successCallback(response) {
-            if(response.data.page >0) {
-                switch(response.data.container_type){
-                    case "All":
-                        $scope.activities = $scope.activities.concat(response.data.data);
-                        break;
-                    case "Course":
-                        $scope.course_activities = $scope.course_activities.concat(response.data.data);
-                        break;
-                    case "Project":
-                        $scope.project_activities = $scope.project_activities.concat(response.data.data);
-                        break;
-                    case 3:
-                }
-            } else {
-                switch(response.data.container_type){
-                    case "All":
-                        $scope.activities = response.data.data;
-                        break;
-                    case "Course":
-                        $scope.course_activities = response.data.data;
-                        break;
-                    case "Project":
-                        $scope.project_activities = response.data.data;
-                        break;
-                    case 3:
-                }
-            }
-
-            switch(response.data.container_type){
-                case "All":
-                    rms.save("activities", $scope.activities);
-                    $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
-                    rms.save('has_more', $scope.has_more);
-                    rms.save('page', response.data.page);
-                    break;
-                case "Course":
-                    rms.save("course_activities", $scope.course_activities);
-                    $scope.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
-                    rms.save('course_has_more', $scope.course_has_more);
-                    rms.save('course_page', response.data.page);
-                    break;
-                case "Project":
-                    rms.save("project_activities", $scope.project_activities);
-                    $scope.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
-                    rms.save('project_has_more', $scope.project_has_more);
-                    rms.save('project_page', response.data.page);
-                    break;
-                case 3:
-            }
-            console.log(response.data);
-
-        }, function errorCallback(response) {
-        });
-    };
-
-    $scope.tab = function(index){
-        $scope.currentTab = index;
-        switch(index){
-            //ALL
-            case 1:
-                if($scope.activities.length<=0){
-                    $scope.loadActData(index,0);
-                }
-                break;
-            //Course
-            case 2:
-                if($scope.course_activities.length<=0){
-                    $scope.loadActData(index,0);
-                }
-                break;
-            //Project
-            case 3:
-                if($scope.project_activities.length<=0){
-                    $scope.loadActData(index,0);
-                }
-                break;
-        }
-        rms.save("tab_num",$scope.currentTab);
-    }
-
-
-    $scope.currentTab = rms.get('tab_num') || 1;
-
-    if($scope.activities.length<=0){
-        $scope.loadActData('tab_num',0);
-    } else {
-        $timeout(function(){
-            window.scrollTo(0, rms.get("yoffset"));
-        });
-    }
-
-    //跳到详情页
-    $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
-        rms.save("activities",$scope.activities);
-        rms.save("course_activities",$scope.course_activities);
-        rms.save("project_activities",$scope.project_activities);
-        $location.path('/'+type+'/'+act_id);
-    }
-
-    $scope.addPraise = function(act){
-        for(var i in $scope.activities){
-            if($scope.activities[i].act_id == act.act_id){
-                $scope.activities[i].praise_count += 1;
-                $scope.activities[i].has_praise = true;
-                break;
-            }
-        }
-        for(var i in $scope.course_activities){
-            if($scope.course_activities[i].act_id == act.act_id){
-                $scope.course_activities[i].praise_count += 1;
-                $scope.course_activities[i].has_praise = true;
-                break;
-            }
-        }
-        for(var i in $scope.project_activities){
-            if($scope.project_activities[i].act_id == act.act_id){
-                $scope.project_activities[i].praise_count += 1;
-                $scope.project_activities[i].has_praise = true;
-                break;
-            }
-        }
-
-        common.addCommonPraise(act);
-    };
-
-    $scope.decreasePraise = function(act){
-        for(var i in $scope.activities){
-            if($scope.activities[i].act_id == act.act_id){
-                $scope.activities[i].praise_count -= 1;
-                $scope.activities[i].has_praise = false;
-                break;
-            }
-        }
-        for(var i in $scope.course_activities){
-            if($scope.course_activities[i].act_id == act.act_id){
-                $scope.course_activities[i].praise_count -= 1;
-                $scope.course_activities[i].has_praise = false;
-                break;
-            }
-        }
-        for(var i in $scope.project_activities){
-            if($scope.project_activities[i].act_id == act.act_id){
-                $scope.project_activities[i].praise_count -= 1;
-                $scope.project_activities[i].has_praise = false;
-                break;
-            }
-        }
-
-        common.decreaseCommonPraise(act);
-    };
+
+app.controller('ActivityController',
+    ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
+    function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
+    $scope.replaceUrl = function(url){
+        return url;
+    };
+
+    $scope.menus = ['所有动态', '课程动态', '项目动态'];
+
+    $scope.alertService = alertService.create();
+    console.log("ActivityController load");
+
+    $scope.page = rms.get('page') || 0;
+    $scope.activities = rms.get("activities") || [];
+    $scope.has_more = rms.get("has_more");
+
+    $scope.course_page = rms.get('course_page') || 0;
+    $scope.course_activities = rms.get("course_activities") || [];
+    $scope.course_has_more = rms.get("course_has_more");
+
+    $scope.project_page = rms.get('project_page') || 0;
+    $scope.project_activities = rms.get("project_activities") || [];
+    $scope.project_has_more = rms.get("project_has_more");
+
+    $scope.loadActData = function(index,page){
+        container_type = "All";
+        switch(index){
+            case 1:
+                container_type = "All";
+                $scope.page = page;
+                break;
+            case 2:
+                container_type = "Course";
+                $scope.course_page = page;
+                break;
+            case 3:
+                container_type = "Project";
+                $scope.project_page = page;
+                break;
+        }
+
+        $http({
+            method: 'POST',
+            url: apiUrl+ "activities",
+            data: {token: auth.token(), page: page, container_type: container_type}
+        }).then(function successCallback(response) {
+            if(response.data.page >0) {
+                switch(response.data.container_type){
+                    case "All":
+                        $scope.activities = $scope.activities.concat(response.data.data);
+                        break;
+                    case "Course":
+                        $scope.course_activities = $scope.course_activities.concat(response.data.data);
+                        break;
+                    case "Project":
+                        $scope.project_activities = $scope.project_activities.concat(response.data.data);
+                        break;
+                    case 3:
+                }
+            } else {
+                switch(response.data.container_type){
+                    case "All":
+                        $scope.activities = response.data.data;
+                        break;
+                    case "Course":
+                        $scope.course_activities = response.data.data;
+                        break;
+                    case "Project":
+                        $scope.project_activities = response.data.data;
+                        break;
+                    case 3:
+                }
+            }
+
+            switch(response.data.container_type){
+                case "All":
+                    rms.save("activities", $scope.activities);
+                    $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('has_more', $scope.has_more);
+                    rms.save('page', response.data.page);
+                    break;
+                case "Course":
+                    rms.save("course_activities", $scope.course_activities);
+                    $scope.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('course_has_more', $scope.course_has_more);
+                    rms.save('course_page', response.data.page);
+                    break;
+                case "Project":
+                    rms.save("project_activities", $scope.project_activities);
+                    $scope.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                    rms.save('project_has_more', $scope.project_has_more);
+                    rms.save('project_page', response.data.page);
+                    break;
+                case 3:
+            }
+            console.log(response.data);
+
+        }, function errorCallback(response) {
+        });
+    };
+
+    $scope.tab = function(index){
+        $scope.currentTab = index;
+        switch(index){
+            //ALL
+            case 1:
+                if($scope.activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+            //Course
+            case 2:
+                if($scope.course_activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+            //Project
+            case 3:
+                if($scope.project_activities.length<=0){
+                    $scope.loadActData(index,0);
+                }
+                break;
+        }
+        rms.save("tab_num",$scope.currentTab);
+    }
+
+
+    $scope.currentTab = rms.get('tab_num') || 1;
+
+    if($scope.activities.length<=0){
+        $scope.loadActData('tab_num',0);
+    } else {
+        $timeout(function(){
+            window.scrollTo(0, rms.get("yoffset"));
+        });
+    }
+
+    //跳到详情页
+    $scope.goDetail = function(type, act_id,id){
+        rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
+        rms.save("activities",$scope.activities);
+        rms.save("course_activities",$scope.course_activities);
+        rms.save("project_activities",$scope.project_activities);
+        $location.path('/'+type+'/'+act_id);
+    }
+
+    $scope.addPraise = function(act){
+        for(var i in $scope.activities){
+            if($scope.activities[i].act_id == act.act_id){
+                $scope.activities[i].praise_count += 1;
+                $scope.activities[i].has_praise = true;
+                break;
+            }
+        }
+        for(var i in $scope.course_activities){
+            if($scope.course_activities[i].act_id == act.act_id){
+                $scope.course_activities[i].praise_count += 1;
+                $scope.course_activities[i].has_praise = true;
+                break;
+            }
+        }
+        for(var i in $scope.project_activities){
+            if($scope.project_activities[i].act_id == act.act_id){
+                $scope.project_activities[i].praise_count += 1;
+                $scope.project_activities[i].has_praise = true;
+                break;
+            }
+        }
+
+        common.addCommonPraise(act);
+    };
+
+    $scope.decreasePraise = function(act){
+        for(var i in $scope.activities){
+            if($scope.activities[i].act_id == act.act_id){
+                $scope.activities[i].praise_count -= 1;
+                $scope.activities[i].has_praise = false;
+                break;
+            }
+        }
+        for(var i in $scope.course_activities){
+            if($scope.course_activities[i].act_id == act.act_id){
+                $scope.course_activities[i].praise_count -= 1;
+                $scope.course_activities[i].has_praise = false;
+                break;
+            }
+        }
+        for(var i in $scope.project_activities){
+            if($scope.project_activities[i].act_id == act.act_id){
+                $scope.project_activities[i].praise_count -= 1;
+                $scope.project_activities[i].has_praise = false;
+                break;
+            }
+        }
+
+        common.decreaseCommonPraise(act);
+    };
 }]);

public/javascripts/wechat/controllers/class.js

@@ -139,11 +139,19 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
     var resetMenu = function(is_teacher){
         vm.isTeacher = is_teacher;
         if(is_teacher){
-            vm.menus = ["课件", "作业", "小测验", "学生管理"];
+            vm.menus = ["课件", "作业", "测验", "成员管理"];
         } else {
             vm.menus = ['课件', "我的同学"];
         }
 
     }
 
+    vm.onSetting = function(user){
+        rms.save('current_edit_member', user);
+        $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
+    };
+
+
+
+
 }]);

public/javascripts/wechat/controllers/edit_class.js

@@ -47,7 +47,7 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
                     token: auth.token()
                 }).then(function(response){
                     if(response.data.status!=0){
-                        vm.alertService_1.showMessage('出错了', response.data.message);
+                        vm.alertService_1.showMessage('提示', response.data.message);
                     } else {
                         vm.alertService_1.showMessage('提示', '删除班级成功', function(){
                             vm.syllabus.courses.splice(index, 1);

public/javascripts/wechat/controllers/edit_class_member.js

@@ -0,0 +1,71 @@
+
+
+app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+    vm.current_edit_member = null;
+
+    vm.alertService = alertService.create();
+
+    var course_id = $routeParams.id;
+    var user_id = $routeParams.user_id;
+    if(!vm.current_edit_member){
+        $http.post(config.apiUrl+'courses/get_member_info', {
+            token: auth.token(),
+            id: course_id,
+            user_id:user_id
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                course_id = response.data.course_id;
+                user_id = response.data.user_id;
+                vm.current_edit_member = response.data.member_info;
+                vm.current_roles_id = vm.current_edit_member.roles_id;
+            }
+        });
+    }
+
+    console.log(vm.current_edit_member);
+
+    vm.cancel = function(){
+        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            rms.save("project_master_members",[]);
+//            rms.save("project_develop_members",[]);
+//            rms.save("project_report_members",[]);
+            window.history.back();
+//                $location.path("/project").search({id: project_id});
+        });
+    };
+
+    vm.edit_member_role = function(){
+        if(vm.current_roles_id == vm.current_edit_member.roles_id){
+            vm.alertService.showMessage('提示', "该用户当前已是该角色");
+            return;
+        }
+
+        $http.post(config.apiUrl+'courses/edit_member_role', {
+            token: auth.token(),
+            id: course_id,
+            user_id:vm.current_edit_member.user.id,
+            role_id:vm.current_edit_member.roles_id
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                vm.alertService.showMessage('提示', '修改角色成功', function(){
+//                    window.history.back();
+                    $location.path("/class").search({id: course_id});
+                });
+            }
+        });
+
+
+    };
+
+    vm.selectRole = function(role_id){
+        vm.current_edit_member.roles_id = role_id;
+    }
+
+}] );

public/javascripts/wechat/controllers/edit_project_member.js

@@ -0,0 +1,80 @@
+
+
+app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+
+    vm.current_edit_member = null;
+
+    vm.alertService = alertService.create();
+
+    var project_id = $routeParams.id;
+    var user_id = $routeParams.user_id;
+    if(!vm.current_edit_member){
+        $http.post(config.apiUrl+'projects/get_member_info', {
+            token: auth.token(),
+            id: project_id,
+            user_id:user_id
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                project_id = response.data.project_id;
+                user_id = response.data.user_id;
+                vm.current_edit_member = response.data.member_info;
+                vm.current_roles_id = vm.current_edit_member.roles_id;
+            }
+        });
+    }
+
+    console.log(vm.current_edit_member);
+
+    vm.cancel = function(){
+        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            rms.save("project_master_members",[]);
+//            rms.save("project_develop_members",[]);
+//            rms.save("project_report_members",[]);
+            window.history.back();
+//                $location.path("/project").search({id: project_id});
+        });
+    };
+
+    vm.edit_member_role = function(){
+        if(vm.current_roles_id == vm.current_edit_member.roles_id){
+            vm.alertService.showMessage('提示', "该用户当前已是该角色");
+            return;
+        }
+
+        $http.post(config.apiUrl+'projects/edit_member_role', {
+            token: auth.token(),
+            id: project_id,
+            user_id:vm.current_edit_member.user.id,
+            role_id:vm.current_edit_member.roles_id
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                vm.alertService.showMessage('提示', '修改角色成功', function(){
+                    rms.save('project_activities_page',0);
+                    rms.save("project_activities",[]);
+                    rms.save("project_has_more",false);
+                    rms.save("project",null);
+                    rms.save("project_master_members",[]);
+                    rms.save("project_develop_members",[]);
+                    rms.save("project_report_members",[]);
+                    rms.save('tab_num',null);
+//                    window.history.back();
+                    $location.path("/project").search({id: project_id});
+                });
+            }
+        });
+
+
+    };
+
+    vm.selectRole = function(role_id){
+        vm.current_edit_member.roles_id = role_id;
+    }
+
+}] );

public/javascripts/wechat/controllers/myresource.js

@@ -1,6 +1,7 @@
 app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms', function($scope, $http, auth, config, $location,rms){
     var vm = $scope;
-    vm.menus = ['课件', '作业', '测验'];
+//    vm.menus = ['课件', '作业', '测验'];
+    vm.menus = ['课件', '作业'];
 
     vm.resources = [];
     vm.homeworks = [];

public/javascripts/wechat/controllers/new_project.js

@@ -0,0 +1,47 @@
+
+
+app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms', function($scope, $http, auth, config, alertService, $location,rms){
+    var vm = $scope;
+
+    vm.alertService = alertService.create();
+
+    vm.project = {
+        name:""
+    };
+
+    vm.addClass = function(){
+        vm.syllabus.courses.push({});
+    };
+
+    vm.deleteClass = function(index){
+        vm.syllabus.courses.splice(index, 1);
+    }
+
+    vm.newProject = function (frm, project) {
+        frm.$setSubmitted();
+        console.log(project);
+
+        if(!frm.$valid){
+            console.log(frm.$error);
+            return;
+        }
+
+        $http.post(config.apiUrl+"projects/create", {
+            token: auth.token(),
+            name: project.name
+        }).then(function(response){
+            if(response.data.status!=0){
+                vm.alertService.showMessage('出错了', response.data.message);
+            } else {
+                vm.alertService.showMessage('提示', '新建项目成功', function(){
+//                    window.history.back();
+                    rms.save('projects',[]);
+                    $location.path("/project_list");
+                });
+            }
+            console.log(response.data.data);
+        });
+
+    }
+
+}] );

public/javascripts/wechat/controllers/project.js

@@ -1,64 +1,197 @@
-app.controller('ProjectController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms', function($scope, config, $http, auth, $location, $routeParams,alertService,rms){
+app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http,$timeout, auth, $location, $routeParams,alertService,rms,common){
+    $scope.replaceUrl = function(url){
+        return url;
+    };
 
     var vm = $scope;
     var projectid = $routeParams.id;
 
-    vm.project_activities = [];
-    vm.project_activities_page = 0;
+    vm.project_activities_page = rms.get('project_activities_page') || 0;
+    vm.project_activities = rms.get("project_activities") || [];
+    vm.project_has_more = rms.get("project_has_more");
+
+    vm.project = rms.get("project") || null;
 
 
-    vm.project_members = [];
-    vm.project_members_page = 0;
+//    vm.project_members_page = rms.get('project_members_page') || 0;
+    vm.project_master_members = rms.get("project_master_members") || [];
+    vm.project_develop_members = rms.get("project_develop_members") || [];
+    vm.project_report_members = rms.get("project_report_members") || [];
+
+//    vm.project_members_has_more = rms.get("project_members_has_more");
+
+    vm.alertService = alertService.create();
+
+    //跳入邀请界面
+    vm.invite = function(){
+        vm.alertService.showMessage('提示', "该功能将在近日开发，敬请期待！");
 
 
-    vm.currentTab = 1;
-    vm.tab = function(index){
-        vm.currentTab = index;
-        vm.searchText = '';
-
-        if(index == 1){
-            $http.get(config.apiUrl + 'project/activities?token='+auth.token()+'&project_id='+projectid).then(
-                function(response) {
-                    console.log(response.data);
-                    vm.project_activities = response.data.data;
-                }
-            )
-        }
-        else if(index == 2){
-            $http.get(config.apiUrl + 'project/members?token='+auth.token()+'&project_id='+projectid).then(
-                function(response) {
-                    console.log(response.data);
-                    vm.project_activities = response.data.data;
-                }
-            )
-        }
+//        $location.path("/project_invite_code").search({id: projectid});
     };
 
-
-    $http.get(config.apiUrl+ 'project/'+projectid+"?token="+auth.token()).then(
-        function(response) {
+    //获取项目动态
+    vm.getActivities = function(page){
+        $http({
+            method: 'POST',
+            url: apiUrl + "projects/activities?id=" + projectid,
+            data:{token:auth.token(),page:page}
+        }).then(function successCallback(response) {
             console.log(response.data);
-
-            if (response.data.status == 0){
-                vm.project = response.data.data;
-                resetMenu(vm.project.can_setting);
-                vm.tab(1);
+            if(response.data.status == 0){
+                vm.project_activities_page = response.data.page;
+                if(response.data.page > 0)
+                {
+                    vm.project_activities = vm.project_activities.concat(response.data.data);
+                }
+                else{
+                    vm.project_activities = response.data.data;
+                    vm.project_activities_page = 0;
+                    vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+                }
             }
             else{
                 vm.alertService.showMessage('提示', response.data.message);
             }
 
+
+        }, function errorCallback(response) {
+        });
+    }
+
+    vm.getMembers = function(page){
+        $http({
+            method: 'POST',
+            url: apiUrl + "projects/members?id=" + projectid,
+            data:{token:auth.token(),page:page}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+            if(response.data.status == 0){
+//                vm.project_members_page = response.data.page;
+//                if(response.data.page > 0)
+//                {
+//                    vm.project_members = vm.project_members.concat(response.data.data);
+//                }
+//                else{
+//                    vm.project_members = response.data.data;
+//                    vm.project_members_page = 0;
+//                    vm.project_members_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+//                }
+                vm.project_master_members = response.data.master_members;
+                vm.project_develop_members = response.data.develop_members;
+                vm.project_report_members = response.data.report_members;
+
+            }
+            else{
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+
+
+        }, function errorCallback(response) {
+        });
+    }
+
+    //跳到详情页
+    vm.goDetail = function(type, act_id,id){
+        rms.save("yoffset", document.documentElement.scrollTop);
+        rms.save("project_activities",vm.project_activities);
+        rms.save("project",vm.project);
+        $location.path('/'+type+'/'+act_id);
+    }
+
+    //切换 按钮
+    vm.tab = function(index){
+        vm.currentTab = index;
+        vm.searchText = '';
+
+        if(index == 1 && vm.project_activities.length <= 0 ){
+            vm.getActivities(0);
+        }
+        else if(index == 2 && vm.project_master_members.length <= 0){
+            vm.getMembers(0);
         }
-    );
 
+        rms.save("tab_num",vm.currentTab);
+    };
 
+    //初始化TAB按钮
     var resetMenu = function(can_setting){
         if(can_setting){
             vm.menus = ["项目动态", "成员管理"];
         } else {
             vm.menus = ['项目动态', "我的伙伴"];
         }
-
+    }
+    if(vm.project){
+        resetMenu(vm.project.can_setting);
     }
 
+    vm.currentTab = rms.get('tab_num');
+
+    //
+    if(!vm.currentTab){
+        $http.get(config.apiUrl+ 'projects/'+projectid+"?token="+auth.token()).then(
+            function(response) {
+                console.log(response.data);
+
+                if (response.data.status == 0){
+                    vm.project = response.data.data;
+                    resetMenu(vm.project.can_setting);
+                    vm.tab(1);
+                }
+                else{
+                    vm.alertService.showMessage('提示', response.data.message,function(){
+                        window.history.back();
+                    });
+
+                }
+            }
+        );
+        vm.currentTab = 1;
+        vm.tab(vm.currentTab);
+    } else {
+        $timeout(function(){
+            window.scrollTo(0, rms.get("yoffset"));
+        });
+    }
+
+    vm.addPraise = function(act){
+        for(var i in vm.project_activities){
+            if(vm.project_activities[i].act_id == act.act_id){
+                vm.project_activities[i].praise_count += 1;
+                vm.project_activities[i].has_praise = true;
+                break;
+            }
+        }
+
+        common.addCommonPraise(act);
+    };
+
+    vm.decreasePraise = function(act){
+        for(var i in vm.project_activities){
+            if(vm.project_activities[i].act_id == act.act_id){
+                vm.project_activities[i].praise_count -= 1;
+                vm.project_activities[i].has_praise = false;
+                break;
+            }
+        }
+
+        common.decreaseCommonPraise(act);
+    };
+
+    vm.onSetting = function(data){
+        rms.save('current_edit_member', data);
+
+        rms.save('project_activities_page',vm.project_activities_page);
+        rms.save("project_activities",vm.project_activities);
+        rms.save("project_has_more",vm.project_has_more);
+
+        rms.save("project",vm.project);
+        rms.save("project_master_members",vm.project_master_members);
+        rms.save("project_develop_members",vm.project_develop_members);
+        rms.save("project_report_members",vm.project_report_members);
+
+        $location.path("/edit_project_member").search({id: projectid,user_id: data.user.id});
+    };
+
 }]);

public/javascripts/wechat/controllers/project_invite_code.js

@@ -0,0 +1,34 @@
+/**
+ * Created by guange on 16/6/22.
+ */
+
+
+app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+    var vm = $scope;
+
+    vm.project = {};
+    var projectid = $routeParams.id;
+    $http.get(config.apiUrl+ 'projects/'+projectid+"?token="+auth.token()).then(
+        function(response){
+            console.log(response.data);
+            vm.project = response.data.data;
+        }
+    );
+
+    vm.share = function(){
+        window.WeixinJSBridge.invoke('sendAppMessage',{
+            'appid': 'wxf694495398c7d470', // 公众号appID
+            'type': 'link', // 非必填，music,vido或link,默认为link。
+            'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
+            'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
+            'img_height':370, // 缩略图高度
+            'img_width':550, // 缩略图宽度
+            'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
+            'desc':'desc', // 描述
+            'title':'title' // 标题
+        },function(res){
+            //alert(res.err_msg);
+        });
+    }
+
+}]);

public/javascripts/wechat/controllers/project_list.js

@@ -6,7 +6,8 @@
 app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
     function ($scope, config, auth, $http, $location, alertService,rms) {
         var vm = $scope;
-        vm.projects = rms.get('projects') || [];
+//        vm.projects = rms.get('projects') || [];
+        vm.projects = [];
 
         vm.alertService_1 = alertService.create();
         vm.alertService_3 = alertService.create();
@@ -26,29 +27,27 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
         }
 
         vm.goProject = function (project_id) {
+
+            rms.save('project_activities_page',0);
+            rms.save("project_activities",[]);
+            rms.save("project_has_more",false);
+            rms.save("project",null);
+            rms.save('project_members_page',0);
+            rms.save("project_members",[]);
+            rms.save("project_members_has_more",false);
+            rms.save('tab_num',null);
             console.log(project_id);
             $location.path("/project").search({id: project_id});
-        }
+        };
 
         vm.newProject = function () {
-            //先判断下权限
-            $http.post(config.apiUrl + "projects/auth",{token: auth.token()} ).then(
-                function (response) {
-                    console.log(response.data);
-                    if (response.data.auth == 0) {
-                        vm.alertService_1.showMessage('提示', '非教师身份不能创建课程哦~');
-                    }
-                    else{
-                        $location.path("/new_project");
-                    }
-                }
-            );
-        }
+            $location.path("/new_project");
+        };
 
         vm.joinProject = function () {
             vm.alertService_3.showMessage('提示', '请输入6位项目邀请码(不区分大小写)', function(){
-                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 5) {
-                    $http.post(config.apiUrl + "courses/join", {
+                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 6) {
+                    $http.post(config.apiUrl + "projects/join", {
                         token: auth.token(),
                         invite_code: vm.alertService_3.invite
                     }).then(function (response) {
@@ -58,7 +57,7 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
                         } else {
                             vm.alertService_1.showMessage('提示', '加入项目成功');
                             vm.alertService_3.invite = "";
-                            loadClassList();
+                            loadProjectList();
                         }
                     });
                 } else {

public/javascripts/wechat/controllers/send_class_list.js

@@ -49,14 +49,20 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
                 var tip = "";
                 if (vm.myresource_sendIndex == 1){
                     tip = "课件已发送到目标班级。";
+                    vm.alertService.showMessage('发送成功', tip, function () {
+                        rms.save('page',0);
+                        rms.save("resources",[]);
+                        rms.save("has_more",false);
+                        window.history.back();
+                    });
                 }
                 else if(vm.myresource_sendIndex == 2){
                     tip = "题目已发送到目标班级的作业列表，但需要您访问Trustie网站设置发布和截止时间，以激活相应作业，谢谢。";
+                    vm.alertService.showMessage('发送成功', tip, function () {
+                        window.history.back();
+                    });
                 }
 
-                vm.alertService.showMessage('发送成功', tip, function () {
-                    window.history.back();
-                });
             } else {
                 vm.alertService.showMessage('发送出错', response.data.message);
             }

public/javascripts/wechat/others/factory.js

@@ -159,6 +159,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config', function(
         return $http({
             method: 'POST',
             url: apiUrl+ type + "/" + id,
+            dataType: 'jsonp',
             data:{token:auth.token(),type:replytype,page:page}
         })
     };

public/javascripts/wechat/others/routes.js

@@ -34,11 +34,15 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
         .when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
         .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
+        .when('/edit_class_member', makeRoute('edit_class_member.html', 'EditClassMemberController'))
         .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
         .when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'})
         .when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
         .when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
         .when('/project', makeRoute('project.html', 'ProjectController'))
+        .when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))
+        .when('/new_project', makeRoute('new_project.html', 'NewProjectController'))
+        .when('/project_invite_code', {templateUrl: rootPath + 'project_invite_code.html', controller: 'ProjectInviteCodeController'})
         .otherwise({
             redirectTo: '/activites'
         });

public/stylesheets/weui/weixin.css

@@ -197,9 +197,9 @@ a.underline {text-decoration:underline;}
 .class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
 .border-top {border-top:1px solid #ccc;}
 .class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
-.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff; position:relative;}
 .class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
-.img-circle {border-radius:50%;}
+.img-circle {border-radius:50% !important;}
 .member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
 .resource-width {width:76%;}
 .courseware-from-width {max-width:57%;}