diff --git a/app/api/mobile/entities/anonymous_works_params.rb b/app/api/mobile/entities/anonymous_works_params.rb index 9ac9a5bd8..a6fcd19f2 100644 --- a/app/api/mobile/entities/anonymous_works_params.rb +++ b/app/api/mobile/entities/anonymous_works_params.rb @@ -12,7 +12,11 @@ module Mobile end anonymous_works_params_expose :is_teacher anonymous_works_params_expose :m_score - anonymous_works_params_expose :jours + expose :jours ,using: Mobile::Entities::Jours do |f, opt| + if f.is_a?(Hash) && f.key?(:jours) + f[:jours] + end + end expose :teacher_stars,using: Mobile::Entities::HomeworkJours do |f, opt| if f.is_a?(Hash) && f.key?(:teacher_stars) f[:teacher_stars] diff --git a/app/api/mobile/entities/homework_jours.rb b/app/api/mobile/entities/homework_jours.rb index 27803b496..63c6997fd 100644 --- a/app/api/mobile/entities/homework_jours.rb +++ b/app/api/mobile/entities/homework_jours.rb @@ -1,5 +1,6 @@ module Mobile module Entities + #带评分的留言(教师评论、学生匿名评分都属于此类) class HomeworkJours < Grape::Entity include Redmine::I18n def self.homework_jours_expose(field) @@ -18,6 +19,7 @@ module Mobile expose :comment,using: Mobile::Entities::Jours do |f,opt| f[:comment] end + end end end \ No newline at end of file diff --git a/app/api/mobile/entities/jours.rb b/app/api/mobile/entities/jours.rb index 02f380352..5a9f48cbc 100644 --- a/app/api/mobile/entities/jours.rb +++ b/app/api/mobile/entities/jours.rb @@ -1,7 +1,9 @@ module Mobile module Entities + #普通留言 class Jours < Grape::Entity include Redmine::I18n + include WordsHelper def self.jours_expose(field) expose field do |f,opt| if f.is_a?(Hash) && f.key?(field) @@ -12,16 +14,24 @@ module Mobile else f.send(field) end - end end end + jours_expose :id expose :user,using: Mobile::Entities::User do |f, opt| f.user end jours_expose :created_on jours_expose :notes - + jours_expose :m_reply_id + expose :reply_user,using: Mobile::Entities::User do |f, opt| + f.at_user + end + expose :child_reply,using: Mobile::Entities::Jours do |f, opt| + if f.is_a?(::JournalsForMessage) + fetch_user_leaveWord_reply(f) + end + end end end end