Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support team UI for regenerating certificates #9240

Merged
merged 1 commit into from
Aug 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/djangoapps/student/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,17 @@ def __init__(self, *args, **kwargs):
super(CourseCreatorRole, self).__init__(self.ROLE, *args, **kwargs)


@register_access_role
class SupportStaffRole(RoleBase):
"""
Student support team members.
"""
ROLE = "support"

def __init__(self, *args, **kwargs):
super(SupportStaffRole, self).__init__(self.ROLE, *args, **kwargs)


class UserBasedRole(object):
"""
Backward mapping: given a user, manipulate the courses and roles
Expand Down
63 changes: 61 additions & 2 deletions lms/djangoapps/certificates/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,54 @@
log = logging.getLogger("edx.certificate")


def get_certificates_for_user(username):
"""
Retrieve certificate information for a particular user.

Arguments:
username (unicode): The identifier of the user.

Returns: list

Example Usage:
>>> get_certificates_for_user("bob")
[
{
"username": "bob",
"course_key": "edX/DemoX/Demo_Course",
"type": "verified",
"status": "downloadable",
"download_url": "http://www.example.com/cert.pdf",
"grade": "0.98",
"created": 2015-07-31T00:00:00Z,
"modified": 2015-07-31T00:00:00Z
}
]

"""
return [
{
"username": username,
"course_key": cert.course_id,
"type": cert.mode,
"status": cert.status,
"grade": cert.grade,
"created": cert.created_date,
"modified": cert.modified_date,

# NOTE: the download URL is not currently being set for webview certificates.
# In the future, we can update this to construct a URL to the webview certificate
# for courses that have this feature enabled.
"download_url": (
cert.download_url
if cert.status == CertificateStatuses.downloadable
else None
),
}
for cert in GeneratedCertificate.objects.filter(user__username=username).order_by("course_id")
]


def generate_user_certificates(student, course_key, course=None, insecure=False, generation_mode='batch',
forced_grade=None):
"""
Expand Down Expand Up @@ -96,7 +144,14 @@ def regenerate_user_certificates(student, course_key, course=None,
xqueue.use_https = False

generate_pdf = not has_html_certificates_enabled(course_key, course)
return xqueue.regen_cert(student, course_key, course, forced_grade, template_file, generate_pdf)
return xqueue.regen_cert(
student,
course_key,
course=course,
forced_grade=forced_grade,
template_file=template_file,
generate_pdf=generate_pdf
)


def certificate_downloadable_status(student, course_key):
Expand Down Expand Up @@ -281,7 +336,11 @@ def get_certificate_url(user_id, course_id):
url = ""
if settings.FEATURES.get('CERTIFICATES_HTML_VIEW', False):
url = reverse(
'cert_html_view', kwargs=dict(user_id=str(user_id), course_id=unicode(course_id))
'certificates:html_view',
kwargs={
"user_id": str(user_id),
"course_id": unicode(course_id),
}
)
else:
try:
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/certificates/badge_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def create_assertion(self, user, mode):
data = {
'email': user.email,
'evidence': self.site_prefix() + reverse(
'cert_html_view', kwargs={'user_id': user.id, 'course_id': unicode(self.course_key)}
'certificates:html_view', kwargs={'user_id': user.id, 'course_id': unicode(self.course_key)}
) + '?evidence_visit=1'
}
response = requests.post(self.assertion_url(mode), headers=self.get_headers(), data=data)
Expand Down
9 changes: 8 additions & 1 deletion lms/djangoapps/certificates/queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,14 @@ def regen_cert(self, student, course_id, course=None, forced_grade=None, templat
except GeneratedCertificate.DoesNotExist:
pass

return self.add_cert(student, course_id, course, forced_grade, template_file, generate_pdf)
return self.add_cert(
student,
course_id,
course=course,
forced_grade=forced_grade,
template_file=template_file,
generate_pdf=generate_pdf
)

def del_cert(self, student, course_id):

Expand Down
7 changes: 6 additions & 1 deletion lms/djangoapps/certificates/tests/test_cert_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ def test_clear_badge(self, xqueue):
grade_value=None
)
xqueue.return_value.regen_cert.assert_called_with(
self.user, key, self.course, None, None, True
self.user,
key,
course=self.course,
forced_grade=None,
template_file=None,
generate_pdf=True
)
self.assertFalse(BadgeAssertion.objects.filter(user=self.user, course_id=key))

Expand Down
Loading