Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/api/mobile/entities/anonymous_works_params.rb

@@ -15,6 +15,7 @@ module Mobile
       anonymous_works_params_expose :m_score
       anonymous_works_params_expose :is_anonymous_comments
       anonymous_works_params_expose :cur_type
+      anonymous_works_params_expose :cur_page
       expose :jours ,using: Mobile::Entities::Jours do |f, opt|
         if f.is_a?(Hash) && f.key?(:jours)
           f[:jours]

app/api/mobile/entities/homework.rb

@@ -52,6 +52,10 @@ module Mobile
       homework_expose :created_on
       homework_expose :deadline
 
+      expose :jours,using: Mobile::Entities::Jours  do |f, opt|
+        f[:jours] if f.is_a?(Hash) && f.key?(:jours)
+      end
+
       expose :homework_for_anonymous_comments,using: Mobile::Entities::HomeworkAttach  do |f, opt|
         f[:homework_for_anonymous_comments] if f.is_a?(Hash) && f.key?(:homework_for_anonymous_comments)
       end

app/services/homework_service.rb

@@ -26,8 +26,9 @@ class HomeworkService
     state = @bid.comment_status
     #end
     open_anonymous_evaluation = @bid.open_anonymous_evaluation
+    jours = @bid.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
     {:course_name => course.name,:course_id => course.id,:id => @bid.id, :author => @bid.author,:author_real_name =>author,  :homework_times => many_times, :homework_name => name, :homework_count => homework_count,:student_questions_count => student_questions_count,
-     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:created_on => @bid.created_on,:deadline => @bid.deadline}
+     :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation,:created_on => @bid.created_on,:deadline => @bid.deadline,:jours => jours}
   end
   
   # 启动作业匿评前提示信息
@@ -116,7 +117,7 @@ class HomeworkService
       @is_anonymous_comments = @bid.comment_status == 1 && !@homework.users.include?(current_user) && @homework.user != current_user && !@is_teacher #判断是不是匿评(开启匿评，当前用户不是作业的创建者或者参与者，不是老师)
       jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
       #@jour = paginateHelper jours,5 #留言
-      #@cur_page = params[:cur_page] || 1
+      @cur_page = params[:cur_page] || 1
       @cur_type = params[:cur_type] || 5
       teacher_stars_json_like = stars_to_json_like(@teacher_stars,true,@homework,true)
       student_stars_json_like = stars_to_json_like(@student_stars,false,@homework,(false || @is_teacher))
@@ -125,7 +126,7 @@ class HomeworkService
     end
 
     [@homework,{:is_teacher => @is_teacher,:m_score => @m_score,:jours => jours,:teacher_stars => teacher_stars_json_like,
-     :student_stars => student_stars_json_like,:is_anonymous_comments => @is_anonymous_comments,:cur_type => @cur_type}]
+     :student_stars => student_stars_json_like,:is_anonymous_comments => @is_anonymous_comments,:cur_type => @cur_type,:cur_page => @cur_page}]
     #name  = @homework.name
     #desc = @homework.description
     #datetime = @homework.created_at