Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts: lms/static/sass/course/courseware/_courseware.scss
This commit is contained in:
Calen Pennington
@@ -0,0 +1,38 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from certificates.models import certificate_status_for_student
|
||||
from certificates.queue import XQueueCertInterface
|
||||
from django.contrib.auth.models import User
|
||||
from student.models import UserProfile
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
||||
help = """
|
||||
Looks for names that have unicode characters
|
||||
and queues them up for a certificate request
|
||||
"""
|
||||
|
||||
def handle(self, *args, **options):
|
||||
|
||||
# TODO this is only temporary for CS169 certs
|
||||
|
||||
course_id = 'BerkeleyX/CS169.1x/2012_Fall'
|
||||
|
||||
enrolled_students = User.objects.filter(
|
||||
courseenrollment__course_id=course_id).prefetch_related(
|
||||
"groups").order_by('username')
|
||||
xq = XQueueCertInterface()
|
||||
print "Looking for unusual names.."
|
||||
for student in enrolled_students:
|
||||
if certificate_status_for_student(
|
||||
student, course_id)['status'] == 'unavailable':
|
||||
continue
|
||||
name = UserProfile.objects.get(user=student).name
|
||||
for c in name:
|
||||
if ord(c) >= 0x200:
|
||||
ret = xq.add_cert(student, course_id)
|
||||
if ret == 'generating':
|
||||
print 'generating for {0}'.format(student)
|
||||
break
|
||||
@@ -1,22 +1,30 @@
|
||||
from django.utils.simplejson import dumps
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
from certificates.models import GeneratedCertificate
|
||||
from django.core.management.base import BaseCommand
|
||||
from certificates.models import certificate_status_for_student
|
||||
from certificates.queue import XQueueCertInterface
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
||||
help = """
|
||||
This command finds all GeneratedCertificate objects that do not have a
|
||||
certificate generated. These come into being when a user requests a
|
||||
certificate, or when grade_all_students is called (for pre-generating
|
||||
certificates).
|
||||
Find all students that have need certificates
|
||||
and put certificate requests on the queue
|
||||
|
||||
It returns a json formatted list of users and their user ids
|
||||
This is only for BerkeleyX/CS169.1x/2012_Fall
|
||||
"""
|
||||
|
||||
def handle(self, *args, **options):
|
||||
users = GeneratedCertificate.objects.filter(
|
||||
download_url=None)
|
||||
user_output = [{'user_id':user.user_id, 'name':user.name}
|
||||
for user in users]
|
||||
self.stdout.write(dumps(user_output) + "\n")
|
||||
|
||||
# TODO This is only temporary for CS169 certs
|
||||
|
||||
course_id = 'BerkeleyX/CS169.1x/2012_Fall'
|
||||
enrolled_students = User.objects.filter(
|
||||
courseenrollment__course_id=course_id).prefetch_related(
|
||||
"groups").order_by('username')
|
||||
xq = XQueueCertInterface()
|
||||
for student in enrolled_students:
|
||||
if certificate_status_for_student(
|
||||
student, course_id)['status'] == 'unavailable':
|
||||
ret = xq.add_cert(student, course_id)
|
||||
if ret == 'generating':
|
||||
print 'generating for {0}'.format(student)
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting model 'RevokedCertificate'
|
||||
db.delete_table('certificates_revokedcertificate')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.name'
|
||||
db.delete_column('certificates_generatedcertificate', 'name')
|
||||
|
||||
# Adding field 'GeneratedCertificate.course_id'
|
||||
db.add_column('certificates_generatedcertificate', 'course_id',
|
||||
self.gf('django.db.models.fields.CharField')(default=False, max_length=255),
|
||||
keep_default=False)
|
||||
|
||||
# Adding field 'GeneratedCertificate.key'
|
||||
db.add_column('certificates_generatedcertificate', 'key',
|
||||
self.gf('django.db.models.fields.CharField')(default=False, max_length=32),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
# Changing field 'GeneratedCertificate.grade'
|
||||
db.alter_column('certificates_generatedcertificate', 'grade', self.gf('django.db.models.fields.CharField')(max_length=5))
|
||||
|
||||
# Changing field 'GeneratedCertificate.certificate_id'
|
||||
db.alter_column('certificates_generatedcertificate', 'certificate_id', self.gf('django.db.models.fields.CharField')(max_length=32))
|
||||
|
||||
# Changing field 'GeneratedCertificate.download_url'
|
||||
db.alter_column('certificates_generatedcertificate', 'download_url', self.gf('django.db.models.fields.CharField')(max_length=128))
|
||||
|
||||
# Changing field 'GeneratedCertificate.graded_download_url'
|
||||
db.alter_column('certificates_generatedcertificate', 'graded_download_url', self.gf('django.db.models.fields.CharField')(max_length=128))
|
||||
|
||||
# Changing field 'GeneratedCertificate.graded_certificate_id'
|
||||
db.alter_column('certificates_generatedcertificate', 'graded_certificate_id', self.gf('django.db.models.fields.CharField')(max_length=32))
|
||||
|
||||
def backwards(self, orm):
|
||||
# Adding model 'RevokedCertificate'
|
||||
db.create_table('certificates_revokedcertificate', (
|
||||
('grade', self.gf('django.db.models.fields.CharField')(max_length=5, null=True)),
|
||||
('certificate_id', self.gf('django.db.models.fields.CharField')(default=None, max_length=32, null=True)),
|
||||
('explanation', self.gf('django.db.models.fields.TextField')(blank=True)),
|
||||
('graded_download_url', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
|
||||
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
|
||||
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
|
||||
('name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
|
||||
('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
|
||||
('download_url', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
|
||||
('graded_certificate_id', self.gf('django.db.models.fields.CharField')(default=None, max_length=32, null=True)),
|
||||
))
|
||||
db.send_create_signal('certificates', ['RevokedCertificate'])
|
||||
|
||||
# Adding field 'GeneratedCertificate.name'
|
||||
db.add_column('certificates_generatedcertificate', 'name',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
# Deleting field 'GeneratedCertificate.course_id'
|
||||
db.delete_column('certificates_generatedcertificate', 'course_id')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.key'
|
||||
db.delete_column('certificates_generatedcertificate', 'key')
|
||||
|
||||
|
||||
# Changing field 'GeneratedCertificate.grade'
|
||||
db.alter_column('certificates_generatedcertificate', 'grade', self.gf('django.db.models.fields.CharField')(max_length=5, null=True))
|
||||
|
||||
# Changing field 'GeneratedCertificate.certificate_id'
|
||||
db.alter_column('certificates_generatedcertificate', 'certificate_id', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
|
||||
|
||||
# Changing field 'GeneratedCertificate.download_url'
|
||||
db.alter_column('certificates_generatedcertificate', 'download_url', self.gf('django.db.models.fields.CharField')(max_length=128, null=True))
|
||||
|
||||
# Changing field 'GeneratedCertificate.graded_download_url'
|
||||
db.alter_column('certificates_generatedcertificate', 'graded_download_url', self.gf('django.db.models.fields.CharField')(max_length=128, null=True))
|
||||
|
||||
# Changing field 'GeneratedCertificate.graded_certificate_id'
|
||||
db.alter_column('certificates_generatedcertificate', 'graded_certificate_id', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}),
|
||||
'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
|
||||
'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
|
||||
'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
|
||||
'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
|
||||
'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
|
||||
'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}),
|
||||
'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
|
||||
'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
|
||||
'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
|
||||
'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
|
||||
'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'object_name': 'GeneratedCertificate'},
|
||||
'certificate_id': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '32'}),
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '255'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '128'}),
|
||||
'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '5'}),
|
||||
'graded_certificate_id': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '32'}),
|
||||
'graded_download_url': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '128'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -0,0 +1,95 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting field 'GeneratedCertificate.graded_download_url'
|
||||
db.delete_column('certificates_generatedcertificate', 'graded_download_url')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.graded_certificate_id'
|
||||
db.delete_column('certificates_generatedcertificate', 'graded_certificate_id')
|
||||
|
||||
# Adding field 'GeneratedCertificate.distinction'
|
||||
db.add_column('certificates_generatedcertificate', 'distinction',
|
||||
self.gf('django.db.models.fields.BooleanField')(default=False),
|
||||
keep_default=False)
|
||||
|
||||
# Adding unique constraint on 'GeneratedCertificate', fields ['course_id', 'user']
|
||||
db.create_unique('certificates_generatedcertificate', ['course_id', 'user_id'])
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Removing unique constraint on 'GeneratedCertificate', fields ['course_id', 'user']
|
||||
db.delete_unique('certificates_generatedcertificate', ['course_id', 'user_id'])
|
||||
|
||||
# Adding field 'GeneratedCertificate.graded_download_url'
|
||||
db.add_column('certificates_generatedcertificate', 'graded_download_url',
|
||||
self.gf('django.db.models.fields.CharField')(default=False, max_length=128),
|
||||
keep_default=False)
|
||||
|
||||
# Adding field 'GeneratedCertificate.graded_certificate_id'
|
||||
db.add_column('certificates_generatedcertificate', 'graded_certificate_id',
|
||||
self.gf('django.db.models.fields.CharField')(default=False, max_length=32),
|
||||
keep_default=False)
|
||||
|
||||
# Deleting field 'GeneratedCertificate.distinction'
|
||||
db.delete_column('certificates_generatedcertificate', 'distinction')
|
||||
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'GeneratedCertificate'},
|
||||
'certificate_id': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '32'}),
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '255'}),
|
||||
'distinction': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '128'}),
|
||||
'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '5'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': 'False', 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -0,0 +1,81 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting field 'GeneratedCertificate.enabled'
|
||||
db.delete_column('certificates_generatedcertificate', 'enabled')
|
||||
|
||||
# Adding field 'GeneratedCertificate.status'
|
||||
db.add_column('certificates_generatedcertificate', 'status',
|
||||
self.gf('django.db.models.fields.CharField')(default='unavailable', max_length=32),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Adding field 'GeneratedCertificate.enabled'
|
||||
db.add_column('certificates_generatedcertificate', 'enabled',
|
||||
self.gf('django.db.models.fields.BooleanField')(default=False),
|
||||
keep_default=False)
|
||||
|
||||
# Deleting field 'GeneratedCertificate.status'
|
||||
db.delete_column('certificates_generatedcertificate', 'status')
|
||||
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'GeneratedCertificate'},
|
||||
'certificate_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
|
||||
'distinction': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '5', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'default': "'unavailable'", 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -0,0 +1,90 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting field 'GeneratedCertificate.certificate_id'
|
||||
db.delete_column('certificates_generatedcertificate', 'certificate_id')
|
||||
|
||||
# Adding field 'GeneratedCertificate.verify_uuid'
|
||||
db.add_column('certificates_generatedcertificate', 'verify_uuid',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=32, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
# Adding field 'GeneratedCertificate.download_uuid'
|
||||
db.add_column('certificates_generatedcertificate', 'download_uuid',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=32, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Adding field 'GeneratedCertificate.certificate_id'
|
||||
db.add_column('certificates_generatedcertificate', 'certificate_id',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=32, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
# Deleting field 'GeneratedCertificate.verify_uuid'
|
||||
db.delete_column('certificates_generatedcertificate', 'verify_uuid')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.download_uuid'
|
||||
db.delete_column('certificates_generatedcertificate', 'download_uuid')
|
||||
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'GeneratedCertificate'},
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
|
||||
'distinction': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
|
||||
'download_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '5', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'default': "'unavailable'", 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'verify_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -0,0 +1,93 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Adding field 'GeneratedCertificate.name'
|
||||
db.add_column('certificates_generatedcertificate', 'name',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
# Adding field 'GeneratedCertificate.created_date'
|
||||
db.add_column('certificates_generatedcertificate', 'created_date',
|
||||
self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now, auto_now_add=True, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
# Adding field 'GeneratedCertificate.modified_date'
|
||||
db.add_column('certificates_generatedcertificate', 'modified_date',
|
||||
self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now, auto_now=True, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting field 'GeneratedCertificate.name'
|
||||
db.delete_column('certificates_generatedcertificate', 'name')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.created_date'
|
||||
db.delete_column('certificates_generatedcertificate', 'created_date')
|
||||
|
||||
# Deleting field 'GeneratedCertificate.modified_date'
|
||||
db.delete_column('certificates_generatedcertificate', 'modified_date')
|
||||
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'GeneratedCertificate'},
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
|
||||
'created_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'distinction': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
|
||||
'download_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '5', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'modified_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'default': "'unavailable'", 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'verify_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -0,0 +1,78 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Adding field 'GeneratedCertificate.error_reason'
|
||||
db.add_column('certificates_generatedcertificate', 'error_reason',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=512, blank=True),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting field 'GeneratedCertificate.error_reason'
|
||||
db.delete_column('certificates_generatedcertificate', 'error_reason')
|
||||
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'certificates.generatedcertificate': {
|
||||
'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'GeneratedCertificate'},
|
||||
'course_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
|
||||
'created_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'distinction': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'download_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
|
||||
'download_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'error_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '512', 'blank': 'True'}),
|
||||
'grade': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '5', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'key': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}),
|
||||
'modified_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'auto_now': 'True', 'blank': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
||||
'status': ('django.db.models.fields.CharField', [], {'default': "'unavailable'", 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'verify_uuid': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['certificates']
|
||||
@@ -1,144 +1,108 @@
|
||||
from django.conf import settings as settings
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.db import models
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
'''
|
||||
"""
|
||||
Certificates are created for a student and an offering of a course.
|
||||
|
||||
When a certificate is generated, a unique ID is generated so that
|
||||
the certificate can be verified later. The ID is a UUID4, so that
|
||||
it can't be easily guessed and so that it is unique. Even though
|
||||
we save these generated certificates (for later verification), we
|
||||
also record the UUID so that if we regenerate the certificate it
|
||||
will have the same UUID.
|
||||
it can't be easily guessed and so that it is unique.
|
||||
|
||||
If certificates are being generated on the fly, a GeneratedCertificate
|
||||
should be created with the user, certificate_id, and enabled set
|
||||
when a student requests a certificate. When the certificate has been
|
||||
generated, the download_url should be set.
|
||||
Certificates are generated in batches by a cron job, when a
|
||||
certificate is available for download the GeneratedCertificate
|
||||
table is updated with information that will be displayed
|
||||
on the course overview page.
|
||||
|
||||
Certificates can also be pre-generated. In this case, the user,
|
||||
certificate_id, and download_url are all set before the user does
|
||||
anything. When the user requests the certificate, only enabled
|
||||
needs to be set to true.
|
||||
|
||||
'''
|
||||
State diagram:
|
||||
|
||||
[deleted,error,unavailable] [error,downloadable]
|
||||
+ + +
|
||||
| | |
|
||||
| | |
|
||||
add_cert regen_cert del_cert
|
||||
| | |
|
||||
v v v
|
||||
[generating] [regenerating] [deleting]
|
||||
+ + +
|
||||
| | |
|
||||
certificate certificate certificate
|
||||
created removed,created deleted
|
||||
+----------------+-------------+------->[error]
|
||||
| | |
|
||||
| | |
|
||||
v v v
|
||||
[downloadable] [downloadable] [deleted]
|
||||
|
||||
"""
|
||||
|
||||
|
||||
class CertificateStatuses(object):
|
||||
unavailable = 'unavailable'
|
||||
generating = 'generating'
|
||||
regenerating = 'regenerating'
|
||||
deleting = 'deleting'
|
||||
deleted = 'deleted'
|
||||
downloadable = 'downloadable'
|
||||
notpassing = 'notpassing'
|
||||
error = 'error'
|
||||
|
||||
|
||||
class GeneratedCertificate(models.Model):
|
||||
user = models.ForeignKey(User, db_index=True)
|
||||
# This is the name at the time of request
|
||||
user = models.ForeignKey(User)
|
||||
course_id = models.CharField(max_length=255, blank=True, default='')
|
||||
verify_uuid = models.CharField(max_length=32, blank=True, default='')
|
||||
download_uuid = models.CharField(max_length=32, blank=True, default='')
|
||||
download_url = models.CharField(max_length=128, blank=True, default='')
|
||||
grade = models.CharField(max_length=5, blank=True, default='')
|
||||
key = models.CharField(max_length=32, blank=True, default='')
|
||||
distinction = models.BooleanField(default=False)
|
||||
status = models.CharField(max_length=32, default='unavailable')
|
||||
name = models.CharField(blank=True, max_length=255)
|
||||
created_date = models.DateTimeField(
|
||||
auto_now_add=True, default=datetime.now)
|
||||
modified_date = models.DateTimeField(
|
||||
auto_now=True, default=datetime.now)
|
||||
error_reason = models.CharField(max_length=512, blank=True, default='')
|
||||
|
||||
certificate_id = models.CharField(max_length=32, null=True, default=None)
|
||||
graded_certificate_id = models.CharField(max_length=32, null=True, default=None)
|
||||
|
||||
download_url = models.CharField(max_length=128, null=True)
|
||||
graded_download_url = models.CharField(max_length=128, null=True)
|
||||
|
||||
grade = models.CharField(max_length=5, null=True)
|
||||
|
||||
# enabled should only be true if the student has earned a grade in the course
|
||||
# The student must have a grade and request a certificate for enabled to be True
|
||||
enabled = models.BooleanField(default=False)
|
||||
class Meta:
|
||||
unique_together = (('user', 'course_id'),)
|
||||
|
||||
|
||||
class RevokedCertificate(models.Model):
|
||||
"""
|
||||
This model is for when a GeneratedCertificate must be regenerated. This model
|
||||
contains all the same fields, to store a record of what the GeneratedCertificate
|
||||
was before it was revoked (at which time all of it's information can change when
|
||||
it is regenerated).
|
||||
|
||||
GeneratedCertificate may be deleted once they are revoked, and then created again.
|
||||
For this reason, the only link between a GeneratedCertificate and RevokedCertificate
|
||||
is that they share the same user.
|
||||
"""
|
||||
####-------------------New Fields--------------------####
|
||||
explanation = models.TextField(blank=True)
|
||||
|
||||
####---------Fields from GeneratedCertificate---------####
|
||||
user = models.ForeignKey(User, db_index=True)
|
||||
# This is the name at the time of request
|
||||
name = models.CharField(blank=True, max_length=255)
|
||||
|
||||
certificate_id = models.CharField(max_length=32, null=True, default=None)
|
||||
graded_certificate_id = models.CharField(max_length=32, null=True, default=None)
|
||||
|
||||
download_url = models.CharField(max_length=128, null=True)
|
||||
graded_download_url = models.CharField(max_length=128, null=True)
|
||||
|
||||
grade = models.CharField(max_length=5, null=True)
|
||||
|
||||
enabled = models.BooleanField(default=False)
|
||||
|
||||
|
||||
def revoke_certificate(certificate, explanation):
|
||||
"""
|
||||
This method takes a GeneratedCertificate. It records its information from the certificate
|
||||
into a RevokedCertificate, and then marks the certificate as needing regenerating.
|
||||
When the new certificiate is regenerated it will have new IDs and download URLS.
|
||||
|
||||
Once this method has been called, it is safe to delete the certificate, or modify the
|
||||
certificate's name or grade until it has been generated again.
|
||||
"""
|
||||
revoked = RevokedCertificate(user=certificate.user,
|
||||
name=certificate.name,
|
||||
certificate_id=certificate.certificate_id,
|
||||
graded_certificate_id=certificate.graded_certificate_id,
|
||||
download_url=certificate.download_url,
|
||||
graded_download_url=certificate.graded_download_url,
|
||||
grade=certificate.grade,
|
||||
enabled=certificate.enabled)
|
||||
|
||||
revoked.explanation = explanation
|
||||
|
||||
certificate.certificate_id = None
|
||||
certificate.graded_certificate_id = None
|
||||
certificate.download_url = None
|
||||
certificate.graded_download_url = None
|
||||
|
||||
certificate.save()
|
||||
revoked.save()
|
||||
|
||||
|
||||
def certificate_state_for_student(student, grade):
|
||||
def certificate_status_for_student(student, course_id):
|
||||
'''
|
||||
This returns a dictionary with a key for state, and other information. The state is one of the
|
||||
following:
|
||||
This returns a dictionary with a key for status, and other information.
|
||||
The status is one of the following:
|
||||
|
||||
unavailable - A student is not eligible for a certificate.
|
||||
requestable - A student is eligible to request a certificate
|
||||
generating - A student has requested a certificate, but it is not generated yet.
|
||||
downloadable - The certificate has been requested and is available for download.
|
||||
unavailable - A student is not eligible for a certificate.
|
||||
generating - A request has been made to generate a certificate,
|
||||
but it has not been generated yet.
|
||||
regenerating - A request has been made to regenerate a certificate,
|
||||
but it has not been generated yet.
|
||||
deleting - A request has been made to delete a certificate.
|
||||
|
||||
If the state is "downloadable", the dictionary also contains "download_url" and "graded_download_url".
|
||||
deleted - The certificate has been deleted.
|
||||
downloadable - The certificate is available for download.
|
||||
notpassing - The student was graded but is not passing
|
||||
|
||||
If the status is "downloadable", the dictionary also contains
|
||||
"download_url".
|
||||
|
||||
If the student has been graded, the dictionary also contains their
|
||||
grade for the course.
|
||||
'''
|
||||
|
||||
if grade:
|
||||
#TODO: Remove the following after debugging
|
||||
if settings.DEBUG_SURVEY:
|
||||
return {'state': 'requestable'}
|
||||
try:
|
||||
generated_certificate = GeneratedCertificate.objects.get(
|
||||
user=student, course_id=course_id)
|
||||
d = {'status': generated_certificate.status}
|
||||
if generated_certificate.grade:
|
||||
d['grade'] = generated_certificate.grade
|
||||
if generated_certificate.status == CertificateStatuses.downloadable:
|
||||
d['download_url'] = generated_certificate.download_url
|
||||
|
||||
try:
|
||||
generated_certificate = GeneratedCertificate.objects.get(user=student)
|
||||
if generated_certificate.enabled:
|
||||
if generated_certificate.download_url:
|
||||
return {'state': 'downloadable',
|
||||
'download_url': generated_certificate.download_url,
|
||||
'graded_download_url': generated_certificate.graded_download_url}
|
||||
else:
|
||||
return {'state': 'generating'}
|
||||
else:
|
||||
# If enabled=False, it may have been pre-generated but not yet requested
|
||||
# Our output will be the same as if the GeneratedCertificate did not exist
|
||||
pass
|
||||
except GeneratedCertificate.DoesNotExist:
|
||||
pass
|
||||
return {'state': 'requestable'}
|
||||
else:
|
||||
# No grade, no certificate. No exceptions
|
||||
return {'state': 'unavailable'}
|
||||
return d
|
||||
except GeneratedCertificate.DoesNotExist:
|
||||
pass
|
||||
return {'status': CertificateStatuses.unavailable}
|
||||
|
||||
262
lms/djangoapps/certificates/queue.py
Normal file
262
lms/djangoapps/certificates/queue.py
Normal file
@@ -0,0 +1,262 @@
|
||||
from certificates.models import GeneratedCertificate
|
||||
from certificates.models import certificate_status_for_student
|
||||
from certificates.models import CertificateStatuses as status
|
||||
|
||||
from courseware import grades, courses
|
||||
from django.test.client import RequestFactory
|
||||
from capa.xqueue_interface import XQueueInterface
|
||||
from capa.xqueue_interface import make_xheader, make_hashkey
|
||||
from django.conf import settings
|
||||
from requests.auth import HTTPBasicAuth
|
||||
from student.models import UserProfile
|
||||
|
||||
import json
|
||||
import random
|
||||
import logging
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class XQueueCertInterface(object):
|
||||
"""
|
||||
XQueueCertificateInterface provides an
|
||||
interface to the xqueue server for
|
||||
managing student certificates.
|
||||
|
||||
Instantiating an object will create a new
|
||||
connection to the queue server.
|
||||
|
||||
See models.py for valid state transitions,
|
||||
summary of methods:
|
||||
|
||||
add_cert: Add a new certificate. Puts a single
|
||||
request on the queue for the student/course.
|
||||
Once the certificate is generated a post
|
||||
will be made to the update_certificate
|
||||
view which will save the certificate
|
||||
download URL.
|
||||
|
||||
regen_cert: Regenerate an existing certificate.
|
||||
For a user that already has a certificate
|
||||
this will delete the existing one and
|
||||
generate a new cert.
|
||||
|
||||
|
||||
del_cert: Delete an existing certificate
|
||||
For a user that already has a certificate
|
||||
this will delete his cert.
|
||||
|
||||
"""
|
||||
|
||||
def __init__(self, request=None):
|
||||
|
||||
# Get basic auth (username/password) for
|
||||
# xqueue connection if it's in the settings
|
||||
|
||||
if settings.XQUEUE_INTERFACE.get('basic_auth') is not None:
|
||||
requests_auth = HTTPBasicAuth(
|
||||
*settings.XQUEUE_INTERFACE['basic_auth'])
|
||||
else:
|
||||
requests_auth = None
|
||||
|
||||
if request is None:
|
||||
factory = RequestFactory()
|
||||
self.request = factory.get('/')
|
||||
else:
|
||||
self.request = request
|
||||
|
||||
self.xqueue_interface = XQueueInterface(
|
||||
settings.XQUEUE_INTERFACE['url'],
|
||||
settings.XQUEUE_INTERFACE['django_auth'],
|
||||
requests_auth,
|
||||
)
|
||||
|
||||
def regen_cert(self, student, course_id):
|
||||
"""
|
||||
Arguments:
|
||||
student - User.object
|
||||
course_id - courseenrollment.course_id (string)
|
||||
|
||||
Removes certificate for a student, will change
|
||||
the certificate status to 'regenerating'.
|
||||
|
||||
Certificate must be in the 'error' or 'downloadable' state
|
||||
|
||||
If the student has a passing grade a certificate
|
||||
request will be put on the queue
|
||||
|
||||
If the student is not passing his state will change
|
||||
to status.notpassing
|
||||
|
||||
otherwise it will return the current state
|
||||
|
||||
"""
|
||||
|
||||
VALID_STATUSES = [status.error, status.downloadable]
|
||||
|
||||
cert_status = certificate_status_for_student(
|
||||
student, course_id)['status']
|
||||
|
||||
if cert_status in VALID_STATUSES:
|
||||
# grade the student
|
||||
course = courses.get_course_by_id(course_id)
|
||||
grade = grades.grade(student, self.request, course)
|
||||
|
||||
profile = UserProfile.objects.get(user=student)
|
||||
try:
|
||||
cert = GeneratedCertificate.objects.get(
|
||||
user=student, course_id=course_id)
|
||||
except GeneratedCertificate.DoesNotExist:
|
||||
logger.critical("Attempting to regenerate a certificate"
|
||||
"for a user that doesn't have one")
|
||||
raise
|
||||
|
||||
if grade['grade'] is not None:
|
||||
|
||||
cert.status = status.regenerating
|
||||
cert.name = profile.name
|
||||
|
||||
contents = {
|
||||
'action': 'regen',
|
||||
'delete_verify_uuid': cert.verify_uuid,
|
||||
'delete_download_uuid': cert.download_uuid,
|
||||
'username': cert.user.username,
|
||||
'course_id': cert.course_id,
|
||||
'name': profile.name,
|
||||
}
|
||||
|
||||
key = cert.key
|
||||
self._send_to_xqueue(contents, key)
|
||||
cert.save()
|
||||
|
||||
else:
|
||||
cert.status = status.notpassing
|
||||
cert.name = profile.name
|
||||
cert.save()
|
||||
|
||||
return cert_status
|
||||
|
||||
def del_cert(self, student, course_id):
|
||||
|
||||
"""
|
||||
Arguments:
|
||||
student - User.object
|
||||
course_id - courseenrollment.course_id (string)
|
||||
|
||||
Removes certificate for a student, will change
|
||||
the certificate status to 'deleting'.
|
||||
|
||||
Certificate must be in the 'error' or 'downloadable' state
|
||||
otherwise it will return the current state
|
||||
|
||||
"""
|
||||
|
||||
VALID_STATUSES = [status.error, status.downloadable]
|
||||
|
||||
cert_status = certificate_status_for_student(
|
||||
student, course_id)['status']
|
||||
|
||||
if cert_status in VALID_STATUSES:
|
||||
|
||||
try:
|
||||
cert = GeneratedCertificate.objects.get(
|
||||
user=student, course_id=course_id)
|
||||
except GeneratedCertificate.DoesNotExist:
|
||||
logger.warning("Attempting to delete a certificate"
|
||||
"for a user that doesn't have one")
|
||||
raise
|
||||
|
||||
cert.status = status.deleting
|
||||
|
||||
contents = {
|
||||
'action': 'delete',
|
||||
'delete_verify_uuid': cert.verify_uuid,
|
||||
'delete_download_uuid': cert.download_uuid,
|
||||
'username': cert.user.username,
|
||||
}
|
||||
|
||||
key = cert.key
|
||||
self._send_to_xqueue(contents, key)
|
||||
cert.save()
|
||||
return cert_status
|
||||
|
||||
def add_cert(self, student, course_id):
|
||||
"""
|
||||
|
||||
Arguments:
|
||||
student - User.object
|
||||
course_id - courseenrollment.course_id (string)
|
||||
|
||||
Request a new certificate for a student.
|
||||
Will change the certificate status to 'deleting'.
|
||||
|
||||
Certificate must be in the 'unavailable', 'error',
|
||||
or 'deleted' state.
|
||||
|
||||
If a student has a passing grade a request will made
|
||||
for a new cert
|
||||
|
||||
If a student does not have a passing grade the status
|
||||
will change to status.notpassing
|
||||
|
||||
Returns the student's status
|
||||
|
||||
"""
|
||||
|
||||
VALID_STATUSES = [status.unavailable, status.deleted, status.error,
|
||||
status.notpassing]
|
||||
|
||||
cert_status = certificate_status_for_student(
|
||||
student, course_id)['status']
|
||||
|
||||
if cert_status in VALID_STATUSES:
|
||||
# grade the student
|
||||
course = courses.get_course_by_id(course_id)
|
||||
grade = grades.grade(student, self.request, course)
|
||||
profile = UserProfile.objects.get(user=student)
|
||||
cert, created = GeneratedCertificate.objects.get_or_create(
|
||||
user=student, course_id=course_id)
|
||||
|
||||
if grade['grade'] is not None:
|
||||
cert_status = status.generating
|
||||
key = make_hashkey(random.random())
|
||||
|
||||
cert.status = cert_status
|
||||
cert.grade = grade['percent']
|
||||
cert.user = student
|
||||
cert.course_id = course_id
|
||||
cert.key = key
|
||||
cert.name = profile.name
|
||||
|
||||
contents = {
|
||||
'action': 'create',
|
||||
'username': student.username,
|
||||
'course_id': course_id,
|
||||
'name': profile.name,
|
||||
}
|
||||
|
||||
self._send_to_xqueue(contents, key)
|
||||
cert.save()
|
||||
else:
|
||||
cert_status = status.notpassing
|
||||
|
||||
cert.status = cert_status
|
||||
cert.user = student
|
||||
cert.course_id = course_id
|
||||
cert.name = profile.name
|
||||
cert.save()
|
||||
|
||||
return cert_status
|
||||
|
||||
def _send_to_xqueue(self, contents, key):
|
||||
|
||||
xheader = make_xheader(
|
||||
'https://{0}/update_certificate?{1}'.format(
|
||||
settings.SITE_NAME, key), key, settings.CERT_QUEUE)
|
||||
|
||||
(error, msg) = self.xqueue_interface.send_to_queue(
|
||||
header=xheader, body=json.dumps(contents))
|
||||
if error:
|
||||
logger.critical('Unable to add a request to the queue')
|
||||
raise Exception('Unable to send queue message')
|
||||
@@ -1,146 +1,77 @@
|
||||
import json
|
||||
import logging
|
||||
import uuid
|
||||
from certificates.models import GeneratedCertificate
|
||||
from certificates.models import CertificateStatuses as status
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.http import HttpResponse
|
||||
import json
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.mail import send_mail
|
||||
from django.http import Http404, HttpResponse
|
||||
from django.shortcuts import redirect
|
||||
|
||||
import courseware.grades as grades
|
||||
from certificates.models import GeneratedCertificate, certificate_state_for_student, revoke_certificate
|
||||
from mitxmako.shortcuts import render_to_response, render_to_string
|
||||
from student.models import UserProfile
|
||||
#TODO: Finish migrating these changes from stable
|
||||
# from student.survey_questions import exit_survey_list_for_student
|
||||
# from student.views import student_took_survey, record_exit_survey
|
||||
|
||||
log = logging.getLogger("mitx.certificates")
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@login_required
|
||||
def certificate_request(request):
|
||||
''' Attempt to send a certificate. '''
|
||||
if not settings.END_COURSE_ENABLED:
|
||||
raise Http404
|
||||
@csrf_exempt
|
||||
def update_certificate(request):
|
||||
"""
|
||||
Will update GeneratedCertificate for a new certificate or
|
||||
modify an existing certificate entry.
|
||||
|
||||
See models.py for a state diagram of certificate states
|
||||
|
||||
This view should only ever be accessed by the xqueue server
|
||||
"""
|
||||
|
||||
if request.method == "POST":
|
||||
honor_code_verify = request.POST.get('cert_request_honor_code_verify', 'false')
|
||||
name_verify = request.POST.get('cert_request_name_verify', 'false')
|
||||
id_verify = request.POST.get('cert_request_id_verify', 'false')
|
||||
error = ''
|
||||
|
||||
def return_error(error):
|
||||
return HttpResponse(json.dumps({'success': False,
|
||||
'error': error}))
|
||||
|
||||
if honor_code_verify != 'true':
|
||||
error += 'Please verify that you have followed the honor code to receive a certificate. '
|
||||
|
||||
if name_verify != 'true':
|
||||
error += 'Please verify that your name is correct to receive a certificate. '
|
||||
|
||||
if id_verify != 'true':
|
||||
error += 'Please certify that you understand the unique ID on the certificate. '
|
||||
|
||||
if len(error) > 0:
|
||||
return return_error(error)
|
||||
|
||||
survey_response = record_exit_survey(request, internal_request=True)
|
||||
if not survey_response['success']:
|
||||
return return_error(survey_response['error'])
|
||||
|
||||
grade = None
|
||||
student_gradesheet = grades.grade(request.user, request, course)
|
||||
grade = student_gradesheet['grade']
|
||||
|
||||
if not grade:
|
||||
return return_error('You have not earned a grade in this course. ')
|
||||
|
||||
generate_certificate(request.user, grade)
|
||||
|
||||
return HttpResponse(json.dumps({'success': True}))
|
||||
|
||||
else:
|
||||
#This is not a POST, we should render the page with the form
|
||||
|
||||
student_gradesheet = grades.grade(request.user, request, course)
|
||||
certificate_state = certificate_state_for_student(request.user, grade_sheet['grade'])
|
||||
|
||||
if certificate_state['state'] != "requestable":
|
||||
return redirect("/profile")
|
||||
|
||||
user_info = UserProfile.objects.get(user=request.user)
|
||||
|
||||
took_survey = student_took_survey(user_info)
|
||||
if settings.DEBUG_SURVEY:
|
||||
took_survey = False
|
||||
survey_list = []
|
||||
if not took_survey:
|
||||
survey_list = exit_survey_list_for_student(request.user)
|
||||
|
||||
context = {'certificate_state': certificate_state,
|
||||
'took_survey': took_survey,
|
||||
'survey_list': survey_list,
|
||||
'name': user_info.name}
|
||||
|
||||
return render_to_response('cert_request.html', context)
|
||||
|
||||
|
||||
# This method should only be called if the user has a grade and has requested a certificate
|
||||
def generate_certificate(user, grade):
|
||||
# Make sure to see the comments in models.GeneratedCertificate to read about the valid
|
||||
# states for a GeneratedCertificate object
|
||||
if grade and user.is_active:
|
||||
generated_certificate = None
|
||||
xqueue_body = json.loads(request.POST.get('xqueue_body'))
|
||||
xqueue_header = json.loads(request.POST.get('xqueue_header'))
|
||||
|
||||
try:
|
||||
generated_certificate = GeneratedCertificate.objects.get(user=user)
|
||||
cert = GeneratedCertificate.objects.get(
|
||||
user__username=xqueue_body['username'],
|
||||
course_id=xqueue_body['course_id'],
|
||||
key=xqueue_header['lms_key'])
|
||||
|
||||
except GeneratedCertificate.DoesNotExist:
|
||||
generated_certificate = GeneratedCertificate(user=user)
|
||||
logger.critical('Unable to lookup certificate\n'
|
||||
'xqueue_body: {0}\n'
|
||||
'xqueue_header: {1}'.format(
|
||||
xqueue_body, xqueue_header))
|
||||
|
||||
generated_certificate.enabled = True
|
||||
if generated_certificate.graded_download_url and (generated_certificate.grade != grade):
|
||||
log.critical(u"A graded certificate has been pre-generated with the grade "
|
||||
"of {gen_grade} but requested by user id {userid} with grade "
|
||||
"{req_grade}! The download URLs were {graded_dl_url} and "
|
||||
"{ungraded_dl_url}".format(
|
||||
gen_grade=generated_certificate.grade,
|
||||
req_grade=grade,
|
||||
graded_dl_url=generated_certificate.graded_download_url,
|
||||
ungraded_dl_url=generated_certificate.download_url,
|
||||
userid=user.id))
|
||||
revoke_certificate(generated_certificate, "The grade on this certificate may be inaccurate.")
|
||||
return HttpResponse(json.dumps({
|
||||
'return_code': 1,
|
||||
'content': 'unable to lookup key'}),
|
||||
mimetype='application/json')
|
||||
|
||||
user_name = UserProfile.objects.get(user=user).name
|
||||
if generated_certificate.download_url and (generated_certificate.name != user_name):
|
||||
log.critical(u"A Certificate has been pre-generated with the name of "
|
||||
"{gen_name} but current name is {user_name} (user id is "
|
||||
"{userid})! The download URLs were {graded_dl_url} and "
|
||||
"{ungraded_dl_url}".format(
|
||||
gen_name=generated_certificate.name.encode('utf-8'),
|
||||
user_name=user_name.encode('utf-8'),
|
||||
graded_dl_url=generated_certificate.graded_download_url,
|
||||
ungraded_dl_url=generated_certificate.download_url,
|
||||
userid=user.id))
|
||||
revoke_certificate(generated_certificate, "The name on this certificate may be inaccurate.")
|
||||
if 'error' in xqueue_body:
|
||||
cert.status = status.error
|
||||
if 'error_reason' in xqueue_body:
|
||||
|
||||
generated_certificate.grade = grade
|
||||
generated_certificate.name = user_name
|
||||
generated_certificate.save()
|
||||
# Hopefully we will record a meaningful error
|
||||
# here if something bad happened during the
|
||||
# certificate generation process
|
||||
#
|
||||
# example:
|
||||
# (aamorm BerkeleyX/CS169.1x/2012_Fall)
|
||||
# <class 'simples3.bucket.S3Error'>:
|
||||
# HTTP error (reason=error(32, 'Broken pipe'), filename=None) :
|
||||
# certificate_agent.py:175
|
||||
|
||||
certificate_id = generated_certificate.certificate_id
|
||||
|
||||
log.debug("Generating certificate for " + str(user.username) + " with ID: " + str(certificate_id))
|
||||
|
||||
# TODO: If the certificate was pre-generated, send the email that it is ready to download
|
||||
if certificate_state_for_student(user, grade)['state'] == "downloadable":
|
||||
subject = render_to_string('emails/certificate_ready_subject.txt', {})
|
||||
subject = ''.join(subject.splitlines())
|
||||
message = render_to_string('emails/certificate_ready.txt', {})
|
||||
|
||||
res = send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email, ])
|
||||
|
||||
else:
|
||||
log.warning("Asked to generate a certificate for student " + str(user.username) + " but with a grade of " + str(grade) + " and active status " + str(user.is_active))
|
||||
cert.error_reason = xqueue_body['error_reason']
|
||||
else:
|
||||
if cert.status in [status.generating, status.regenerating]:
|
||||
cert.download_uuid = xqueue_body['download_uuid']
|
||||
cert.verify_uuid = xqueue_body['verify_uuid']
|
||||
cert.download_url = xqueue_body['url']
|
||||
cert.status = status.downloadable
|
||||
elif cert.status in [status.deleting]:
|
||||
cert.status = status.deleted
|
||||
else:
|
||||
logger.critical('Invalid state for cert update: {0}'.format(
|
||||
cert.status))
|
||||
return HttpResponse(json.dumps({
|
||||
'return_code': 1,
|
||||
'content': 'invalid cert status'}),
|
||||
mimetype='application/json')
|
||||
cert.save()
|
||||
return HttpResponse(json.dumps({'return_code': 0}),
|
||||
mimetype='application/json')
|
||||
|
||||
@@ -22,7 +22,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
|
||||
# Disable askbot, enable Berkeley forums
|
||||
MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
|
||||
|
||||
# IMPORTANT: With this enabled, the server must always be behind a proxy that
|
||||
# IMPORTANT: With this enabled, the server must always be behind a proxy that
|
||||
# strips the header HTTP_X_FORWARDED_PROTO from client requests. Otherwise,
|
||||
# a user can fool our server into thinking it was an https connection.
|
||||
# See https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
|
||||
@@ -61,6 +61,7 @@ SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
|
||||
VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
|
||||
COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL",'')
|
||||
COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY",'')
|
||||
CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
|
||||
|
||||
############################## SECURE AUTH ITEMS ###############################
|
||||
# Secret things: passwords, access keys, etc.
|
||||
|
||||
@@ -26,7 +26,6 @@ $sidebar-color: #f6f6f6;
|
||||
$outer-border-color: #aaa;
|
||||
|
||||
// old variables
|
||||
|
||||
$light-gray: #ddd;
|
||||
$dark-gray: #333;
|
||||
$text-color: $dark-gray;
|
||||
|
||||
@@ -132,7 +132,7 @@ img {
|
||||
}
|
||||
|
||||
.site-status {
|
||||
display: block;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.toast-notification {
|
||||
|
||||
@@ -215,3 +215,36 @@ div.course-wrapper {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.xmodule_VideoModule {
|
||||
margin-bottom: 30px;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
section.self-assessment {
|
||||
textarea.answer {
|
||||
height: 200px;
|
||||
padding: 5px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
textarea.hint {
|
||||
height: 100px;
|
||||
padding: 5px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
div {
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.error {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,6 +179,7 @@
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
width: flex-grid(12);
|
||||
z-index: 20;
|
||||
@include transition(all, 0.15s, linear);
|
||||
|
||||
&:last-child {
|
||||
@@ -318,6 +319,19 @@
|
||||
}
|
||||
}
|
||||
|
||||
.course-status-completed {
|
||||
background: #ccc;
|
||||
color: #fff;
|
||||
|
||||
p {
|
||||
color: #222;
|
||||
|
||||
span {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.enter-course {
|
||||
@include button(shiny, $blue);
|
||||
@include box-sizing(border-box);
|
||||
@@ -357,10 +371,113 @@
|
||||
border-color: darken(rgb(200,200,200), 3%);
|
||||
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
|
||||
}
|
||||
|
||||
.course-status-completed {
|
||||
background: #888;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.message-status {
|
||||
@include border-radius(3px);
|
||||
@include box-shadow(0 1px 4px 0 rgba(0,0,0, 0.1), inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
|
||||
display: none;
|
||||
position: relative;
|
||||
top: -15px;
|
||||
z-index: 10;
|
||||
margin: 0 0 20px 0;
|
||||
padding: 15px 20px;
|
||||
font-family: "Open Sans", Verdana, Geneva, sans-serif;
|
||||
background: #fffcf0;
|
||||
border: 1px solid #ccc;
|
||||
|
||||
.message-copy {
|
||||
margin: 0;
|
||||
|
||||
.grade-value {
|
||||
font-size: 1.4rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.actions {
|
||||
@include clearfix;
|
||||
list-style: none;
|
||||
margin: 15px 0 0 0;
|
||||
padding: 0;
|
||||
|
||||
.action {
|
||||
float: left;
|
||||
margin:0 15px 10px 0;
|
||||
|
||||
.btn, .cta {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.btn {
|
||||
@include button(shiny, $blue);
|
||||
@include box-sizing(border-box);
|
||||
@include border-radius(3px);
|
||||
float: left;
|
||||
font: normal 0.8rem/1.2rem $sans-serif;
|
||||
letter-spacing: 1px;
|
||||
padding: 6px 12px;
|
||||
text-align: center;
|
||||
|
||||
&.disabled {
|
||||
@include button(shiny, #eee);
|
||||
cursor: default !important;
|
||||
|
||||
&:hover {
|
||||
background: #eee;
|
||||
background-image: -webkit-linear-gradient(top, #EEE 0%, #C2C2C2 50%, #ABABAB 50%, #B0B0B0 100%);
|
||||
background-image: -moz-linear-gradient(top, #EEE 0%, #C2C2C2 50%, #ABABAB 50%, #B0B0B0 100%);
|
||||
background-image: -ms-linear-gradient(top, #EEE 0%, #C2C2C2 50%, #ABABAB 50%, #B0B0B0 100%);
|
||||
background-image: -o-linear-gradient(top, #EEE 0%, #C2C2C2 50%, #ABABAB 50%, #B0B0B0 100%);
|
||||
background-image: linear-gradient(top, #EEE 0%, #C2C2C2 50%, #ABABAB 50%, #B0B0B0 100%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cta {
|
||||
@include button(shiny, #666);
|
||||
float: left;
|
||||
font: normal 0.8rem/1.2rem $sans-serif;
|
||||
letter-spacing: 1px;
|
||||
padding: 6px 12px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.is-shown {
|
||||
display: block;
|
||||
}
|
||||
|
||||
&.course-status-processing {
|
||||
|
||||
}
|
||||
|
||||
&.course-status-certnotavailable {
|
||||
// background: #fee8d6;
|
||||
}
|
||||
|
||||
&.course-status-certrendering {
|
||||
// background: #d9e7db;
|
||||
|
||||
.cta {
|
||||
margin-top: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
&.course-status-certavailable {
|
||||
// background: #d9e7db;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
a.unenroll {
|
||||
float: right;
|
||||
font-style: italic;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
from django.core.urlresolvers import reverse
|
||||
from courseware.courses import course_image_url, get_course_about_section
|
||||
from courseware.access import has_access
|
||||
from certificates.models import CertificateStatuses
|
||||
%>
|
||||
<%inherit file="main.html" />
|
||||
|
||||
@@ -135,8 +136,16 @@
|
||||
<h2 class="university">${get_course_about_section(course, 'university')}</h2>
|
||||
<h3>${course.number} ${course.title}</h3>
|
||||
</hgroup>
|
||||
<section class="course-status">
|
||||
<p>Class Starts - <span>${course.start_date_text}</span></p>
|
||||
<section class="course-status course-status-completed">
|
||||
<p>
|
||||
% if course.has_ended():
|
||||
Course Completed - <span>${course.end_date_text}</span>
|
||||
% elif course.has_started():
|
||||
Course Started - <span>${course.start_date_text}</span>
|
||||
% else: # hasn't started yet
|
||||
Course Starts - <span>${course.start_date_text}</span>
|
||||
% endif
|
||||
</p>
|
||||
</section>
|
||||
% if course.id in show_courseware_links_for:
|
||||
<p class="enter-course">View Courseware</p>
|
||||
@@ -144,6 +153,68 @@
|
||||
</section>
|
||||
</a>
|
||||
</article>
|
||||
|
||||
<%
|
||||
cert_status = cert_statuses.get(course.id)
|
||||
%>
|
||||
% if course.has_ended() and cert_status:
|
||||
<%
|
||||
passing_grade = False
|
||||
cert_button = False
|
||||
survey_button = False
|
||||
if cert_status['status'] in [CertificateStatuses.generating, CertificateStatuses.regenerating]:
|
||||
status_css_class = 'course-status-certrendering'
|
||||
cert_button = True
|
||||
survey_button = True
|
||||
passing_grade = True
|
||||
elif cert_status['status'] == CertificateStatuses.downloadable:
|
||||
status_css_class = 'course-status-certavailable'
|
||||
cert_button = True
|
||||
survey_button = True
|
||||
passing_grade = True
|
||||
elif cert_status['status'] == CertificateStatuses.notpassing:
|
||||
status_css_class = 'course-status-certnotavailable'
|
||||
survey_button = True
|
||||
else:
|
||||
# This is primarily the 'unavailable' state, but also 'error', 'deleted', etc.
|
||||
status_css_class = 'course-status-processing'
|
||||
|
||||
if survey_button and not course.end_of_course_survey_url:
|
||||
survey_button = False
|
||||
%>
|
||||
<div class="message message-status ${status_css_class} is-shown">
|
||||
|
||||
% if cert_status['status'] == CertificateStatuses.unavailable:
|
||||
<p class="message-copy">Final course details are being wrapped up at this time.
|
||||
Your final standing will be available shortly.</p>
|
||||
% elif passing_grade:
|
||||
<p class="message-copy">You have received a grade of
|
||||
<span class="grade-value">${cert_status['grade']}</span>
|
||||
in this course.</p>
|
||||
% elif cert_status['status'] == CertificateStatuses.notpassing:
|
||||
<p class="message-copy">You did not complete the necessary requirements for completion of this course.
|
||||
</p>
|
||||
% endif
|
||||
% if cert_button or survey_button:
|
||||
<ul class="actions">
|
||||
% if cert_button and cert_status['status'] in [CertificateStatuses.generating, CertificateStatuses.regenerating]:
|
||||
<li class="action"><span class="btn disabled" href="">Your Certificate is Generating</span></li>
|
||||
% elif cert_button and cert_status['status'] == CertificateStatuses.downloadable:
|
||||
<li class="action">
|
||||
<a class="btn" href="${cert_status['download_url']}"
|
||||
title="This link will open/download a PDF document">
|
||||
Download Your PDF Certificate</a></li>
|
||||
% endif
|
||||
% if survey_button:
|
||||
<li class="action"><a class="cta" href="${course.end_of_course_survey_url}">
|
||||
Complete our course feedback survey</a></li>
|
||||
% endif
|
||||
</ul>
|
||||
% endif
|
||||
</div>
|
||||
|
||||
% endif
|
||||
|
||||
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
|
||||
|
||||
% endfor
|
||||
@@ -280,4 +351,3 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<%static:css group='ie-fixes'/>
|
||||
<![endif]-->
|
||||
<meta name="path_prefix" content="${MITX_ROOT_URL}">
|
||||
<meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
|
||||
|
||||
% if not course:
|
||||
<%include file="google_analytics.html" />
|
||||
|
||||
7
lms/templates/self_assessment_hint.html
Normal file
7
lms/templates/self_assessment_hint.html
Normal file
@@ -0,0 +1,7 @@
|
||||
<div class="hint">
|
||||
<div class="hint-prompt">
|
||||
${hint_prompt}
|
||||
</div>
|
||||
<textarea name="hint" class="hint" cols="70" rows="5"
|
||||
${'readonly="true"' if read_only else ''}>${hint}</textarea>
|
||||
</div>
|
||||
20
lms/templates/self_assessment_prompt.html
Normal file
20
lms/templates/self_assessment_prompt.html
Normal file
@@ -0,0 +1,20 @@
|
||||
<section id="self_assessment_${id}" class="self-assessment" data-ajax-url="${ajax_url}"
|
||||
data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}">
|
||||
<div class="error"></div>
|
||||
<div class="prompt">
|
||||
${prompt}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<textarea name="answer" class="answer" cols="70" rows="20">${previous_answer|h}</textarea>
|
||||
</div>
|
||||
|
||||
<div class="rubric-wrapper">${initial_rubric}</div>
|
||||
|
||||
<div class="hint-wrapper">${initial_hint}</div>
|
||||
|
||||
<div class="message-wrapper">${initial_message}</div>
|
||||
|
||||
<input type="button" value="Submit" class="submit-button" name="show"/>
|
||||
<input type="button" value="Reset" class="reset-button" name="reset"/>
|
||||
</section>
|
||||
15
lms/templates/self_assessment_rubric.html
Normal file
15
lms/templates/self_assessment_rubric.html
Normal file
@@ -0,0 +1,15 @@
|
||||
<div class="assessment">
|
||||
<div class="rubric">
|
||||
<h3>Self-assess your answer with this rubric:</h3>
|
||||
${rubric}
|
||||
</div>
|
||||
|
||||
% if not read_only:
|
||||
<select name="assessment" class="assessment">
|
||||
%for i in xrange(0,max_score+1):
|
||||
<option value="${i}">${i}</option>
|
||||
%endfor
|
||||
</select>
|
||||
% endif
|
||||
|
||||
</div>
|
||||
@@ -10,6 +10,9 @@ if settings.DEBUG:
|
||||
admin.autodiscover()
|
||||
|
||||
urlpatterns = ('',
|
||||
# certificate view
|
||||
|
||||
url(r'^update_certificate$', 'certificates.views.update_certificate'),
|
||||
url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware
|
||||
url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user