Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-analytics-data-api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-analytics-data-api
Commits
75467f6e
Commit
75467f6e
authored
Oct 25, 2016
by
Tyler Hallada
Committed by
GitHub
Oct 25, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #142 from edx/thallada/enable-posted-forum
AN-7880 Uncomment including "posted_forum" events
parents
f3d5c67f
e3ec9f1c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
analytics_data_api/v0/serializers.py
+3
-3
analytics_data_api/v0/tests/views/test_courses.py
+2
-3
No files found.
analytics_data_api/v0/serializers.py
View file @
75467f6e
...
...
@@ -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
):
...
...
analytics_data_api/v0/tests/views/test_courses.py
View file @
75467f6e
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment