Merge branch 'weixin_guange' into develop

app/api/mobile/apis/courses.rb

@@ -17,7 +17,7 @@ module Mobile
           authenticate!
           cs = CoursesService.new
           courses = cs.user_courses_list(current_user)
-          present :data, courses, with: Mobile::Entities::Course
+          present :data, courses, with: Mobile::Entities::Course,user: current_user
           present :status, 0
         end
 
@@ -56,7 +56,7 @@ module Mobile
             class_period: params[:class_period]
           }
           courses = cs.create_course(cs_params, current_user)
-          present :data, courses, with: Mobile::Entities::Course
+          present :data, courses, with: Mobile::Entities::Course,user: current_user
           present :status, 0
         end
 
@@ -90,7 +90,7 @@ module Mobile
           end
           cs.edit_course_authorize(current_user,course)
           course = cs.edit_course(cs_params, course,current_user)
-          present :data, course, with: Mobile::Entities::Course
+          present :data, course, with: Mobile::Entities::Course,user: current_user
           present :status, 0
         end
         post do
@@ -138,7 +138,7 @@ module Mobile
         get 'search' do
           cs = CoursesService.new
           courses = cs.search_course(params,current_user.nil? ? User.find(2):current_user)
-          present :data, courses, with: Mobile::Entities::Course
+          present :data, courses, with: Mobile::Entities::Course,user: current_user
           present :status, 0
         end
 
@@ -201,7 +201,7 @@ module Mobile
             cs = CoursesService.new
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
-            present :data, course, with: Mobile::Entities::Course
+            present :data, course, with: Mobile::Entities::Course,user: current_user
            { status: 0}
           end
         end
@@ -391,7 +391,12 @@ module Mobile
         end
         get ':course_id/exercises' do
           authenticate!
-          exercises = Course.find(params[:course_id]).exercises
+
+          course = Course.find(params[:course_id])
+          exercises = course.exercises
+          exercises.each do |v|
+            v[:coursename] = course.nil? ? "未知" : course.name
+          end
           present :data,exercises,with:Mobile::Entities::Exercise
           present :status,0
         end

app/api/mobile/apis/resources.rb

@@ -11,8 +11,10 @@ module Mobile
         end
         get do
           authenticate!
-          data = current_user.course_attachments
-          present :data, data, with: Mobile::Entities::Attachment
+          rs = ResourcesService.new
+          # data = current_user.course_attachments
+          data = rs.all_course_attachments current_user
+          present :data, data, with: Mobile::Entities::Attachment,user: current_user
           present :status, 0
 
         end
@@ -26,9 +28,10 @@ module Mobile
         get 'homeworks' do
           authenticate!
 
-          homeworks = current_user.homework_commons
+          rs = ResourcesService.new
+          homeworks = rs.all_homework_commons current_user
 
-          present :data, homeworks, with: Mobile::Entities::Homework
+          present :data, homeworks, with: Mobile::Entities::Homework,user: current_user
           present :status, 0
 
         end
@@ -40,8 +43,9 @@ module Mobile
         get 'exercies' do
           authenticate!
 
-          exercises = current_user.exercises
-          present :data, exercises, with: Mobile::Entities::Exercise
+          rs = ResourcesService.new
+          exercises = rs.all_exercises current_user
+          present :data, exercises, with: Mobile::Entities::Exercise,user: current_user
           present :status, 0
         end
 

app/api/mobile/apis/syllabuses.rb

@@ -14,7 +14,7 @@ module Mobile
 
           cs = SyllabusesService.new
           courses = cs.user_syllabus(current_user)
-          present :data, courses, with: Mobile::Entities::Syllabus
+          present :data, courses, with: Mobile::Entities::Syllabus,user: current_user
           present :status, 0
         end
 
@@ -29,9 +29,8 @@ module Mobile
 
           sy = ::Syllabus.find(params[:id])
           sy.courses = sy.courses.not_deleted
-          sy = ss.judge_can_setting(sy,current_user)
 
-          present :data, sy, with: Mobile::Entities::Syllabus
+          present :data, sy, with: Mobile::Entities::Syllabus,user: current_user
           present :status, 0
         end
 
@@ -68,7 +67,7 @@ module Mobile
           if sy.new_record?
             {status:-1, message: '创建大纲失败' }
           else
-            present :data, sy, with: Mobile::Entities::Syllabus
+            present :data, sy, with: Mobile::Entities::Syllabus,user: current_user
             present :status, 0
           end
 

app/api/mobile/apis/users.rb

@@ -41,8 +41,8 @@ module Mobile
                 openid: openid,
                 user: user
             )
-            # ws = WechatService.new
-            # ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+            ws = WechatService.new
+            ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, Time.now.strftime("%Y-%m-%d"))
             present status: 0, message: '您已成功绑定Trustie平台'
         end
 

app/api/mobile/entities/attachment.rb

@@ -2,6 +2,7 @@ module Mobile
   module Entities
     class Attachment  < Grape::Entity
       include Redmine::I18n
+      include ActionView::Helpers::NumberHelper
       def self.attachment_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
@@ -17,6 +18,10 @@ module Mobile
               case field
                 when :file_dir
                   "attachments/download/" << f.send(:id).to_s << '/'
+                when :attafile_size
+                  (number_to_human_size(f.filesize)).gsub("ytes", "").to_s
+                when :coursename
+                  f.course.nil? ? "" : f.course.name
               end
             end
           end
@@ -29,6 +34,8 @@ module Mobile
       attachment_expose :quotes
       attachment_expose :created_on
       attachment_expose :file_dir
+      attachment_expose :attafile_size
+      attachment_expose :coursename   #所属班级名
     end
   end
 end

app/api/mobile/entities/course.rb

@@ -2,6 +2,8 @@ module Mobile
   module Entities
     class Course < Grape::Entity
       include Redmine::I18n
+      include ApplicationHelper
+      include ApiHelper
       def self.course_expose(field)
         expose field do |f,opt|
           c = nil
@@ -52,7 +54,28 @@ module Mobile
       course_expose :updated_at
       course_expose :course_student_num
       course_expose :member_count
-      course_expose :can_setting
+      expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        can_setting = false
+
+        if instance[:course]
+          course = instance[:course]
+        else
+          course = instance
+        end
+
+        member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
+        roleName = member.roles[0].name if member
+
+        if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
+          can_setting = true
+        end
+
+        if course.tea_id == current_user.id
+          can_setting = true
+        end
+        can_setting
+      end
       expose :teacher, using: Mobile::Entities::User do |c, opt|
         if c.is_a? ::Course
           c.teacher

app/api/mobile/entities/exercise.rb

@@ -1,8 +1,32 @@
 module Mobile
   module Entities
     class Exercise < Grape::Entity
+      include Redmine::I18n
+      include ApplicationHelper
+      include ApiHelper
+      def self.exercise_expose(field)
+        expose field do |f,opt|
+          if f.is_a?(Hash) && f.key?(field)
+            if field == :created_on
+              format_time(f[field])
+            else
+              f[field]
+            end
+          elsif f.is_a?(::Exercise)
+            if f.respond_to?(field)
+              f.send(field)
+            else
+              case field
+                when :coursename
+                  f.course.nil? ? "" : f.course.name
+              end
+            end
+          end
+        end
+      end
       expose :exercise_name
       expose :exercise_description
+      exercise_expose :coursename #所属班级名
     end
   end
 end

app/api/mobile/entities/homework.rb

@@ -37,6 +37,8 @@ module Mobile
                   when :homework_anony_type
                     val = f.homework_type == 1 && !f.homework_detail_manual.nil?
                     val
+                  when :coursename
+                    f.course.nil? ? "" : f.course.name
                 end
             end
           end
@@ -94,6 +96,8 @@ module Mobile
 
       homework_expose :homework_anony_type #是否是匿评作业
 
+      homework_expose :coursename #所属班级名
+
     end
   end
 end

app/api/mobile/entities/syllabus.rb

@@ -1,12 +1,14 @@
 module Mobile
   module Entities
     class Syllabus < Grape::Entity
-      include ApplicationHelper
-
       expose :title
       expose :id
-      expose :can_setting
-
+      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?
+        can_setting
+      end
       expose :courses, using: Mobile::Entities::Course
     end
   end

app/controllers/courses_controller.rb

@@ -633,6 +633,9 @@ class CoursesController < ApplicationController
 =end
     end
     if @course
+      #发送微信消息
+      ss  = SyllabusesService.new
+      ss.send_wechat_create_class_notice User.current,@course
       respond_to do |format|
         flash[:notice] = l(:notice_successful_create)
         format.html {redirect_to course_url(@course)}

app/controllers/wechats_controller.rb

@@ -69,11 +69,21 @@ class WechatsController < ActionController::Base
   end
 
   on :click, with: 'DEV' do |request, key|
-    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      sendBind(request)
+    else
+      request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+    end
   end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
-    request.reply.text "#{request[:FromUserName]} view #{view}"
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      sendBind(request)
+    else
+      request.reply.text "#{request[:FromUserName]} view #{view}"
+    end
   end
 
   # When user sent the imsage
@@ -139,8 +149,8 @@ class WechatsController < ActionController::Base
 
   on :click, with: 'JOIN_CLASS' do |request, key|
     uw = user_binded?(request[:FromUserName])
-    unless uw
-      sendBind(request)
+      unless uw
+        sendBind(request)
     else
       request.reply.text "请直接回复5位班级邀请码\n(不区分大小写):"
     end

app/services/resources_service.rb

@@ -1,7 +1,6 @@
 #coding=utf-8
 
 class ResourcesService
-
   #发送资源到课程
   def send_resource_to_course user,params
     send_id  = params[:send_id]
@@ -50,4 +49,56 @@ class ResourcesService
     [@ori, @flag, @save_message]
   end
 
+  # 我的资源-课件 已发布的
+  def all_course_attachments user
+
+    courses = user.courses.not_deleted
+
+    courses_ids = courses.empty? ? '(-1)' :"(" + courses.map(&:id).join(",") + ")"
+
+    attchments = Attachment.where("(author_id = #{user.id} and is_publish = 1 and container_id in #{courses_ids} and container_type = 'Course') or (container_type = 'Course' and is_publish = 1 and container_id in #{courses_ids})" ).order("created_on desc")
+
+    # attchments.each do |v|
+    #   course =  Course.where("id=?",v.container_id).first
+    #   v[:coursename] = course.nil? ? "未知" : course.name
+    #   v[:attafile_size] = (number_to_human_size(v[:filesize])).gsub("ytes", "").to_s
+    # end
+
+    attchments
+  end
+
+  # 我的资源-作业  已发布的
+  def all_homework_commons user
+
+    courses = user.courses.not_deleted
+
+    courses_ids = courses.empty? ? '(-1)' :"(" + courses.map(&:id).join(",") + ")"
+
+    homeworks = HomeworkCommon.where("course_id in #{courses_ids} and publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
+
+    # homeworks.each do |v|
+    #   course =  Course.where("id=?",v.course_id).first
+    #   v[:coursename] = course.nil? ? "未知" : course.name
+    # end
+
+    homeworks
+  end
+
+  # 我的资源-测验 已发布的
+  def all_exercises user
+
+    courses = user.courses.not_deleted
+
+    courses_ids = courses.empty? ? '(-1)' :"(" + courses.map(&:id).join(",") + ")"
+
+    exercises = Exercise.where("exercise_status <> 1 and course_id in #{courses_ids}").order("created_at desc")
+
+    # exercises.each do |v|
+    #   course =  Course.where("id=?",v.course_id).first
+    #   v[:coursename] = course.nil? ? "未知" : course.name
+    # end
+
+    exercises
+  end
+
 end

app/services/syllabuses_service.rb

@@ -29,19 +29,13 @@ class SyllabusesService
   end
   #获取指定用户的课程大纲
   def user_syllabus(user)
-    courses = CoursesService.new.user_courses_list(user)
-
-    other = Syllabus.new(title: '未命名课程',user_id: user.id)
-
-    courses.each do |c|
-      other.courses << c[:course] unless c[:course].syllabus
-    end
-    
-    # user.syllabuses.each do |syllabus|
-    #   syllabus.courses = syllabus.courses.not_deleted
-    # end
+    # courses = CoursesService.new.user_courses_list(user)
+    #
+    # other = Syllabus.new(title: '未命名课程',user_id: user.id)
     #
-    # user.syllabuses.to_a << other
+    # courses.each do |c|
+    #   other.courses << c[:course] unless c[:course].syllabus
+    # end
 
     courses = user.courses.not_deleted
     syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
@@ -51,12 +45,13 @@ class SyllabusesService
       syllabus.courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc")
     end
 
-    syllabuses.to_a << other
+    # syllabuses.to_a << other
 
+    syllabuses.to_a
     #管理权限 can_setting
-    syllabuses.each do |s|
-      s = judge_can_setting(s,user)
-    end
+    # syllabuses.each do |s|
+    #   s = judge_can_setting(s,user)
+    # end
 
     syllabuses
   end
@@ -72,6 +67,15 @@ class SyllabusesService
       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
+    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, "点击查看班级详情"
+    end
+  end
+
   #创建大纲
   # params {title: '大纲名称', [{course}, {course}]}
   def create(user, title, courses = [])
@@ -83,6 +87,7 @@ class SyllabusesService
         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
@@ -91,6 +96,7 @@ class SyllabusesService
           c.is_public = 0
           c.save!
           after_create_course(c, user)
+          send_wechat_create_class_notice user,c
         end
       end
 
@@ -134,6 +140,7 @@ class SyllabusesService
         course.is_public = 0
         course.save!
         after_create_course(course, user)
+        send_wechat_create_class_notice user,course
       end
       status = 0
     end

app/services/wechat_service.rb

@@ -115,7 +115,7 @@ class WechatService
     data = {
         touser:openid,
         template_id:template_id,
-        url:"#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}",
+        url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}",#/assets/wechat/app.html#/#{type}/#{id}
         topcolor:"#FF0000",
         data:{
             first: {
@@ -139,11 +139,43 @@ class WechatService
     data
   end
 
+  def three_keys_template(openid, template_id, type, id, first, key1, key2, key3, remark="")
+    data = {
+        touser:openid,
+        template_id:template_id,
+        url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}",#/assets/wechat/app.html#/#{type}/#{id}
+        topcolor:"#FF0000",
+        data:{
+            first: {
+                value:first,
+                color:"#707070"
+            },
+            keyword1:{
+                value:key1,
+                color:"#707070"
+            },
+            keyword2:{
+                value:key2,
+                color:"#707070"
+            },
+            keyword3:{
+                value:key3,
+                color:"#707070"
+            },
+            remark:{
+                value:remark,
+                color:"#707070"
+            }
+        }
+    }
+    data
+  end
+
   def four_keys_template(openid, template_id, type, id, first, key1, key2, key3, key4, remark="")
     data = {
     touser:openid,
     template_id:template_id,
-    url:"#{Setting.protocol}://#{Setting.host_name}/assets/wechat/app.html#/#{type}/#{id}",
+    url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}", #/assets/wechat/app.html#/#{type}/#{id}
     topcolor:"#FF0000",
     data:{
         first: {
@@ -250,4 +282,45 @@ class WechatService
     end
   end
 
+  def create_class_notice(user_id, type, id, first, key1, key2, key3, remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = {
+          touser:uw.openid,
+          template_id:Wechat.config.create_class_notice,
+          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/class?id="+id.to_s,
+          topcolor:"#FF0000",
+          data:{
+              first: {
+                  value:first,
+                  color:"#707070"
+              },
+              keyword1:{
+                  value:key1,
+                  color:"#707070"
+              },
+              keyword2:{
+                  value:key2,
+                  color:"#707070"
+              },
+              keyword3:{
+                  value:key3,
+                  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_class_notice] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
 end

app/views/wechats/user_activities.html.erb

@@ -26,33 +26,33 @@
 <div ng-view>
 </div>
 
-<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>
-<!-- <script src="/javascripts/wechat/build/angular.all.min.js"></script> -->
-<script src="/javascripts/wechat/build/app.min.js?version=20160709-0920"></script>
-<!-- <script src="/javascripts/wechat/app.js"></script> -->
-<!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
-<!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
-<!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
-<!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
-<!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
-<!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/myresource.js"></script> -->
-<!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
-<!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
+<!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
+ <script src="/javascripts/wechat/build/angular.all.min.js"></script>
+<!--<script src="/javascripts/wechat/build/app.min.js?version=20160709-0920"></script>-->
+ <script src="/javascripts/wechat/app.js"></script>
+ <script src="/javascripts/wechat/others/factory.js"></script>
+ <script src="/javascripts/wechat/others/filter.js"></script>
+ <script src="/javascripts/wechat/directives/alert.js"></script>
+ <script src="/javascripts/wechat/directives/form_validate.js"></script>
+ <script src="/javascripts/wechat/directives/input_auto.js"></script>
+ <script src="/javascripts/wechat/directives/loading_spinner.js"></script>
+ <script src="/javascripts/wechat/controllers/reg.js"></script>
+ <script src="/javascripts/wechat/controllers/invite_code.js"></script>
+ <script src="/javascripts/wechat/controllers/login.js"></script>
+ <script src="/javascripts/wechat/controllers/activity.js"></script>
+ <script src="/javascripts/wechat/controllers/new_class.js"></script>
+ <script src="/javascripts/wechat/controllers/edit_class.js"></script>
+ <script src="/javascripts/wechat/controllers/blog.js"></script>
+ <script src="/javascripts/wechat/controllers/course_notice.js"></script>
+ <script src="/javascripts/wechat/controllers/discussion.js"></script>
+ <script src="/javascripts/wechat/controllers/homework.js"></script>
+ <script src="/javascripts/wechat/controllers/issue.js"></script>
+ <script src="/javascripts/wechat/controllers/journals.js"></script>
+ <script src="/javascripts/wechat/controllers/class.js"></script>
+ <script src="/javascripts/wechat/controllers/class_list.js"></script>
+ <script src="/javascripts/wechat/controllers/myresource.js"></script>
+ <script src="/javascripts/wechat/controllers/send_class_list.js"></script>
+ <script src="/javascripts/wechat/others/routes.js"></script>
 </body>
 
 </html>

config/wechat.yml

@@ -8,24 +8,38 @@ default: &default
   #secret: "743e038392f1d89540e95f8f7645849a"
 
   #production
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+#  appid: "wx8e1ab05163a28e37"
+#  secret: "beb4d3bc4b32b3557811680835357841"
 
   #test
-  #appid: "wxc09454f171153c2d"
-  #secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
 
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
+
+  #production
+#  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
+#  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"
+#  create_class_notice: "2GtJJGzzNlNy2i0UrsjEDlvfSVIUXQfSo47stpcQAVw"
+
+  #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"
 
 production:
   <<: *default

db/schema.rb

@@ -562,9 +562,9 @@ ActiveRecord::Schema.define(:version => 20160709015740) do
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
     t.integer  "visits",                        :default => 0
+    t.integer  "syllabus_id"
     t.string   "invite_code"
     t.string   "qrcode"
-    t.integer  "syllabus_id"
   end
 
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true

public/assets/wechat/activities.html

@@ -436,7 +436,7 @@
                       <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 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>

public/assets/wechat/blog_detail.html

@@ -16,7 +16,7 @@
                 <div class="post-dynamic-title c-grey3 mt12 fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="c-grey4 f13 mt10"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
 
-                <div class="f13 c-grey3 mt10 text-control" ng-bind-html="blog.content|safeHtml"></div>
+                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
                 <div class="cl"></div>
                 <div class="fr f13">
                     <div ng-if="!blog.praise_count" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
@@ -29,7 +29,7 @@
                 </div>
                 <div class="cl"></div>
             </div>
-            <div id="all_blog_reply">
+            <div class="mb50" id="all_blog_reply">
 
                 <div ng-if="blog.blog_comment_children == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in blog.blog_comment_children">
@@ -49,10 +49,10 @@
 
             </div>
 
-            <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap2">
+            <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
                 <div class="post-reply-row">
                     <div class="post-input-container">
-                        <textarea class="copy-input"></textarea>
+                        <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>

public/assets/wechat/class.html

@@ -23,33 +23,35 @@
     </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}]"><span class="fl ml10">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r)">发送</a></div>
-        <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件,<br />
-            请登录Trustie网站,在PC浏览器中上传课件。</p>
+            <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)">发送</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-detail-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 mt4" /><span class="fl ml10">{{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 mt10" />
+        <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 class="cl"></div>
         </div>
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
-        <div class="class-detail-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 mt4" /><span class="fl ml10">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" />
+        <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="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}]"><span class="fl ml10">{{r.homework_name}}</span></div>
-        <p ng-show="homeworks_tag == true && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
-            请登录Trustie网站,在PC浏览器中上传作业。</p>
+        <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)">发送</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}]"><span class="fl ml10">{{r.exercise_name}}</span></div>
-        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验,<br />
-            请登录Trustie网站,在PC浏览器中上传小测验。</p>
+        <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" ng-click="sendFile(r)">发送</a><div class="cl"></div></div>
+        <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验，<br />
+            请登录Trustie网站，在PC浏览器中上传小测验。</p>
     </div>
 
 

public/assets/wechat/class_list.html

@@ -1,19 +1,34 @@
 <div class="post-container" style="padding-bottom: 50px;">
     <div loading-spinner></div>
     <div class="blue-title">课程列表</div>
-
-    <div ng-repeat="syllabus in syllabuses">
-        <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
-        <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
-            <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
-                <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
-                <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
-                <span class="fr c-grey4">&gt;</span>
-                <span class="students-amount f12 fr mt10">{{course.member_count}}人</span>
-            </li>
-        </ul>
+    <div>
+        <div class="course-diff-row"><span class="c-blue f13 ml10">我创建的课程</span></div>
+        <div  ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses">
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+            <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
+                <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
+                    <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
+                    <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
+                    <span class="fr c-grey4">&gt;</span>
+                    <span class="students-amount f12 fr mt10">{{course.member_count}}人</span>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div>
+        <div class="course-diff-row border-top mt10"><span class="c-blue f13 ml10">我参与的课程</span></div>
+        <div  ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses">
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+            <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
+                <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
+                    <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
+                    <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
+                    <span class="fr c-grey4">&gt;</span>
+                    <span class="students-amount f12 fr mt10">{{course.member_count}}人</span>
+                </li>
+            </ul>
+        </div>
     </div>
-
 
     <div class="bottom-tab-wrap mt10">
         <a ng-click="newClass()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">新建课程</a>

public/assets/wechat/course_discussion.html

@@ -28,7 +28,7 @@
                     </div>
                     <div class="cl"></div>
                 </div>
-                <div id="all_course_message_reply">
+                <div class="mb50" id="all_course_message_reply">
                     <div ng-if="discussion.message_children == ''" style="border-top:1px solid #ccc;"></div>
                     <div class="post-reply-wrap" ng-repeat="journal in discussion.message_children">
                         <div class="post-reply-row">
@@ -46,10 +46,10 @@
                     </div>
                 </div>
 
-                <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap2">
+                <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
                     <div class="post-reply-row">
                         <div class="post-input-container">
-                            <textarea class="copy-input"></textarea>
+                            <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>

public/assets/wechat/course_notice.html

@@ -27,7 +27,7 @@
                 </div>
                 <div class="cl"></div>
             </div>
-            <div id="all_news_reply">
+            <div class="mb50" id="all_news_reply">
                 <div ng-if="news.comments == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="comments in news.comments">
                     <div class="post-reply-row">
@@ -45,10 +45,10 @@
                 </div>
             </div>
 
-            <div id="post_input_1" class="post-input-wrap2">
+            <div id="post_input_1" class="post-input-wrap post-box-shadow">
                 <div class="post-reply-row">
                     <div class="post-input-container">
-                        <textarea class="copy-input"></textarea>
+                        <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>

public/assets/wechat/homework_detail.html

@@ -31,7 +31,7 @@
                 </div>
                 <div class="cl"></div>
             </div>
-            <div id="all_homework_reply">
+            <div class="mb50" id="all_homework_reply">
 
                 <div ng-if="homework.journals_for_messages == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in homework.journals_for_messages">
@@ -51,10 +51,10 @@
 
             </div>
 
-            <div id="post_input_1" class="post-input-wrap2">
+            <div id="post_input_1" class="post-input-wrap post-box-shadow">
                 <div class="post-reply-row">
                     <div class="post-input-container">
-                        <textarea class="copy-input"></textarea>
+                        <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>

public/assets/wechat/invite_code.html

@@ -9,8 +9,8 @@
     <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 class="share-code-instruction"> 1.点击右上角"发送给朋友"，邀请同学加入班级<br />
+            2.长按二维码，通过“识别图中二维码”功能加入班级<br />
+            3.通过“加入班级”菜单输入邀请码加入班级（长按邀请码可以复制哦~）</div>
     </div>
 </div>