diff --git a/courseware/content_parser.py b/courseware/content_parser.py index c296e30f3d..61e65caf71 100644 --- a/courseware/content_parser.py +++ b/courseware/content_parser.py @@ -11,6 +11,7 @@ from mako.lookup import TemplateLookup try: # This lets us do __name__ == ='__main__' from django.conf import settings from student.models import UserProfile + from student.models import UserTestGroup except: settings = None @@ -149,7 +150,11 @@ def course_file(user): filename = UserProfile.objects.get(user=user).courseware data_template = template_lookup.get_template(filename) - options = {'dev_content':settings.DEV_CONTENT} + # TODO: Rewrite in Django + groups = [u.name for u in UserTestGroup.objects.raw("select * from auth_user, student_usertestgroup, student_usertestgroup_users where auth_user.id = student_usertestgroup_users.user_id and student_usertestgroup_users.usertestgroup_id = student_usertestgroup.id and auth_user.id = %s", [user.id])] + + options = {'dev_content':settings.DEV_CONTENT, + 'groups' : groups} tree = etree.XML(data_template.render(**options)) id_tag(tree) diff --git a/courseware/views.py b/courseware/views.py index 4369816444..b4dc0683dd 100644 --- a/courseware/views.py +++ b/courseware/views.py @@ -1,6 +1,7 @@ import json import logging import os +import random import sys import StringIO import urllib @@ -161,9 +162,17 @@ def profile(request): else: percentage = 0 summary = "0% (?/?)" - summary = "Homework {0} - {1}".format(i + 1, summary) - homework_percentages.append( {'percentage': percentage, 'summary': summary} ) + if settings.GENERATE_PROFILE_SCORES: + points_possible = random.randrange(10, 50) + points_earned = random.randrange(5, points_possible) + percentage = points_earned / float(points_possible) + summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible ) + + summary = "Homework {0} - {1}".format(i + 1, summary) + label = "HW {0:02d}".format(i + 1) + + homework_percentages.append( {'percentage': percentage, 'summary': summary, 'label' : label} ) homework_total, homework_dropped_indices = totalWithDrops(homework_percentages, 2) #Figure the lab scores @@ -176,8 +185,17 @@ def profile(request): else: percentage = 0 summary = "0% (?/?)" + + if settings.GENERATE_PROFILE_SCORES: + points_possible = random.randrange(10, 50) + points_earned = random.randrange(5, points_possible) + percentage = points_earned / float(points_possible) + summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible ) + summary = "Lab {0} - {1}".format(i + 1, summary) - lab_percentages.append( {'percentage': percentage, 'summary': summary} ) + label = "Lab {0:02d}".format(i + 1) + + lab_percentages.append( {'percentage': percentage, 'summary': summary, 'label' : label} ) lab_total, lab_dropped_indices = totalWithDrops(lab_percentages, 2) @@ -188,12 +206,21 @@ def profile(request): final_score = ('?', '?') final_percentage = 0 + if settings.GENERATE_PROFILE_SCORES: + midterm_score = (random.randrange(50, 150), 150) + midterm_percentage = midterm_score[0] / float(midterm_score[1]) + + final_score = (random.randrange(100, 300), 300) + final_percentage = final_score[0] / float(final_score[1]) + + grade_summary = [ { 'category': 'Homework', 'subscores' : homework_percentages, 'dropped_indices' : homework_dropped_indices, 'totalscore' : {'score' : homework_total, 'summary' : "Homework Average - {0:.0%}".format(homework_total)}, + 'totallabel' : 'HW Avg', 'weight' : 0.15, }, { @@ -201,16 +228,19 @@ def profile(request): 'subscores' : lab_percentages, 'dropped_indices' : lab_dropped_indices, 'totalscore' : {'score' : lab_total, 'summary' : "Lab Average - {0:.0%}".format(lab_total)}, + 'totallabel' : 'Lab Avg', 'weight' : 0.15, }, { 'category': 'Midterm', 'totalscore' : {'score' : midterm_percentage, 'summary' : "Midterm - {0:.0%} ({1}/{2})".format(midterm_percentage, midterm_score[0], midterm_score[1])}, + 'totallabel' : 'Midterm', 'weight' : 0.30, }, { 'category': 'Final', 'totalscore' : {'score' : final_percentage, 'summary' : "Final - {0:.0%} ({1}/{2})".format(final_percentage, final_score[0], final_score[1])}, + 'totallabel' : 'Final', 'weight' : 0.40, } ] diff --git a/settings_new_askbot.py b/settings_new_askbot.py index 0158d69821..561abaef3a 100644 --- a/settings_new_askbot.py +++ b/settings_new_askbot.py @@ -14,6 +14,9 @@ LIB_URL = 'https://mitxstatic.s3.amazonaws.com/js/' BOOK_URL = '/static/book/' BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/' +# Feature Flags. These should be set to false until they are ready to deploy, and then eventually flag mechanisms removed +GENERATE_PROFILE_SCORES = False # If this is true, random scores will be generated for the purpose of debugging the profile graphs + # Our parent dir (mitx_all) is the BASE_DIR BASE_DIR = os.path.abspath(os.path.join(__file__, "..", "..")) diff --git a/student/migrations/0003_auto__add_usertestgroup.py b/student/migrations/0003_auto__add_usertestgroup.py new file mode 100644 index 0000000000..4765d63578 --- /dev/null +++ b/student/migrations/0003_auto__add_usertestgroup.py @@ -0,0 +1,124 @@ +# 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 'UserTestGroup' + db.create_table('student_usertestgroup', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=32, db_index=True)), + ('description', self.gf('django.db.models.fields.TextField')(blank=True)), + )) + db.send_create_signal('student', ['UserTestGroup']) + + # Adding M2M table for field users on 'UserTestGroup' + db.create_table('student_usertestgroup_users', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('usertestgroup', models.ForeignKey(orm['student.usertestgroup'], null=False)), + ('user', models.ForeignKey(orm['auth.user'], null=False)) + )) + db.create_unique('student_usertestgroup_users', ['usertestgroup_id', 'user_id']) + + + def backwards(self, orm): + + # Deleting model 'UserTestGroup' + db.delete_table('student_usertestgroup') + + # Removing M2M table for field users on 'UserTestGroup' + db.delete_table('student_usertestgroup_users') + + + 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'}) + }, + 'student.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'}) + }, + 'student.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"}, + 'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'meta': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.usertestgroup': { + 'Meta': {'object_name': 'UserTestGroup'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'}) + } + } + + complete_apps = ['student'] diff --git a/student/models.py b/student/models.py index 6c614966f9..b9554369bc 100644 --- a/student/models.py +++ b/student/models.py @@ -27,6 +27,10 @@ class UserProfile(models.Model): meta = models.CharField(blank=True, max_length=255) # JSON dictionary for future expansion courseware = models.CharField(blank=True, max_length=255, default='course.xml') +class UserTestGroup(models.Model): + users = models.ManyToManyField(User, db_index=True) + name = models.CharField(blank=False, max_length=32, db_index=True) + description = models.TextField(blank=True) class Registration(models.Model): ''' Allows us to wait for e-mail before user is registered. A diff --git a/util/middleware.py b/util/middleware.py index fe73e67c7b..342fff1790 100644 --- a/util/middleware.py +++ b/util/middleware.py @@ -1,7 +1,7 @@ import logging from django.conf import settings -from django.http import HttpResponse +from django.http import HttpResponseServerError log = logging.getLogger("mitx") @@ -12,4 +12,4 @@ class ExceptionLoggingMiddleware(object): if not settings.TEMPLATE_DEBUG: def process_exception(self, request, exception): log.exception(exception) - return HttpResponse("Server Error - Please try again later.") + return HttpResponseServerError("Server Error - Please try again later.")