diff --git a/auth/models.py b/auth/models.py deleted file mode 100644 index 05a9d3028f..0000000000 --- a/auth/models.py +++ /dev/null @@ -1,43 +0,0 @@ -import uuid - -from django.db import models -from django.contrib.auth.models import User - -class UserProfile(models.Model): - ## CRITICAL TODO/SECURITY - # Sanitize all fields. - # This is not visible to other users, but could introduce holes later - user = models.ForeignKey(User, unique=True, db_index=True) - name = models.TextField(blank=True) - language = models.TextField(blank=True) - location = models.TextField(blank=True) - meta = models.TextField(blank=True) # JSON dictionary for future expansion - courseware = models.TextField(blank=True, default='course.xml') - -# class UserTestGroup(models.Model): -# ''' Group used for user tests. -# E.g. groupname = 'metacognition' and groupsection = ['A','B'] -# ''' -# groupname = models.TextField(blank=True) -# groupsection = models.TextField(blank=True) -# user = models.ManyToManyField(User) - -class Registration(models.Model): - ''' Allows us to wait for e-mail before user is registered. A - registration profile is created when the user creates an - account, but that account is inactive. Once the user clicks - on the activation key, it becomes active. ''' - user = models.ForeignKey(User, unique=True) - activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True) - - def register(self, user): - # MINOR TODO: Switch to crypto-secure key - self.activation_key=uuid.uuid4().hex - self.user=user - self.save() - - def activate(self): - self.user.is_active = True - self.user.save() - self.delete() - diff --git a/auth/views.py b/auth/views.py index 8336afa65b..655a0a8634 100644 --- a/auth/views.py +++ b/auth/views.py @@ -13,7 +13,7 @@ from django.db import connection from django.http import HttpResponse, Http404 from django.shortcuts import redirect from mitxmako.shortcuts import render_to_response, render_to_string -from models import Registration, UserProfile +from courseware.models import Registration, UserProfile log = logging.getLogger("mitx.auth") diff --git a/courseware/capa/capa_problem.py b/courseware/capa/capa_problem.py index b7ac8940fe..032b5d41b4 100644 --- a/courseware/capa/capa_problem.py +++ b/courseware/capa/capa_problem.py @@ -1,4 +1,5 @@ import copy +import logging import math import numpy import os @@ -19,6 +20,8 @@ from responsetypes import numericalresponse, formularesponse, customresponse, sc import calc import eia +log = logging.getLogger("mitx.courseware") + response_types = {'numericalresponse':numericalresponse, 'formularesponse':formularesponse, 'customresponse':customresponse, @@ -80,6 +83,7 @@ class LoncapaProblem(object): self.seed=struct.unpack('i', os.urandom(4))[0] ## Parse XML file + log.debug(u"LoncapaProblem() opening file {0}".format(filename)) file_text = open(filename).read() # Convert startouttext and endouttext to proper # TODO: Do with XML operations diff --git a/courseware/content_parser.py b/courseware/content_parser.py index ed0489f7f4..6203953fa4 100644 --- a/courseware/content_parser.py +++ b/courseware/content_parser.py @@ -7,7 +7,7 @@ from mako.lookup import TemplateLookup try: # This lets us do __name__ == ='__main__' from django.conf import settings - from auth.models import UserProfile + from models import UserProfile except: settings = None diff --git a/courseware/migrations/0001_initial.py b/courseware/migrations/0001_initial.py new file mode 100644 index 0000000000..77e50322e0 --- /dev/null +++ b/courseware/migrations/0001_initial.py @@ -0,0 +1,154 @@ +# encoding: 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 model 'StudentModule' + db.create_table('courseware_studentmodule', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('module_type', self.gf('django.db.models.fields.CharField')(default='problem', max_length=32)), + ('module_id', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('state', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), + ('grade', self.gf('django.db.models.fields.FloatField')(null=True, blank=True)), + ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + )) + db.send_create_signal('courseware', ['StudentModule']) + + # Adding unique constraint on 'StudentModule', fields ['student', 'module_id', 'module_type'] + db.create_unique('courseware_studentmodule', ['student_id', 'module_id', 'module_type']) + + # Adding model 'UserProfile' + db.create_table('auth_userprofile', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)), + ('name', self.gf('django.db.models.fields.TextField')(blank=True)), + ('language', self.gf('django.db.models.fields.TextField')(blank=True)), + ('location', self.gf('django.db.models.fields.TextField')(blank=True)), + ('meta', self.gf('django.db.models.fields.TextField')(blank=True)), + ('courseware', self.gf('django.db.models.fields.TextField')(default='course.xml', blank=True)), + )) + db.send_create_signal('courseware', ['UserProfile']) + + # Adding model 'Registration' + db.create_table('auth_registration', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)), + ('activation_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=32, db_index=True)), + )) + db.send_create_signal('courseware', ['Registration']) + + + def backwards(self, orm): + + # Removing unique constraint on 'StudentModule', fields ['student', 'module_id', 'module_type'] + db.delete_unique('courseware_studentmodule', ['student_id', 'module_id', 'module_type']) + + # Deleting model 'StudentModule' + db.delete_table('courseware_studentmodule') + + # Deleting model 'UserProfile' + db.delete_table('auth_userprofile') + + # Deleting model 'Registration' + db.delete_table('auth_registration') + + + 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'}) + }, + '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'}) + }, + 'courseware.registration': { + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'courseware.studentmodule': { + 'Meta': {'unique_together': "(('student', 'module_id', 'module_type'),)", 'object_name': 'StudentModule'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'module_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32'}), + 'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'courseware.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"}, + 'courseware': ('django.db.models.fields.TextField', [], {'default': "'course.xml'", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['courseware'] diff --git a/courseware/migrations/0002_add_indexes.py b/courseware/migrations/0002_add_indexes.py new file mode 100644 index 0000000000..94fb6972c8 --- /dev/null +++ b/courseware/migrations/0002_add_indexes.py @@ -0,0 +1,154 @@ +# encoding: 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 index on 'StudentModule', fields ['created'] + db.create_index('courseware_studentmodule', ['created']) + + # Adding index on 'StudentModule', fields ['grade'] + db.create_index('courseware_studentmodule', ['grade']) + + # Adding index on 'StudentModule', fields ['modified'] + db.create_index('courseware_studentmodule', ['modified']) + + # Adding index on 'StudentModule', fields ['module_type'] + db.create_index('courseware_studentmodule', ['module_type']) + + # Adding index on 'StudentModule', fields ['module_id'] + db.create_index('courseware_studentmodule', ['module_id']) + + # Adding index on 'UserProfile', fields ['name'] + db.create_index('auth_userprofile', ['name']) + + # Adding index on 'UserProfile', fields ['language'] + db.create_index('auth_userprofile', ['language']) + + # Adding index on 'UserProfile', fields ['location'] + db.create_index('auth_userprofile', ['location']) + + + def backwards(self, orm): + + # Removing index on 'UserProfile', fields ['location'] + db.delete_index('auth_userprofile', ['location']) + + # Removing index on 'UserProfile', fields ['language'] + db.delete_index('auth_userprofile', ['language']) + + # Removing index on 'UserProfile', fields ['name'] + db.delete_index('auth_userprofile', ['name']) + + # Removing index on 'StudentModule', fields ['module_id'] + db.delete_index('courseware_studentmodule', ['module_id']) + + # Removing index on 'StudentModule', fields ['module_type'] + db.delete_index('courseware_studentmodule', ['module_type']) + + # Removing index on 'StudentModule', fields ['modified'] + db.delete_index('courseware_studentmodule', ['modified']) + + # Removing index on 'StudentModule', fields ['grade'] + db.delete_index('courseware_studentmodule', ['grade']) + + # Removing index on 'StudentModule', fields ['created'] + db.delete_index('courseware_studentmodule', ['created']) + + + 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'}) + }, + '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'}) + }, + 'courseware.registration': { + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'courseware.studentmodule': { + 'Meta': {'unique_together': "(('student', 'module_id', 'module_type'),)", 'object_name': 'StudentModule'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'module_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}), + 'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'courseware.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"}, + 'courseware': ('django.db.models.fields.TextField', [], {'default': "'course.xml'", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}), + 'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['courseware'] diff --git a/courseware/migrations/__init__.py b/courseware/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/courseware/models.py b/courseware/models.py index 5c706f10a8..fd88bea16c 100644 --- a/courseware/models.py +++ b/courseware/models.py @@ -1,3 +1,16 @@ +""" +WE'RE USING MIGRATIONS! + +If you make changes to this model, be sure to create an appropriate migration +file and check it in at the same time as your model changes. To do that, + +1. Go to the mitx dir +2. ./manage.py schemamigration courseware --auto description_of_your_change +3. Add the migration file created in mitx/courseware/migrations/ + +""" +import uuid + from django.db import models from django.contrib.auth.models import User @@ -9,9 +22,9 @@ class StudentModule(models.Model): ('html','html'), ) ## These three are the key for the object - module_type = models.CharField(max_length=32, choices=MODULE_TYPES, default='problem') - module_id = models.CharField(max_length=255) # Filename for homeworks, etc. - student = models.ForeignKey(User) + module_type = models.CharField(max_length=32, choices=MODULE_TYPES, default='problem', db_index=True) + module_id = models.CharField(max_length=255, db_index=True) # Filename for homeworks, etc. + student = models.ForeignKey(User, db_index=True) class Meta: unique_together = (('student', 'module_id', 'module_type'),) @@ -19,7 +32,7 @@ class StudentModule(models.Model): state = models.TextField(null=True, blank=True) ## Grade, and are we done? - grade = models.FloatField(null=True, blank=True) + grade = models.FloatField(null=True, blank=True, db_index=True) #max_grade = models.FloatField(null=True, blank=True) # DONE_TYPES = (('done','DONE'), # Finished @@ -27,8 +40,47 @@ class StudentModule(models.Model): # ('na','NA')) # Not applicable (e.g. vertical) # done = models.CharField(max_length=16, choices=DONE_TYPES) - created = models.DateTimeField(auto_now_add=True) - modified = models.DateTimeField(auto_now=True) + created = models.DateTimeField(auto_now_add=True, db_index=True) + modified = models.DateTimeField(auto_now=True, db_index=True) def __unicode__(self): return self.module_type+'/'+self.student.username+"/"+self.module_id+'/'+str(self.state)[:20] + + +class UserProfile(models.Model): + class Meta: + db_table = "auth_userprofile" + + ## CRITICAL TODO/SECURITY + # Sanitize all fields. + # This is not visible to other users, but could introduce holes later + user = models.ForeignKey(User, unique=True, db_index=True) + name = models.TextField(blank=True, db_index=True) + language = models.TextField(blank=True, db_index=True) + location = models.TextField(blank=True, db_index=True) + meta = models.TextField(blank=True) # JSON dictionary for future expansion + courseware = models.TextField(blank=True, default='course.xml') + + +class Registration(models.Model): + ''' Allows us to wait for e-mail before user is registered. A + registration profile is created when the user creates an + account, but that account is inactive. Once the user clicks + on the activation key, it becomes active. ''' + class Meta: + db_table = "auth_registration" + + user = models.ForeignKey(User, unique=True) + activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True) + + def register(self, user): + # MINOR TODO: Switch to crypto-secure key + self.activation_key=uuid.uuid4().hex + self.user=user + self.save() + + def activate(self): + self.user.is_active = True + self.user.save() + self.delete() + diff --git a/courseware/module_render.py b/courseware/module_render.py index 6aa407bf80..85ece0f9cc 100644 --- a/courseware/module_render.py +++ b/courseware/module_render.py @@ -19,8 +19,7 @@ from django.template import Context from django.template import Context, loader from mitxmako.shortcuts import render_to_response, render_to_string -from auth.models import UserProfile -from models import StudentModule +from models import StudentModule, UserProfile import track.views import courseware.content_parser as content_parser diff --git a/courseware/views.py b/courseware/views.py index f7035975df..ffcac16951 100644 --- a/courseware/views.py +++ b/courseware/views.py @@ -17,8 +17,7 @@ from django.db import connection from lxml import etree -from auth.models import UserProfile -from models import StudentModule +from models import StudentModule, UserProfile from module_render import render_module, modx_dispatch import courseware.content_parser as content_parser import courseware.modules.capa_module