-
-
-<%block name="headextra">
- <%static:css group='style-course'/>
-
<%block name="js_extra">
<%static:require_module module_name="learner_profile/js/learner_profile_factory" class_name="LearnerProfileFactory">
diff --git a/openedx/features/learner_profile/tests/test_views.py b/openedx/features/learner_profile/tests/views/test_learner_profile.py
similarity index 51%
rename from openedx/features/learner_profile/tests/test_views.py
rename to openedx/features/learner_profile/tests/views/test_learner_profile.py
index b5468acd11..07789d8fa6 100644
--- a/openedx/features/learner_profile/tests/test_views.py
+++ b/openedx/features/learner_profile/tests/views/test_learner_profile.py
@@ -1,21 +1,32 @@
# -*- coding: utf-8 -*-
""" Tests for student profile views. """
+import datetime
+import ddt
+
from django.conf import settings
from django.core.urlresolvers import reverse
-from django.test import TestCase
from django.test.client import RequestFactory
-from student.tests.factories import UserFactory
from util.testing import UrlResetMixin
-from ..views import learner_profile_context
+from course_modes.models import CourseMode
+
+from certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error
+from student.tests.factories import CourseEnrollmentFactory, UserFactory
+
+from openedx.features.learner_profile.views.learner_profile import learner_profile_context
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
-class LearnerProfileViewTest(UrlResetMixin, TestCase):
+@ddt.ddt
+class LearnerProfileViewTest(UrlResetMixin, ModuleStoreTestCase):
""" Tests for the student profile view. """
USERNAME = "username"
+ OTHER_USERNAME = "other_user"
PASSWORD = "password"
+ DOWNLOAD_URL = "http://www.example.com/certificate.pdf"
CONTEXT_DATA = [
'default_public_account_fields',
'accounts_api_url',
@@ -32,7 +43,13 @@ class LearnerProfileViewTest(UrlResetMixin, TestCase):
def setUp(self):
super(LearnerProfileViewTest, self).setUp()
self.user = UserFactory.create(username=self.USERNAME, password=self.PASSWORD)
+ self.other_user = UserFactory.create(username=self.OTHER_USERNAME, password=self.PASSWORD)
self.client.login(username=self.USERNAME, password=self.PASSWORD)
+ self.course = CourseFactory.create(
+ start=datetime.datetime(2013, 9, 16, 7, 17, 28),
+ end=datetime.datetime.now(),
+ certificate_available_date=datetime.datetime.now(),
+ )
def test_context(self):
"""
@@ -100,3 +117,48 @@ class LearnerProfileViewTest(UrlResetMixin, TestCase):
profile_path = reverse('learner_profile', kwargs={'username': "no_such_user"})
response = self.client.get(path=profile_path)
self.assertEqual(404, response.status_code)
+
+ def _create_certificate(self, enrollment_mode):
+ """Simulate that the user has a generated certificate. """
+ CourseEnrollmentFactory.create(user=self.user, course_id=self.course.id, mode=enrollment_mode)
+ return GeneratedCertificateFactory(
+ user=self.user,
+ course_id=self.course.id,
+ mode=enrollment_mode,
+ download_url=self.DOWNLOAD_URL,
+ status="downloadable"
+ )
+
+ @ddt.data(CourseMode.HONOR, CourseMode.PROFESSIONAL, CourseMode.VERIFIED)
+ def test_certificate_visibility(self, cert_mode):
+ """
+ Verify that certificates are displayed with the correct card mode.
+ """
+ # Add new certificate
+ cert = self._create_certificate(cert_mode)
+ cert.save()
+
+ request = RequestFactory().get('/url')
+ request.user = self.user
+ context = learner_profile_context(request, self.user.username, self.user.is_staff)
+
+ self.assertTrue('card certificate-card mode-' + cert_mode in str(context['achievements_fragment'].content))
+
+ @ddt.data(True, False)
+ def test_no_certificate_visibility(self, own_profile):
+ """
+ Verify that the 'You haven't earned any certificates yet.' well appears on the user's
+ own profile when they do not have certificates and does not appear when viewing
+ another user that does not have any certificates.
+ """
+ request = RequestFactory().get('/url')
+ request.user = self.user
+ profile_username = self.user.username if own_profile else self.other_user.username
+ context = learner_profile_context(request, profile_username, self.user.is_staff)
+
+ if own_profile:
+ content = str(context['achievements_fragment'].content)
+ self.assertIn('icon fa fa-search', content)
+ self.assertIn("You haven't earned any certificates yet", content)
+ else:
+ self.assertIsNone(context['achievements_fragment'])
diff --git a/openedx/features/learner_profile/urls.py b/openedx/features/learner_profile/urls.py
index 184feb165b..775d6ded1f 100644
--- a/openedx/features/learner_profile/urls.py
+++ b/openedx/features/learner_profile/urls.py
@@ -5,12 +5,19 @@ Defines URLs for the learner profile.
from django.conf import settings
from django.conf.urls import url
+from views.learner_achievements import LearnerAchievementsFragmentView
+
urlpatterns = [
url(
r'^{username_pattern}$'.format(
username_pattern=settings.USERNAME_PATTERN,
),
- 'openedx.features.learner_profile.views.learner_profile',
+ 'openedx.features.learner_profile.views.learner_profile.learner_profile',
name='learner_profile',
),
+ url(
+ r'^achievements$',
+ LearnerAchievementsFragmentView.as_view(),
+ name='openedx.learner_profile.learner_achievements_fragment_view',
+ ),
]
diff --git a/openedx/features/learner_profile/views/__init__.py b/openedx/features/learner_profile/views/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/features/learner_profile/views/learner_achievements.py b/openedx/features/learner_profile/views/learner_achievements.py
new file mode 100644
index 0000000000..f605e192df
--- /dev/null
+++ b/openedx/features/learner_profile/views/learner_achievements.py
@@ -0,0 +1,42 @@
+"""
+Views to render a learner's achievements.
+"""
+
+from courseware.courses import get_course_overview_with_access
+from django.template.loader import render_to_string
+from lms.djangoapps.certificates import api as certificate_api
+from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
+from web_fragments.fragment import Fragment
+
+
+class LearnerAchievementsFragmentView(EdxFragmentView):
+ """
+ A fragment to render a learner's achievements.
+ """
+ def render_to_fragment(self, request, username=None, own_profile=False, **kwargs):
+ """
+ Renders the current learner's achievements.
+ """
+ course_certificates = self._get_ordered_certificates_for_user(request, username)
+ context = {
+ 'course_certificates': course_certificates,
+ 'own_profile': own_profile,
+ 'disable_courseware_js': True,
+ }
+ if course_certificates or own_profile:
+ html = render_to_string('learner_profile/learner-achievements-fragment.html', context)
+ return Fragment(html)
+ else:
+ return None
+
+ def _get_ordered_certificates_for_user(self, request, username):
+ """
+ Returns a user's certificates sorted by course name.
+ """
+ course_certificates = certificate_api.get_certificates_for_user(username)
+ for course_certificate in course_certificates:
+ course_key = course_certificate['course_key']
+ course_overview = get_course_overview_with_access(request.user, 'load', course_key)
+ course_certificate['course'] = course_overview
+ course_certificates.sort(key=lambda certificate: certificate['course'].display_name_with_default)
+ return course_certificates
diff --git a/openedx/features/learner_profile/views.py b/openedx/features/learner_profile/views/learner_profile.py
similarity index 88%
rename from openedx/features/learner_profile/views.py
rename to openedx/features/learner_profile/views/learner_profile.py
index a8d377bf78..4a166d4bc8 100644
--- a/openedx/features/learner_profile/views.py
+++ b/openedx/features/learner_profile/views/learner_profile.py
@@ -17,6 +17,10 @@ from openedx.core.djangoapps.user_api.errors import UserNotAuthorized, UserNotFo
from openedx.core.djangoapps.user_api.preferences.api import get_user_preferences
from student.models import User
+from .. import SHOW_ACHIEVEMENTS_FLAG
+
+from learner_achievements import LearnerAchievementsFragmentView
+
@login_required
@require_http_methods(['GET'])
@@ -70,7 +74,19 @@ def learner_profile_context(request, profile_username, user_is_staff):
preferences_data = get_user_preferences(profile_user, profile_username)
+ if SHOW_ACHIEVEMENTS_FLAG.is_enabled():
+ achievements_fragment = LearnerAchievementsFragmentView().render_to_fragment(
+ request,
+ username=profile_user.username,
+ own_profile=own_profile,
+ )
+ else:
+ achievements_fragment = None
+
context = {
+ 'own_profile': own_profile,
+ 'achievements_fragment': achievements_fragment,
+ 'platform_name': configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME),
'data': {
'profile_user_id': profile_user.id,
'default_public_account_fields': settings.ACCOUNT_VISIBILITY_CONFIGURATION['public_fields'],
diff --git a/themes/edge.edx.org/lms/static/images/certificates/honor.png b/themes/edge.edx.org/lms/static/images/certificates/honor.png
new file mode 100644
index 0000000000..7c6878175d
Binary files /dev/null and b/themes/edge.edx.org/lms/static/images/certificates/honor.png differ
diff --git a/themes/edge.edx.org/lms/static/images/certificates/micromasters-program.png b/themes/edge.edx.org/lms/static/images/certificates/micromasters-program.png
new file mode 100644
index 0000000000..fa1f4c824a
Binary files /dev/null and b/themes/edge.edx.org/lms/static/images/certificates/micromasters-program.png differ
diff --git a/themes/edge.edx.org/lms/static/images/certificates/professional-program.png b/themes/edge.edx.org/lms/static/images/certificates/professional-program.png
new file mode 100644
index 0000000000..59a2e6889f
Binary files /dev/null and b/themes/edge.edx.org/lms/static/images/certificates/professional-program.png differ
diff --git a/themes/edge.edx.org/lms/static/images/certificates/professional.png b/themes/edge.edx.org/lms/static/images/certificates/professional.png
new file mode 100644
index 0000000000..c475ca08f6
Binary files /dev/null and b/themes/edge.edx.org/lms/static/images/certificates/professional.png differ
diff --git a/themes/edge.edx.org/lms/static/images/certificates/verified.png b/themes/edge.edx.org/lms/static/images/certificates/verified.png
new file mode 100644
index 0000000000..0ea8365f51
Binary files /dev/null and b/themes/edge.edx.org/lms/static/images/certificates/verified.png differ
diff --git a/themes/edge.edx.org/lms/static/sass/partials/base/_certificates.scss b/themes/edge.edx.org/lms/static/sass/partials/base/_certificates.scss
new file mode 100644
index 0000000000..6fbee80f76
--- /dev/null
+++ b/themes/edge.edx.org/lms/static/sass/partials/base/_certificates.scss
@@ -0,0 +1,30 @@
+// Certificate overrides for edge.edx.org
+
+.certificate-card {
+ // Note: edx.org no longer supports audit certificates, but there are
+ // legacy certificates that might be rendered. In this situation, they
+ // are styled as honor certificates.
+ &.mode-honor, &.mode-audit {
+ border-color: $honor-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/honor.png');
+ }
+ }
+
+ &.mode-verified {
+ border-color: $verified-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/verified.png');
+ }
+ }
+
+ &.mode-professional {
+ border-color: $professional-certificate-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/professional.png');
+ }
+ }
+}
diff --git a/themes/edge.edx.org/lms/static/sass/partials/base/_theme.scss b/themes/edge.edx.org/lms/static/sass/partials/base/_theme.scss
new file mode 100644
index 0000000000..9be47d0644
--- /dev/null
+++ b/themes/edge.edx.org/lms/static/sass/partials/base/_theme.scss
@@ -0,0 +1,3 @@
+// Theme overrides for edge.edx.org
+
+@import 'base/certificates';
diff --git a/themes/edx.org/lms/static/images/certificates/honor.png b/themes/edx.org/lms/static/images/certificates/honor.png
new file mode 100644
index 0000000000..3005543f96
Binary files /dev/null and b/themes/edx.org/lms/static/images/certificates/honor.png differ
diff --git a/themes/edx.org/lms/static/images/certificates/micromasters-program.png b/themes/edx.org/lms/static/images/certificates/micromasters-program.png
new file mode 100644
index 0000000000..99a20664a6
Binary files /dev/null and b/themes/edx.org/lms/static/images/certificates/micromasters-program.png differ
diff --git a/themes/edx.org/lms/static/images/certificates/professional-program.png b/themes/edx.org/lms/static/images/certificates/professional-program.png
new file mode 100644
index 0000000000..65dfbeee12
Binary files /dev/null and b/themes/edx.org/lms/static/images/certificates/professional-program.png differ
diff --git a/themes/edx.org/lms/static/images/certificates/professional.png b/themes/edx.org/lms/static/images/certificates/professional.png
new file mode 100644
index 0000000000..77cb023476
Binary files /dev/null and b/themes/edx.org/lms/static/images/certificates/professional.png differ
diff --git a/themes/edx.org/lms/static/images/certificates/verified.png b/themes/edx.org/lms/static/images/certificates/verified.png
new file mode 100644
index 0000000000..31787c77d0
Binary files /dev/null and b/themes/edx.org/lms/static/images/certificates/verified.png differ
diff --git a/themes/edx.org/lms/static/sass/partials/base/_certificates.scss b/themes/edx.org/lms/static/sass/partials/base/_certificates.scss
new file mode 100644
index 0000000000..8d3c2e1f1d
--- /dev/null
+++ b/themes/edx.org/lms/static/sass/partials/base/_certificates.scss
@@ -0,0 +1,30 @@
+// Certificate overrides for edx.org
+
+.certificate-card {
+ // Note: edx.org no longer supports audit certificates, but there are
+ // legacy certificates that might be rendered. In this situation, they
+ // are styled as honor certificates.
+ &.mode-honor, &.mode-audit {
+ border-color: $honor-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/honor.png');
+ }
+ }
+
+ &.mode-verified {
+ border-color: $verified-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/verified.png');
+ }
+ }
+
+ &.mode-professional {
+ border-color: $professional-certificate-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/professional.png');
+ }
+ }
+}
diff --git a/themes/edx.org/lms/static/sass/partials/base/_theme.scss b/themes/edx.org/lms/static/sass/partials/base/_theme.scss
new file mode 100644
index 0000000000..603c4f5244
--- /dev/null
+++ b/themes/edx.org/lms/static/sass/partials/base/_theme.scss
@@ -0,0 +1,3 @@
+// Theme overrides for edx.org
+
+@import 'base/certificates';
diff --git a/themes/red-theme/lms/static/images/certificates/red-certificate.png b/themes/red-theme/lms/static/images/certificates/red-certificate.png
new file mode 100644
index 0000000000..ee8f9bc053
Binary files /dev/null and b/themes/red-theme/lms/static/images/certificates/red-certificate.png differ
diff --git a/themes/red-theme/lms/static/sass/partials/base/_certificates.scss b/themes/red-theme/lms/static/sass/partials/base/_certificates.scss
new file mode 100644
index 0000000000..a0ebf3f820
--- /dev/null
+++ b/themes/red-theme/lms/static/sass/partials/base/_certificates.scss
@@ -0,0 +1,35 @@
+// Certificate overrides for the red theme
+
+.certificate-card {
+ &.mode-audit {
+ border-color: $audit-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/red-certificate.png');
+ }
+ }
+
+ &.mode-honor {
+ border-color: $honor-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/red-certificate.png');
+ }
+ }
+
+ &.mode-verified {
+ border-color: $verified-mode-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/red-certificate.png');
+ }
+ }
+
+ &.mode-professional {
+ border-color: $professional-certificate-color;
+
+ .card-logo {
+ background-image: url('#{$static-path}/images/certificates/red-certificate.png');
+ }
+ }
+}
diff --git a/themes/red-theme/lms/static/sass/partials/base/_theme.scss b/themes/red-theme/lms/static/sass/partials/base/_theme.scss
new file mode 100644
index 0000000000..ab18a6a002
--- /dev/null
+++ b/themes/red-theme/lms/static/sass/partials/base/_theme.scss
@@ -0,0 +1,3 @@
+// Theme overrides for the red theme
+
+@import 'base/certificates';
${_("Loading")}
+
+
+
+ % if own_profile:
+
+
+ % endif
+ ${_("My Profile")}
+
+ ${_('Build out your profile to personalize your identity on {platform_name}.').format(
+ platform_name=platform_name,
+ )}
+
+
+
+ ${_("Loading")}
+
+
+
+
+
+
+
+
+
+
+ ${_("An error occurred. Try loading the page again.")}
+
+
+ % if achievements_fragment:
+ ${HTML(achievements_fragment.body_html())}
+ % endif
+
+
+
+