From 279e7efbd63d7f562896a36dff56a28f40bfdad1 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 12 Jun 2014 01:29:38 +0200 Subject: [PATCH] Display Scripts, fix Script.submit() --- teleforma/exam/admin.py | 3 +- ...ctor_user__del_field_script_exam__add_f.py | 212 ++++++++++++++++++ ..._script_period__add_field_script_type__.py | 199 ++++++++++++++++ .../0013_auto__add_field_script_url.py | 176 +++++++++++++++ teleforma/exam/models.py | 73 +++--- .../exam/templates/exam/script_detail.html | 143 ++---------- teleforma/exam/urls.py | 8 +- teleforma/exam/views.py | 4 +- teleforma/urls.py | 2 + 9 files changed, 658 insertions(+), 162 deletions(-) create mode 100644 teleforma/exam/migrations/0011_auto__del_exam__chg_field_corrector_user__del_field_script_exam__add_f.py create mode 100644 teleforma/exam/migrations/0012_auto__add_scripttype__add_field_script_period__add_field_script_type__.py create mode 100644 teleforma/exam/migrations/0013_auto__add_field_script_url.py diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py index cc8a3045..528a5d5e 100644 --- a/teleforma/exam/admin.py +++ b/teleforma/exam/admin.py @@ -28,5 +28,6 @@ class ScriptAdmin(admin.ModelAdmin): admin.site.register(Corrector, CorrectorAdmin) admin.site.register(Script, ScriptAdmin) admin.site.register(ScriptPage) +admin.site.register(ScriptType) admin.site.register(Quota) -admin.site.register(Exam) + diff --git a/teleforma/exam/migrations/0011_auto__del_exam__chg_field_corrector_user__del_field_script_exam__add_f.py b/teleforma/exam/migrations/0011_auto__del_exam__chg_field_corrector_user__del_field_script_exam__add_f.py new file mode 100644 index 00000000..4a9d8531 --- /dev/null +++ b/teleforma/exam/migrations/0011_auto__del_exam__chg_field_corrector_user__del_field_script_exam__add_f.py @@ -0,0 +1,212 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as 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 'Exam' + db.delete_table('exam_exam') + + + # Changing field 'Corrector.user' + db.alter_column('exam_corrector', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['auth.User'])) + # Deleting field 'Script.exam' + db.delete_column('exam_script', 'exam_id') + + # Adding field 'Script.course' + db.add_column('exam_script', 'course', + self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='scripts', null=True, on_delete=models.SET_NULL, to=orm['teleforma.Course']), + keep_default=False) + + # Adding field 'Script.session' + db.add_column('exam_script', 'session', + self.gf('django.db.models.fields.IntegerField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Adding model 'Exam' + db.create_table('exam_exam', ( + ('description', self.gf('django.db.models.fields.TextField')(blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, null=True, blank=True)), + ('course', self.gf('django.db.models.fields.related.ForeignKey')(related_name='exams', null=True, to=orm['teleforma.Course'], on_delete=models.SET_NULL, blank=True)), + ('session', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)), + ('date_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('sha1', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), + ('uuid', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(related_name='exams', null=True, to=orm['auth.User'], on_delete=models.SET_NULL, blank=True)), + ('score', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('credits', self.gf('django.db.models.fields.TextField')(blank=True)), + ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=128, blank=True)), + )) + db.send_create_signal('exam', ['Exam']) + + + # Changing field 'Corrector.user' + db.alter_column('exam_corrector', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['auth.User'])) + # Adding field 'Script.exam' + db.add_column('exam_script', 'exam', + self.gf('django.db.models.fields.related.ForeignKey')(related_name='scripts', null=True, to=orm['exam.Exam'], on_delete=models.SET_NULL, blank=True), + keep_default=False) + + # Deleting field 'Script.course' + db.delete_column('exam_script', 'course_id') + + # Deleting field 'Script.session' + db.delete_column('exam_script', 'session') + + + 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'}) + }, + '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'}) + }, + 'exam.corrector': { + 'Meta': {'object_name': 'Corrector'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'correctors'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}) + }, + 'exam.quota': { + 'Meta': {'ordering': "['date_start']", 'object_name': 'Quota'}, + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['teleforma.Course']"}), + 'date_end': ('django.db.models.fields.DateField', [], {}), + 'date_start': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('django.db.models.fields.IntegerField', [], {}) + }, + 'exam.script': { + 'Meta': {'object_name': 'Script'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'box_uuid': ('django.db.models.fields.CharField', [], {'max_length': "'256'", 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Course']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_corrected': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'reject_reason': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'score': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'session': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'exam.scriptpage': { + 'Meta': {'object_name': 'ScriptPage'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'script': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'pages'", 'null': 'True', 'to': "orm['exam.Script']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'notes.note': { + 'Meta': {'object_name': 'Note'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2014, 6, 11, 0, 0)'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'markup': ('django.db.models.fields.CharField', [], {'default': "'m'", 'max_length': '1'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'rendered_content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notes.Topic']"}) + }, + 'notes.topic': { + 'Meta': {'object_name': 'Topic'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'title'", 'overwrite': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'teleforma.course': { + 'Meta': {'ordering': "['number']", 'object_name': 'Course'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'department': ('telemeta.models.core.ForeignKey', [], {'related_name': "'course'", 'to': "orm['teleforma.Department']"}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'magistral': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'number': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'obligation': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'synthesis_note': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'title_tweeter': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.department': { + 'Meta': {'object_name': 'Department'}, + 'default_period': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Period']", 'blank': 'True', 'null': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'domain': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'organization': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'to': "orm['teleforma.Organization']"}) + }, + 'teleforma.organization': { + 'Meta': {'object_name': 'Organization'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.period': { + 'Meta': {'object_name': 'Period'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + } + } + + complete_apps = ['exam'] \ No newline at end of file diff --git a/teleforma/exam/migrations/0012_auto__add_scripttype__add_field_script_period__add_field_script_type__.py b/teleforma/exam/migrations/0012_auto__add_scripttype__add_field_script_period__add_field_script_type__.py new file mode 100644 index 00000000..05a2b133 --- /dev/null +++ b/teleforma/exam/migrations/0012_auto__add_scripttype__add_field_script_period__add_field_script_type__.py @@ -0,0 +1,199 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as 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 'ScriptType' + db.create_table('exam_scripttype', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length='512', blank=True)), + )) + db.send_create_signal('exam', ['ScriptType']) + + # Adding field 'Script.period' + db.add_column('exam_script', 'period', + self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='scripts', null=True, on_delete=models.SET_NULL, to=orm['teleforma.Period']), + keep_default=False) + + # Adding field 'Script.type' + db.add_column('exam_script', 'type', + self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='scripts', null=True, on_delete=models.SET_NULL, to=orm['exam.ScriptType']), + keep_default=False) + + + # Changing field 'Script.session' + db.alter_column('exam_script', 'session', self.gf('django.db.models.fields.CharField')(max_length=16)) + + def backwards(self, orm): + # Deleting model 'ScriptType' + db.delete_table('exam_scripttype') + + # Deleting field 'Script.period' + db.delete_column('exam_script', 'period_id') + + # Deleting field 'Script.type' + db.delete_column('exam_script', 'type_id') + + + # Changing field 'Script.session' + db.alter_column('exam_script', 'session', self.gf('django.db.models.fields.IntegerField')(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'}, + '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'}) + }, + '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'}) + }, + 'exam.corrector': { + 'Meta': {'object_name': 'Corrector'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'correctors'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}) + }, + 'exam.quota': { + 'Meta': {'ordering': "['date_start']", 'object_name': 'Quota'}, + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['teleforma.Course']"}), + 'date_end': ('django.db.models.fields.DateField', [], {}), + 'date_start': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('django.db.models.fields.IntegerField', [], {}) + }, + 'exam.script': { + 'Meta': {'object_name': 'Script'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'box_uuid': ('django.db.models.fields.CharField', [], {'max_length': "'256'", 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Course']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_corrected': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Period']"}), + 'reject_reason': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'score': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'session': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '16'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['exam.ScriptType']"}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'exam.scriptpage': { + 'Meta': {'object_name': 'ScriptPage'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'script': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'pages'", 'null': 'True', 'to': "orm['exam.Script']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'exam.scripttype': { + 'Meta': {'object_name': 'ScriptType'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': "'512'", 'blank': 'True'}) + }, + 'notes.note': { + 'Meta': {'object_name': 'Note'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2014, 6, 12, 0, 0)'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'markup': ('django.db.models.fields.CharField', [], {'default': "'m'", 'max_length': '1'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'rendered_content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notes.Topic']"}) + }, + 'notes.topic': { + 'Meta': {'object_name': 'Topic'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'title'", 'overwrite': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'teleforma.course': { + 'Meta': {'ordering': "['number']", 'object_name': 'Course'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'department': ('telemeta.models.core.ForeignKey', [], {'related_name': "'course'", 'to': "orm['teleforma.Department']"}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'magistral': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'number': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'obligation': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'synthesis_note': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'title_tweeter': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.department': { + 'Meta': {'object_name': 'Department'}, + 'default_period': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Period']", 'blank': 'True', 'null': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'domain': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'organization': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'to': "orm['teleforma.Organization']"}) + }, + 'teleforma.organization': { + 'Meta': {'object_name': 'Organization'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.period': { + 'Meta': {'object_name': 'Period'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + } + } + + complete_apps = ['exam'] \ No newline at end of file diff --git a/teleforma/exam/migrations/0013_auto__add_field_script_url.py b/teleforma/exam/migrations/0013_auto__add_field_script_url.py new file mode 100644 index 00000000..725cb3a9 --- /dev/null +++ b/teleforma/exam/migrations/0013_auto__add_field_script_url.py @@ -0,0 +1,176 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as 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 'Script.url' + db.add_column('exam_script', 'url', + self.gf('django.db.models.fields.CharField')(default='', max_length='2048', blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Script.url' + db.delete_column('exam_script', 'url') + + + 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'}) + }, + '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'}) + }, + 'exam.corrector': { + 'Meta': {'object_name': 'Corrector'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'correctors'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}) + }, + 'exam.quota': { + 'Meta': {'ordering': "['date_start']", 'object_name': 'Quota'}, + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'quotas'", 'null': 'True', 'to': "orm['teleforma.Course']"}), + 'date_end': ('django.db.models.fields.DateField', [], {}), + 'date_start': ('django.db.models.fields.DateField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('django.db.models.fields.IntegerField', [], {}) + }, + 'exam.script': { + 'Meta': {'object_name': 'Script'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'box_uuid': ('django.db.models.fields.CharField', [], {'max_length': "'256'", 'blank': 'True'}), + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'corrector': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['exam.Corrector']"}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Course']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_corrected': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'date_submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Period']"}), + 'reject_reason': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'score': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'session': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '16'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'scripts'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['exam.ScriptType']"}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': "'2048'", 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'exam.scriptpage': { + 'Meta': {'object_name': 'ScriptPage'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'script': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'pages'", 'null': 'True', 'to': "orm['exam.Script']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) + }, + 'exam.scripttype': { + 'Meta': {'object_name': 'ScriptType'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': "'512'", 'blank': 'True'}) + }, + 'notes.note': { + 'Meta': {'object_name': 'Note'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2014, 6, 12, 0, 0)'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'markup': ('django.db.models.fields.CharField', [], {'default': "'m'", 'max_length': '1'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'rendered_content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notes.Topic']"}) + }, + 'notes.topic': { + 'Meta': {'object_name': 'Topic'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'title'", 'overwrite': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'teleforma.course': { + 'Meta': {'ordering': "['number']", 'object_name': 'Course'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'department': ('telemeta.models.core.ForeignKey', [], {'related_name': "'course'", 'to': "orm['teleforma.Department']"}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'magistral': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'number': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'obligation': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'synthesis_note': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'title_tweeter': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.department': { + 'Meta': {'object_name': 'Department'}, + 'default_period': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Period']", 'blank': 'True', 'null': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'domain': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'organization': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'to': "orm['teleforma.Organization']"}) + }, + 'teleforma.organization': { + 'Meta': {'object_name': 'Organization'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.period': { + 'Meta': {'object_name': 'Period'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + } + } + + complete_apps = ['exam'] \ No newline at end of file diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index cb9916ee..c0ebe261 100644 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -43,7 +43,7 @@ from django.db.models.signals import post_save from django.conf import settings from django.utils.translation import ugettext_lazy as _ -from teleforma.models import Course +from teleforma.models import * app = 'teleforma' @@ -52,9 +52,11 @@ class MetaCore: app_label = 'exam' +import crocodoc +crocodoc.api_token = settings.BOX_API_TOKEN SCRIPT_STATUS = ((0, _('rejected')), (1, _('draft')), (2, _('submitted')), - (3, _('uploaded')),(4, _('corrected')) ) + (3, _('pending')),(4, _('corrected')) ) REJECT_REASON = ((0, _('none')), (1, _('unreadable')), (2, _('bad orientation')), (3, _('bad framing')), (4, _('incomplete')),) @@ -168,11 +170,27 @@ class ScriptPage(BaseResource): verbose_name_plural = _('Pages') +class ScriptType(models.Model): + + name = models.CharField(_('name'), max_length='512', blank=True) + + class Meta: + verbose_name = _('ScriptType') + verbose_name_plural = _('ScriptTypes') + + def __unicode__(self): + return self.name + + class Script(BaseResource): - course = models.ForeignKey(Course, related_name="scripts", verbose_name=_('courses'), blank=True, null=True, on_delete=models.SET_NULL) - session = models.IntegerField(_('Session'), blank=True, null=True) - author = models.ForeignKey(User, related_name="scripts", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) + course = models.ForeignKey(Course, related_name="scripts", verbose_name=_('course'), null=True, on_delete=models.SET_NULL) + period = models.ForeignKey(Period, related_name='scripts', verbose_name=_('period'), + null=True, blank=True, on_delete=models.SET_NULL) + session = models.CharField(_('session'), choices=session_choices, + max_length=16, default="1") + type = models.ForeignKey(ScriptType, related_name='scripts', verbose_name=_('type'), null=True, on_delete=models.SET_NULL) + author = models.ForeignKey(User, related_name="scripts", verbose_name=_('author'), null=True, on_delete=models.SET_NULL) file = models.FileField(_('PDF file'), upload_to='scripts/%Y/%m/%d', blank=True) box_uuid = models.CharField(_('Box UUID'), max_length='256', blank=True) corrector = models.ForeignKey('Corrector', related_name="scripts", verbose_name=_('corrector'), blank=True, null=True, on_delete=models.SET_NULL) @@ -182,30 +200,25 @@ class Script(BaseResource): reject_reason = models.IntegerField(_('reject_reason'), choices=REJECT_REASON, null=True, blank=True) date_corrected = models.DateTimeField(_('date corrected'), null=True, blank=True) date_submitted = models.DateTimeField(_('date submitted'), null=True, blank=True) + url = models.CharField(_('URL'), max_length='2048', blank=True) class Meta(MetaCore): verbose_name = _('Script') verbose_name_plural = _('Scripts') - def save(self, *args, **kwargs): - if self.score: - self.date_corrected = datetime.datetime.now() - self.status = 4 - - super(Script, self).save(*args, **kwargs) - def auto_set_corrector(self): quota_list = [] - quotas = self.course.quotas.filter(date_start__gte=date_submitted, date_end__lte=date_submitted) + quotas = self.course.quotas.filter(date_start__gte=self.date_submitted, + date_end__lte=self.date_submitted) if quotas: for quota in quotas: if quota.value: quota_list.append({'obj':quota, 'level': quota.level}) lower_quota = sorted(quota_list, key=lambda k: k['level'])[0] self.corrector = lower_quota['obj'].corrector - else: - self.corrector = User.objects.get(username=settings.TELEFORMA_DEFAULT_CORRECTOR) + user = User.objects.filter(is_superuser=True)[0] + self.corrector = Corrector.objects.get(user=user) self.save() def make_from_pages(self): @@ -233,34 +246,38 @@ class Script(BaseResource): self.file = output self.save() + def save(self, *args, **kwargs): + if self.score: + self.date_corrected = datetime.datetime.now() + self.status = 4 + if self.status == 2: + self.submit() + + super(Script, self).save(*args, **kwargs) + def submit(self): self.date_submitted = datetime.datetime.now() - self.box_upload() - self.status = 2 - self.save() - - def box_upload(self): - import crocodoc - crocodoc.api_token = settings.BOX_API_TOKEN - url='http://files.parisson.com/pre-barreau/LATRILLE%20Adeline%20-%20Procedure%20civile%201.pdf' - self.box_uuid = crocodoc.document.upload(url=url) + # self.url = settings.MEDIA_URL + unicode(self.file) + self.url='http://files.parisson.com/pre-barreau/Bordereau_de_livraison.pdf' + self.box_uuid = crocodoc.document.upload(url=self.url) + if not self.corrector: + self.auto_set_corrector() self.status = 3 - self.save() @property def box_admin_url(self): user = {'id': self.corrector.id, 'name': unicode(self.corrector)} session_key = crocodoc.session.create(self.box_uuid, editable=True, user=user, filter='all', admin=True, downloadable=True, - copyprotected=False, demo=False, sidebar='visible') + copyprotected=False, demo=False, sidebar='invisible') return 'https://crocodoc.com/view/' + session_key @property def box_user_url(self, user): - user = {'id': user.id, 'name': user} + user = {'id': user.id, 'name': unicode(user)} session_key = crocodoc.session.create(self.box_uuid, editable=False, user=user, filter='all', admin=False, downloadable=True, - copyprotected=False, demo=False, sidebar='visible') + copyprotected=False, demo=False, sidebar='invisible') return 'https://crocodoc.com/view/' + session_key diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html index 102319de..981e073c 100644 --- a/teleforma/exam/templates/exam/script_detail.html +++ b/teleforma/exam/templates/exam/script_detail.html @@ -5,85 +5,23 @@ {% load thumbnail %} {% block extra_javascript %} - -{% if "video" in media.mime_type %} - - -{% endif %} - - - -{% if user.is_staff %} - -{% endif %} - {% endblock extra_javascript %} -{% block module-action %} -{% if media.item.file and media.is_published or user.is_superuser or user.is_staff %} - {% if not "video" in media.mime_type or perms.telemeta.can_play_all_items %} -
-  {% trans "Download" %} -
- {% endif %} -{% endif %} -{% endblock module-action %} + +{% block content %} {% block course %} -
+
+ + {{ course.title }} - {{ script.type }}{% if script.session %} - {% trans "Session" %} {{ script.session }}{% endif %} - {{ script.author.first_name }} {{ script.author.last_name }} - {{ script.date_submitted }} +
- {% if "video" in media.mime_type %} -  {% trans "Audio" %} - {% endif %} - {% if "audio" in media.mime_type %} -  {% trans "Video" %} - {% endif %} - {% if user.is_staff %} - {% if media.is_published %}{% trans " published" %}{% else %}{% trans " rejected" %}{% endif %} - {% endif %} -
+ {% trans "Score : " %}{% if script.score %}{{ script.score|floatformat }}{% else %} {% endif %}/20 + {% if script.status == 4 %}{% trans " corrected" %}{% else %}{% trans " pending" %}{% endif %} - {{ course.title }} - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %} +
@@ -93,68 +31,17 @@ $(document).ready(function(){ {% else %}
- -{% if "video" in media.mime_type %} -
- -
- -{% elif "audio" in media.mime_type %} - -
-{% if media.item.related.all %} - {% for related in media.item.related.all %} - {% if related.title == "preview" %} - {% thumbnail related.file "300" as im %} - preview - {% endthumbnail %} - {% endif %} - {% endfor %} -{% else %} - snapshot -{% endif %} -
-
- +
+ +
-{% endif %} - -
-{% endif %} {% block general_info %} -
-
+{% endblock general_info %} -{% if media.conference %} -
{% trans "Course" %}
{{ media.course.title }} - {{ media.course_type }}
-
{% trans "Session" %}
{{ media.conference.session }}
-{% if media.conference.professor %} -
{% trans "Professor" %}
-
{{ media.conference.professor }}
-{% endif %} -{% if media.conference.comment %}
{% trans "Comment" %}
{{ media.conference.comment }}
{% endif %} -
{% trans "Begin date" %}
{{ media.conference.date_begin }}
-
{% trans "End date" %}
{{ media.conference.date_end }}
-{% if media.conference.room %}
{% trans "Room" %}
{{ media.conference.room }}
{% endif %} -{% if user.is_staff or user.is_superuser %} -
{% trans "Mime type" %}
{{ media.mime_type }}
-
{% trans "Date added" %}
{{ media.date_added }}
-
{% trans "Date modified" %}
{{ media.date_modified }}
-
{% trans "Media ID" %}
{{ media.id }}
-
{% trans "Conference ID" %}
{{ media.conference.public_id }}
{% endif %} -{% endif %} - -
-
- -{% endblock general_info %}
{% endblock course %} - +{% endblock content %} diff --git a/teleforma/exam/urls.py b/teleforma/exam/urls.py index 1a85e714..8d7aa44d 100644 --- a/teleforma/exam/urls.py +++ b/teleforma/exam/urls.py @@ -36,14 +36,14 @@ import os.path from django.conf.urls.defaults import * from django.views.generic import * from django.views.generic.base import * -from teleforma.models import * -from teleforma.views import * -from telemeta.views import * +from teleforma.exam.models import * +from teleforma.exam.views import * from jsonrpc import jsonrpc_site + urlpatterns = patterns('', - url(r'^desk/exam/script/(?P.*)/detail/$', ScriptView.as_view(), + url(r'^desk/periods/(?P.*)/exam/script/(?P.*)/detail/$', ScriptView.as_view(), name="teleforma-exam-script-detail"), ) diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index ded7d74b..2c556289 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -12,8 +12,10 @@ class ScriptView(CourseAccessMixin, DetailView): def get_context_data(self, **kwargs): context = super(ScriptView, self).get_context_data(**kwargs) script = self.get_object() + context['script'] = script + context['course'] = script.course - access = get_access(media, context['all_courses']) + access = get_access(script, context['all_courses']) if not access: context['access_error'] = access_error context['message'] = contact_message diff --git a/teleforma/urls.py b/teleforma/urls.py index efedc340..7123a55e 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -116,4 +116,6 @@ urlpatterns = patterns('', # JQCHAT url(r'^', include('jqchat.urls')), + # EXAM + url(r'^', include('teleforma.exam.urls')), ) -- 2.39.5