Commit c4ff28e7 by Clinton Blackburn Committed by Clinton Blackburn

Removed forum data from activity resource

We don't currently have the data. I have commented out the relevant code.
parent 4cd74507
......@@ -122,11 +122,10 @@ 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 = CourseActivityWeekly
fields = (
'interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'posted_forum',
'created')
# TODO: Add 'posted_forum' here to restore forum data
fields = ('interval_start', 'interval_end', 'course_id', 'any', 'attempted_problem', 'played_video', 'created')
......@@ -135,9 +135,9 @@ class CourseActivityLastWeekTest(TestCaseWithAuthentication):
self.course_id = 'edX/DemoX/Demo_Course'
interval_start = datetime.datetime(2014, 1, 1, tzinfo=pytz.utc)
interval_end = interval_start + datetime.timedelta(weeks=1)
G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
interval_end=interval_end,
activity_type='POSTED_FORUM', count=100)
# G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
# interval_end=interval_end,
# activity_type='POSTED_FORUM', count=100)
G(models.CourseActivityWeekly, course_id=self.course_id, interval_start=interval_start,
interval_end=interval_end,
activity_type='ATTEMPTED_PROBLEM', count=200)
......@@ -367,7 +367,8 @@ class CourseActivityWeeklyViewTests(CourseViewTestCaseMixin, TestCaseWithAuthent
path = '/activity/'
default_order_by = 'interval_end'
model = CourseActivityWeekly
activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO', 'POSTED_FORUM']
# activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO', 'POSTED_FORUM']
activity_types = ['ACTIVE', 'ATTEMPTED_PROBLEM', 'PLAYED_VIDEO']
def setUp(self):
super(CourseActivityWeeklyViewTests, self).setUp()
......
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