diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index f0d58adbb..0e79f11de 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -42,6 +42,14 @@ module CoursesHelper end end + def practice_homework_count course + homeworks = course.homework_commons.practices + publish_count = homeworks.select{|homework| homework.publish_time.present? && homework.publish_time <= Time.now}.size + unpublish_count = homeworks.select{|homework| homework.publish_time.nil? || homework.publish_time > Time.now}.size + all_count = homeworks.size + {publish_count: publish_count, unpublish_count: unpublish_count, all_count: all_count} + end + # 课堂模块的url def module_url mod, course return nil if mod.blank? or course.blank? diff --git a/app/views/homework_commons/_second_category.json.jbuilder b/app/views/homework_commons/_second_category.json.jbuilder index c6dfa76a0..04890e70c 100644 --- a/app/views/homework_commons/_second_category.json.jbuilder +++ b/app/views/homework_commons/_second_category.json.jbuilder @@ -1,6 +1,10 @@ json.main_category main_catrgory do |category| json.main_category_id 0 json.main_category_name category.module_name + homework_count = practice_homework_count category.course + json.publish_count homework_count[:publish_count] + json.unpublish_count homework_count[:unpublish_count] + json.all_count homework_count[:all_count] end json.homework_category homework_category do |category| json.category_id category.id