Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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-platform
Commits
860dabe4
Commit
860dabe4
authored
Jun 28, 2016
by
tasawernawaz
Committed by
Tasawer
Jun 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show messge on progress page when user is in audit mode. ECOM-4797
parent
0ea3a774
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
4 deletions
+29
-4
lms/djangoapps/courseware/tests/test_views.py
+16
-0
lms/djangoapps/courseware/views/views.py
+1
-0
lms/templates/courseware/progress.html
+12
-4
No files found.
lms/djangoapps/courseware/tests/test_views.py
View file @
860dabe4
...
...
@@ -1446,6 +1446,22 @@ class ProgressPageTests(ModuleStoreTestCase):
self
.
assertContains
(
resp
,
u'Download Your Certificate'
)
self
.
assert_invalidate_certificate
(
generated_certificate
)
def
test_message_for_audit_mode
(
self
):
""" Verify that message appears on progress page, if learner is enrolled
in audit mode.
"""
user
=
UserFactory
.
create
()
self
.
assertTrue
(
self
.
client
.
login
(
username
=
user
.
username
,
password
=
'test'
))
CourseEnrollmentFactory
(
user
=
user
,
course_id
=
self
.
course
.
id
,
mode
=
CourseMode
.
AUDIT
)
response
=
self
.
client
.
get
(
reverse
(
'progress'
,
args
=
[
unicode
(
self
.
course
.
id
)])
)
self
.
assertContains
(
response
,
u'You are enrolled in the audit track for this course. The audit track does not include a certificate.'
)
def
assert_invalidate_certificate
(
self
,
certificate
):
""" Dry method to mark certificate as invalid. And assert the response. """
CertificateInvalidationFactory
.
create
(
...
...
lms/djangoapps/courseware/views/views.py
View file @
860dabe4
...
...
@@ -753,6 +753,7 @@ def _progress(request, course_key, student_id):
'credit_course_requirements'
:
_credit_course_requirements
(
course_key
,
student
),
'missing_required_verification'
:
missing_required_verification
,
'certificate_invalidated'
:
False
,
'enrollment_mode'
:
enrollment_mode
,
}
if
show_generate_cert_btn
:
...
...
lms/templates/courseware/progress.html
View file @
860dabe4
...
...
@@ -2,6 +2,7 @@
<
%
namespace
name=
'static'
file=
'/static_content.html'
/>
<
%
def
name=
"online_help_token()"
><
%
return
"
progress
"
%
></
%
def>
<
%!
from
course_modes
.
models
import
CourseMode
from
django
.
utils
.
translation
import
ugettext
as
_
from
django
.
core
.
urlresolvers
import
reverse
from
util
.
date_utils
import
get_time_display
,
DEFAULT_SHORT_DATE_FORMAT
...
...
@@ -47,9 +48,15 @@ from django.utils.http import urlquote_plus
<header
class=
"progress-certificates"
>
<h1
class=
"progress-certificates-title"
>
${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email) | h}
</h1>
</header>
%if show_generate_cert_btn:
<div
class=
"wrapper-msg wrapper-auto-cert"
>
<div
class=
"wrapper-msg wrapper-auto-cert"
>
%if enrollment_mode == CourseMode.AUDIT:
<div
class=
"auto-cert-message"
>
<div
class=
"msg-content"
>
<h2
class=
"title"
>
${_("Your enrollment: Audit track")}
</h2>
<p
class=
"copy"
>
${_("You are enrolled in the audit track for this course. The audit track does not include a certificate.")}
</p>
</div>
</div>
%elif show_generate_cert_btn:
<div
id=
"errors-info"
class=
"errors-info"
></div>
%if passed:
<div
class=
"auto-cert-message"
id=
"course-success"
>
...
...
@@ -105,8 +112,9 @@ from django.utils.http import urlquote_plus
</div>
</div>
%endif
</div>
%endif
</div>
%if not course.disable_progress_graph:
<div
class=
"grade-detail-graph"
id=
"grade-detail-graph"
aria-hidden=
"true"
></div>
...
...
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