Commit 75467f6e by Tyler Hallada Committed by GitHub

Merge pull request #142 from edx/thallada/enable-posted-forum

AN-7880 Uncomment including "posted_forum" events
parents f3d5c67f e3ec9f1c
......@@ -300,13 +300,13 @@ class CourseActivityWeeklySerializer(serializers.ModelSerializer):
any = serializers.IntegerField(required=False)
attempted_problem = serializers.IntegerField(required=False)
played_video = serializers.IntegerField(required=False)
# posted_forum = serializers.IntegerField(required=False)
posted_forum = serializers.IntegerField(required=False)
created = serializers.DateTimeField(format=settings.DATETIME_FORMAT)
class Meta(object):
model = models.CourseActivityWeekly
# TODO: Add 'posted_forum' here to restore forum data
fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'created')
fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video',
'posted_forum', 'created')
class VideoSerializer(ModelSerializerWithCreatedField):
......
......@@ -165,9 +165,8 @@ class CourseActivityLastWeekTest(DemoCourseMixin, TestCaseWithAuthentication):
course_id = course_id or self.course_id
interval_start = datetime.datetime(2014, 1, 1, tzinfo=pytz.utc)
interval_end = interval_start + datetime.timedelta(weeks=1)
# G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
# interval_end=interval_end,
# activity_type='POSTED_FORUM', count=100)
G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
interval_end=interval_end, activity_type='POSTED_FORUM', count=100)
G(models.CourseActivityWeekly, course_id=course_id, interval_start=interval_start,
interval_end=interval_end,
activity_type='ATTEMPTED_PROBLEM', count=200)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment