微信修改 不能直接给数据库对象增加新属性

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

app/api/mobile/apis/resources.rb

@@ -14,7 +14,7 @@ module Mobile
           rs = ResourcesService.new
           # data = current_user.course_attachments
           data = rs.all_course_attachments current_user
-          present :data, data, with: Mobile::Entities::Attachment
+          present :data, data, with: Mobile::Entities::Attachment,user: current_user
           present :status, 0
 
         end
@@ -31,7 +31,7 @@ module Mobile
           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
@@ -45,7 +45,7 @@ module Mobile
 
           rs = ResourcesService.new
           exercises = rs.all_exercises current_user
-          present :data, exercises, with: Mobile::Entities::Exercise
+          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/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

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,21 @@ 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
+        member = instance.members.where("user_id=#{current_user.id} and course_id=#{instance.id}")[0]
+        roleName = member.roles[0].name if member
+
+        if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
+          can_setting = true
+        end
+
+        if instance.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,9 +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
-      expose :coursename #所属班级名
+      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

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/services/resources_service.rb

@@ -1,7 +1,6 @@
 #coding=utf-8
 
 class ResourcesService
-  include ActionView::Helpers::NumberHelper
   #发送资源到课程
   def send_resource_to_course user,params
     send_id  = params[:send_id]
@@ -59,11 +58,11 @@ class ResourcesService
 
     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.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
@@ -77,10 +76,10 @@ class ResourcesService
 
     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.each do |v|
+    #   course =  Course.where("id=?",v.course_id).first
+    #   v[:coursename] = course.nil? ? "未知" : course.name
+    # end
 
     homeworks
   end
@@ -94,10 +93,10 @@ class ResourcesService
 
     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.each do |v|
+    #   course =  Course.where("id=?",v.course_id).first
+    #   v[:coursename] = course.nil? ? "未知" : course.name
+    # end
 
     exercises
   end

app/services/syllabuses_service.rb

@@ -49,9 +49,9 @@ class SyllabusesService
 
     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

public/assets/wechat/myresource.html

@@ -19,14 +19,14 @@
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>
     <div ng-class="{'undis': currentTab!=2}">
-      <div ng-repeat="r in homeworks|filter:{homework_name: 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-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+      <div ng-repeat="r in homeworks|filter:{homework_name: 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-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
         <span class="f12 mt5 ml35 c-grey4">作业来源：{{r.coursename}}</span>
       </div>
         <p ng-show="homeworks && 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-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+      <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-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
         <span class="f12 mt5 ml35 c-grey4">题目来源：{{r.coursename}}</span>
       </div>
         <p ng-show="exercise && exercise.length<=0" class="class-test-tip">暂无测验，<br />

public/assets/wechat/send_class_list.html

@@ -2,7 +2,7 @@
 <div class="post-container">
     <div loading-spinner></div>
 
-    <div class="blue-title">发送课程列表</div>
+    <div class="blue-title">请选择要发送的班级</div>
 
 
     <div ng-show="syllabus.can_setting" ng-repeat="syllabus in syllabuses">