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
60937ea9
Commit
60937ea9
authored
May 27, 2015
by
Dennis Jen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Incorporate no-id-professional mode into professional enrollments.
parent
558c0724
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletions
+10
-1
analytics_data_api/constants/enrollment_modes.py
+2
-1
analytics_data_api/v0/tests/views/test_courses.py
+4
-0
analytics_data_api/v0/views/courses.py
+4
-0
No files found.
analytics_data_api/constants/enrollment_modes.py
View file @
60937ea9
AUDIT
=
u'audit'
AUDIT
=
u'audit'
HONOR
=
u'honor'
HONOR
=
u'honor'
PROFESSIONAL
=
u'professional'
PROFESSIONAL
=
u'professional'
PROFESSIONAL_NO_ID
=
u'no-id-professional'
VERIFIED
=
u'verified'
VERIFIED
=
u'verified'
ALL
=
[
AUDIT
,
HONOR
,
PROFESSIONAL
,
VERIFIED
]
ALL
=
[
AUDIT
,
HONOR
,
PROFESSIONAL
,
PROFESSIONAL_NO_ID
,
VERIFIED
]
analytics_data_api/v0/tests/views/test_courses.py
View file @
60937ea9
...
@@ -435,6 +435,9 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
...
@@ -435,6 +435,9 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
response
[
enrollment_modes
.
HONOR
]
+=
response
[
enrollment_modes
.
AUDIT
]
response
[
enrollment_modes
.
HONOR
]
+=
response
[
enrollment_modes
.
AUDIT
]
del
response
[
enrollment_modes
.
AUDIT
]
del
response
[
enrollment_modes
.
AUDIT
]
response
[
enrollment_modes
.
PROFESSIONAL
]
+=
response
[
enrollment_modes
.
PROFESSIONAL_NO_ID
]
del
response
[
enrollment_modes
.
PROFESSIONAL_NO_ID
]
response
[
u'count'
]
=
total
response
[
u'count'
]
=
total
return
[
response
]
return
[
response
]
...
@@ -448,6 +451,7 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
...
@@ -448,6 +451,7 @@ class CourseEnrollmentModeViewTests(CourseEnrollmentViewTestCaseMixin, DefaultFi
# Create the expected data
# Create the expected data
modes
=
list
(
enrollment_modes
.
ALL
)
modes
=
list
(
enrollment_modes
.
ALL
)
modes
.
remove
(
enrollment_modes
.
AUDIT
)
modes
.
remove
(
enrollment_modes
.
AUDIT
)
modes
.
remove
(
enrollment_modes
.
PROFESSIONAL_NO_ID
)
expected
=
{}
expected
=
{}
for
mode
in
modes
:
for
mode
in
modes
:
...
...
analytics_data_api/v0/views/courses.py
View file @
60937ea9
...
@@ -513,6 +513,10 @@ class CourseEnrollmentModeView(BaseCourseEnrollmentView):
...
@@ -513,6 +513,10 @@ class CourseEnrollmentModeView(BaseCourseEnrollmentView):
# Merge audit and honor
# Merge audit and honor
item
[
enrollment_modes
.
HONOR
]
=
item
.
get
(
enrollment_modes
.
HONOR
,
0
)
+
item
.
pop
(
enrollment_modes
.
AUDIT
,
0
)
item
[
enrollment_modes
.
HONOR
]
=
item
.
get
(
enrollment_modes
.
HONOR
,
0
)
+
item
.
pop
(
enrollment_modes
.
AUDIT
,
0
)
# Merge professional with non verified professional
item
[
enrollment_modes
.
PROFESSIONAL
]
=
\
item
.
get
(
enrollment_modes
.
PROFESSIONAL
,
0
)
+
item
.
pop
(
enrollment_modes
.
PROFESSIONAL_NO_ID
,
0
)
item
[
u'count'
]
=
total
item
[
u'count'
]
=
total
formatted_data
.
append
(
item
)
formatted_data
.
append
(
item
)
...
...
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