From: Jan Szejko Date: Mon, 27 Feb 2017 11:35:44 +0000 (+0100) Subject: supervisors for stage 2 assignments X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/b6836ce0cc2dce392a9f604b781d6430740ce1de?ds=inline;hp=19a9b25fea61ea0e070a75b301fecd956397b262 supervisors for stage 2 assignments --- diff --git a/stage2/migrations/0010_auto.py b/stage2/migrations/0010_auto.py new file mode 100644 index 0000000..fb7c9cb --- /dev/null +++ b/stage2/migrations/0010_auto.py @@ -0,0 +1,120 @@ +# -*- 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 M2M table for field supervisors on 'Assignment' + m2m_table_name = db.shorten_name(u'stage2_assignment_supervisors') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('assignment', models.ForeignKey(orm[u'stage2.assignment'], null=False)), + ('user', models.ForeignKey(orm[u'auth.user'], null=False)) + )) + db.create_unique(m2m_table_name, ['assignment_id', 'user_id']) + + + def backwards(self, orm): + # Removing M2M table for field supervisors on 'Assignment' + db.delete_table(db.shorten_name(u'stage2_assignment_supervisors')) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contact.contact': { + 'Meta': {'ordering': "('-created_at',)", 'object_name': 'Contact'}, + 'body': ('jsonfield.fields.JSONField', [], {}), + 'contact': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'form_tag': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}) + }, + u'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'}), + u'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'}) + }, + u'stage2.answer': { + 'Meta': {'unique_together': "(['participant', 'assignment'],)", 'object_name': 'Answer'}, + 'assignment': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['stage2.Assignment']"}), + 'complete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'need_arbiter': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'participant': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['stage2.Participant']"}) + }, + u'stage2.assignment': { + 'Meta': {'ordering': "['deadline', 'title']", 'object_name': 'Assignment'}, + 'arbiters': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'stage2_arbitrated'", 'blank': 'True', 'to': u"orm['auth.User']"}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), + 'deadline': ('django.db.models.fields.DateTimeField', [], {}), + 'experts': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'stage2_assignments'", 'symmetrical': 'False', 'to': u"orm['auth.User']"}), + 'file_descriptions': ('jsonfield.fields.JSONField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'max_points': ('django.db.models.fields.IntegerField', [], {}), + 'supervisors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'stage2_supervised'", 'symmetrical': 'False', 'to': u"orm['auth.User']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + u'stage2.attachment': { + 'Meta': {'ordering': "['file_no']", 'object_name': 'Attachment'}, + 'answer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['stage2.Answer']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'file_no': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + u'stage2.mark': { + 'Meta': {'unique_together': "(['expert', 'answer'],)", 'object_name': 'Mark'}, + 'answer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['stage2.Answer']"}), + 'expert': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'points': ('django.db.models.fields.DecimalField', [], {'max_digits': '3', 'decimal_places': '1'}) + }, + u'stage2.participant': { + 'Meta': {'object_name': 'Participant'}, + 'complete_set': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contact.Contact']", 'null': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '100'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'key_sent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['stage2'] \ No newline at end of file diff --git a/stage2/models.py b/stage2/models.py index 18f5ce9..972376a 100644 --- a/stage2/models.py +++ b/stage2/models.py @@ -3,7 +3,7 @@ import os import random import string -from django.contrib.auth.models import User +from django.conf import settings from django.core.urlresolvers import reverse from django.db import models from django.db.models.signals import post_save @@ -63,9 +63,12 @@ class Assignment(models.Model): content_url = models.URLField(_('URL')) deadline = models.DateTimeField(_('deadline')) max_points = models.IntegerField(_('max points')) - experts = models.ManyToManyField(User, verbose_name=_('experts'), related_name='stage2_assignments') + experts = models.ManyToManyField( + settings.AUTH_USER_MODEL, verbose_name=_('experts'), related_name='stage2_assignments') arbiters = models.ManyToManyField( - User, blank=True, verbose_name=_('arbiters'), related_name='stage2_arbitrated') + settings.AUTH_USER_MODEL, blank=True, verbose_name=_('arbiters'), related_name='stage2_arbitrated') + supervisors = models.ManyToManyField( + settings.AUTH_USER_MODEL, verbose_name=_('supervisors'), related_name='stage2_supervised') file_descriptions = JSONField(_('file descriptions')) class Meta: @@ -77,8 +80,9 @@ class Assignment(models.Model): return self.title def available_answers(self, expert): - answers = self.answer_set.exclude(mark__expert=expert).exclude(complete=True)\ - .filter(participant__complete_set=True) + answers = self.answer_set.exclude(mark__expert=expert).filter(participant__complete_set=True) + if expert not in self.supervisors.all(): + answers = answers.exclude(complete=True) if expert in self.arbiters.all(): answers = answers.filter(need_arbiter=True) return answers @@ -147,7 +151,7 @@ class Attachment(models.Model): class Mark(models.Model): - expert = models.ForeignKey(User) + expert = models.ForeignKey(settings.AUTH_USER_MODEL) answer = models.ForeignKey(Answer) points = models.DecimalField(verbose_name=_('points'), max_digits=3, decimal_places=1)