joeni | Gitar

Add a lot of files and changes

A lot of the new files are the recent migrations, caused by a variety of bugs in the database.
In addition, I've also added a lot of new files for the program, including some static files like the stylesheets, and some templates.
Also some changes in other files, but there are too much, I can't begin to list them here. Please check the diffs.

Author: Maarten 'Vngngdn' Vangeneugden
Date: Nov. 22, 2017, 12:17 a.m.
Hash: 53066247d90ebba534b0a4da2b14ac8189bc2eec
Parent: f1175e5c018fb47d6b6dd76045df6de897b8ed39
Modified files: administration/migrations/0004_auto_20171121_1906.py; administration/migrations/0005_auto_20171121_1921.py; administration/migrations/0006_auto_20171121_1924.py; administration/migrations/0007_auto_20171121_2018.py; administration/models.py; agora/forms.py; agora/migrations/0003_auto_20171121_1906.py; agora/migrations/0004_auto_20171121_2018.py; agora/models.py; agora/templates/agora/post.djhtml; courses/migrations/0002_auto_20171121_2018.py; courses/models.py; courses/templates/courses/courses/course.djhtml; courses/templates/courses/studies/study.djhtml; courses/urls.py; courses/views.py; joeni/settings.py; joeni/templates/flat/about.html; joeni/urls.py; static/_colors.scss; static/_fonts.scss; static/css/post.scss; static/main.scss

administration/migrations/0004_auto_20171121_1906.py ¶

148 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.db import migrations, models
+	3
+	4
+	5	class Migration(migrations.Migration):
+	6
+	7	dependencies = [
+	8	('administration', '0003_auto_20171118_2204'),
+	9	]
+	10
+	11	operations = [
+	12	migrations.RemoveField(
+	13	model_name='user',
+	14	name='BIC',
+	15	),
+	16	migrations.RemoveField(
+	17	model_name='user',
+	18	name='DOB',
+	19	),
+	20	migrations.RemoveField(
+	21	model_name='user',
+	22	name='POB',
+	23	),
+	24	migrations.RemoveField(
+	25	model_name='user',
+	26	name='bank_account_number',
+	27	),
+	28	migrations.RemoveField(
+	29	model_name='user',
+	30	name='civil_status',
+	31	),
+	32	migrations.RemoveField(
+	33	model_name='user',
+	34	name='created',
+	35	),
+	36	migrations.RemoveField(
+	37	model_name='user',
+	38	name='home_bus',
+	39	),
+	40	migrations.RemoveField(
+	41	model_name='user',
+	42	name='home_country',
+	43	),
+	44	migrations.RemoveField(
+	45	model_name='user',
+	46	name='home_number',
+	47	),
+	48	migrations.RemoveField(
+	49	model_name='user',
+	50	name='home_postal_code',
+	51	),
+	52	migrations.RemoveField(
+	53	model_name='user',
+	54	name='home_street',
+	55	),
+	56	migrations.RemoveField(
+	57	model_name='user',
+	58	name='home_telephone',
+	59	),
+	60	migrations.RemoveField(
+	61	model_name='user',
+	62	name='is_student',
+	63	),
+	64	migrations.RemoveField(
+	65	model_name='user',
+	66	name='national_registry_number',
+	67	),
+	68	migrations.RemoveField(
+	69	model_name='user',
+	70	name='nationality',
+	71	),
+	72	migrations.RemoveField(
+	73	model_name='user',
+	74	name='passphrase',
+	75	),
+	76	migrations.RemoveField(
+	77	model_name='user',
+	78	name='study_bus',
+	79	),
+	80	migrations.RemoveField(
+	81	model_name='user',
+	82	name='study_cellphone',
+	83	),
+	84	migrations.RemoveField(
+	85	model_name='user',
+	86	name='study_country',
+	87	),
+	88	migrations.RemoveField(
+	89	model_name='user',
+	90	name='study_number',
+	91	),
+	92	migrations.RemoveField(
+	93	model_name='user',
+	94	name='study_postal_code',
+	95	),
+	96	migrations.RemoveField(
+	97	model_name='user',
+	98	name='study_street',
+	99	),
+	100	migrations.RemoveField(
+	101	model_name='user',
+	102	name='study_telephone',
+	103	),
+	104	migrations.RemoveField(
+	105	model_name='user',
+	106	name='title',
+	107	),
+	108	migrations.RemoveField(
+	109	model_name='user',
+	110	name='titularis_bus',
+	111	),
+	112	migrations.RemoveField(
+	113	model_name='user',
+	114	name='titularis_country',
+	115	),
+	116	migrations.RemoveField(
+	117	model_name='user',
+	118	name='titularis_number',
+	119	),
+	120	migrations.RemoveField(
+	121	model_name='user',
+	122	name='titularis_postal_code',
+	123	),
+	124	migrations.RemoveField(
+	125	model_name='user',
+	126	name='titularis_street',
+	127	),
+	128	migrations.RemoveField(
+	129	model_name='user',
+	130	name='titularis_telephone',
+	131	),
+	132	migrations.AlterField(
+	133	model_name='user',
+	134	name='first_name',
+	135	field=models.CharField(blank=True, max_length=30, verbose_name='first name'),
+	136	),
+	137	migrations.AlterField(
+	138	model_name='user',
+	139	name='is_staff',
+	140	field=models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status'),
+	141	),
+	142	migrations.AlterField(
+	143	model_name='user',
+	144	name='last_name',
+	145	field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+	146	),
+	147	]
+	148

administration/migrations/0005_auto_20171121_1921.py ¶

203 additions and 0 deletions.

View changes Hide changes

+	1
+	2	import administration.models
+	3	import datetime
+	4	from django.db import migrations, models
+	5	import django.utils.timezone
+	6
+	7
+	8	class Migration(migrations.Migration):
+	9
+	10	dependencies = [
+	11	('administration', '0004_auto_20171121_1906'),
+	12	]
+	13
+	14	operations = [
+	15	migrations.AddField(
+	16	model_name='user',
+	17	name='BIC',
+	18	field=models.CharField(default=535, help_text="The BIC of this user's bank.", max_length=11, validators=[administration.models.validate_BIC]),
+	19	preserve_default=False,
+	20	),
+	21	migrations.AddField(
+	22	model_name='user',
+	23	name='DOB',
+	24	field=models.DateField(default=datetime.datetime(2017, 11, 21, 19, 19, 30, 347992), editable=False, help_text='The date of birth of this user.'),
+	25	preserve_default=False,
+	26	),
+	27	migrations.AddField(
+	28	model_name='user',
+	29	name='POB',
+	30	field=models.CharField(default='Genk', editable=False, help_text='The place of birth of this user.', max_length=64),
+	31	preserve_default=False,
+	32	),
+	33	migrations.AddField(
+	34	model_name='user',
+	35	name='bank_account_number',
+	36	field=models.CharField(default=4353, help_text='The IBAN of this user. No spaces!', max_length=34, validators=[administration.models.validate_IBAN]),
+	37	preserve_default=False,
+	38	),
+	39	migrations.AddField(
+	40	model_name='user',
+	41	name='civil_status',
+	42	field=models.CharField(choices=[('Single', 'Single'), ('Married', 'Married'), ('Divorced', 'Divorced'), ('Widowed', 'Widowed'), ('Partnership', 'Partnership')], default='Single', help_text='The civil/marital status of the user.', max_length=32),
+	43	preserve_default=False,
+	44	),
+	45	migrations.AddField(
+	46	model_name='user',
+	47	name='created',
+	48	field=models.DateField(auto_now_add=True, default=django.utils.timezone.now),
+	49	preserve_default=False,
+	50	),
+	51	migrations.AddField(
+	52	model_name='user',
+	53	name='home_bus',
+	54	field=models.PositiveSmallIntegerField(default=3),
+	55	preserve_default=False,
+	56	),
+	57	migrations.AddField(
+	58	model_name='user',
+	59	name='home_country',
+	60	field=models.CharField(default='Belgium', max_length=64),
+	61	preserve_default=False,
+	62	),
+	63	migrations.AddField(
+	64	model_name='user',
+	65	name='home_number',
+	66	field=models.PositiveSmallIntegerField(default=22),
+	67	preserve_default=False,
+	68	),
+	69	migrations.AddField(
+	70	model_name='user',
+	71	name='home_postal_code',
+	72	field=models.PositiveSmallIntegerField(default=3740),
+	73	preserve_default=False,
+	74	),
+	75	migrations.AddField(
+	76	model_name='user',
+	77	name='home_street',
+	78	field=models.CharField(default='Kuil', max_length=64),
+	79	preserve_default=False,
+	80	),
+	81	migrations.AddField(
+	82	model_name='user',
+	83	name='home_telephone',
+	84	field=models.CharField(default=4223, help_text='The telephone number for the house address. Prefix 0 can be presented with the national call code in the system.', max_length=64),
+	85	preserve_default=False,
+	86	),
+	87	migrations.AddField(
+	88	model_name='user',
+	89	name='is_student',
+	90	field=models.BooleanField(default=True, help_text='Indicates if this user is a student at the university.'),
+	91	),
+	92	migrations.AddField(
+	93	model_name='user',
+	94	name='national_registry_number',
+	95	field=models.BigIntegerField(default=33333, editable=False, help_text='The assigned national registry number of this user.', unique=True),
+	96	preserve_default=False,
+	97	),
+	98	migrations.AddField(
+	99	model_name='user',
+	100	name='nationality',
+	101	field=models.CharField(default='Belgian', help_text='The current nationality of this user.', max_length=64),
+	102	preserve_default=False,
+	103	),
+	104	migrations.AddField(
+	105	model_name='user',
+	106	name='study_bus',
+	107	field=models.PositiveSmallIntegerField(default=4),
+	108	preserve_default=False,
+	109	),
+	110	migrations.AddField(
+	111	model_name='user',
+	112	name='study_cellphone',
+	113	field=models.CharField(default=33442, help_text='The cellphone number of the person. Prefix 0 can be presented with then national call code in the system.', max_length=64),
+	114	preserve_default=False,
+	115	),
+	116	migrations.AddField(
+	117	model_name='user',
+	118	name='study_country',
+	119	field=models.CharField(default='Belgium', max_length=64),
+	120	preserve_default=False,
+	121	),
+	122	migrations.AddField(
+	123	model_name='user',
+	124	name='study_number',
+	125	field=models.PositiveSmallIntegerField(default=4),
+	126	preserve_default=False,
+	127	),
+	128	migrations.AddField(
+	129	model_name='user',
+	130	name='study_postal_code',
+	131	field=models.PositiveSmallIntegerField(default=234),
+	132	preserve_default=False,
+	133	),
+	134	migrations.AddField(
+	135	model_name='user',
+	136	name='study_street',
+	137	field=models.CharField(default='Streeeeeet', max_length=64),
+	138	preserve_default=False,
+	139	),
+	140	migrations.AddField(
+	141	model_name='user',
+	142	name='study_telephone',
+	143	field=models.CharField(default=2442222, help_text='The telephone number for the study address. Prefix 0 can be presented with the national call code in the system.', max_length=64),
+	144	preserve_default=False,
+	145	),
+	146	migrations.AddField(
+	147	model_name='user',
+	148	name='title',
+	149	field=models.CharField(blank=True, help_text='The academic title of this user, if applicable.', max_length=64),
+	150	),
+	151	migrations.AddField(
+	152	model_name='user',
+	153	name='titularis_bus',
+	154	field=models.PositiveSmallIntegerField(default=2),
+	155	preserve_default=False,
+	156	),
+	157	migrations.AddField(
+	158	model_name='user',
+	159	name='titularis_country',
+	160	field=models.CharField(default='Beligum', max_length=64),
+	161	preserve_default=False,
+	162	),
+	163	migrations.AddField(
+	164	model_name='user',
+	165	name='titularis_number',
+	166	field=models.PositiveSmallIntegerField(default=2),
+	167	preserve_default=False,
+	168	),
+	169	migrations.AddField(
+	170	model_name='user',
+	171	name='titularis_postal_code',
+	172	field=models.PositiveSmallIntegerField(default=1),
+	173	preserve_default=False,
+	174	),
+	175	migrations.AddField(
+	176	model_name='user',
+	177	name='titularis_street',
+	178	field=models.CharField(default='IEP', max_length=64),
+	179	preserve_default=False,
+	180	),
+	181	migrations.AddField(
+	182	model_name='user',
+	183	name='titularis_telephone',
+	184	field=models.CharField(default=9, help_text='The telephone number of the titularis. Prefix 0 can be presented with the national call code in the system.', max_length=64),
+	185	preserve_default=False,
+	186	),
+	187	migrations.AlterField(
+	188	model_name='user',
+	189	name='first_name',
+	190	field=models.CharField(max_length=64),
+	191	),
+	192	migrations.AlterField(
+	193	model_name='user',
+	194	name='is_staff',
+	195	field=models.BooleanField(default=False, help_text="Determines if this user is part of the university's staff."),
+	196	),
+	197	migrations.AlterField(
+	198	model_name='user',
+	199	name='last_name',
+	200	field=models.CharField(max_length=64),
+	201	),
+	202	]
+	203

administration/migrations/0006_auto_20171121_1924.py ¶

53 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.db import migrations, models
+	3
+	4
+	5	class Migration(migrations.Migration):
+	6
+	7	dependencies = [
+	8	('administration', '0005_auto_20171121_1921'),
+	9	]
+	10
+	11	operations = [
+	12	migrations.AlterField(
+	13	model_name='user',
+	14	name='home_bus',
+	15	field=models.PositiveSmallIntegerField(null=True),
+	16	),
+	17	migrations.AlterField(
+	18	model_name='user',
+	19	name='study_bus',
+	20	field=models.PositiveSmallIntegerField(null=True),
+	21	),
+	22	migrations.AlterField(
+	23	model_name='user',
+	24	name='titularis_bus',
+	25	field=models.PositiveSmallIntegerField(null=True),
+	26	),
+	27	migrations.AlterField(
+	28	model_name='user',
+	29	name='titularis_country',
+	30	field=models.CharField(max_length=64, null=True),
+	31	),
+	32	migrations.AlterField(
+	33	model_name='user',
+	34	name='titularis_number',
+	35	field=models.PositiveSmallIntegerField(null=True),
+	36	),
+	37	migrations.AlterField(
+	38	model_name='user',
+	39	name='titularis_postal_code',
+	40	field=models.PositiveSmallIntegerField(null=True),
+	41	),
+	42	migrations.AlterField(
+	43	model_name='user',
+	44	name='titularis_street',
+	45	field=models.CharField(max_length=64, null=True),
+	46	),
+	47	migrations.AlterField(
+	48	model_name='user',
+	49	name='titularis_telephone',
+	50	field=models.CharField(help_text='The telephone number of the titularis. Prefix 0 can be presented with the national call code in the system.', max_length=64, null=True),
+	51	),
+	52	]
+	53

administration/migrations/0007_auto_20171121_2018.py ¶

80 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.conf import settings
+	3	from django.db import migrations, models
+	4	import django.db.models.deletion
+	5
+	6
+	7	class Migration(migrations.Migration):
+	8
+	9	dependencies = [
+	10	('administration', '0006_auto_20171121_1924'),
+	11	]
+	12
+	13	operations = [
+	14	migrations.AlterField(
+	15	model_name='curriculum',
+	16	name='student',
+	17	field=models.ForeignKey(limit_choices_to={'is_student': True}, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique_for_year='year'),
+	18	),
+	19	migrations.AlterField(
+	20	model_name='degree',
+	21	name='DOB',
+	22	field=models.DateField(),
+	23	),
+	24	migrations.AlterField(
+	25	model_name='degree',
+	26	name='POB',
+	27	field=models.CharField(max_length=64),
+	28	),
+	29	migrations.AlterField(
+	30	model_name='degree',
+	31	name='achieved',
+	32	field=models.DateField(),
+	33	),
+	34	migrations.AlterField(
+	35	model_name='degree',
+	36	name='additional_names',
+	37	field=models.CharField(blank=True, max_length=64),
+	38	),
+	39	migrations.AlterField(
+	40	model_name='degree',
+	41	name='study',
+	42	field=models.CharField(max_length=64),
+	43	),
+	44	migrations.AlterField(
+	45	model_name='preregistration',
+	46	name='DOB',
+	47	field=models.DateField(help_text='Your date of birth.'),
+	48	),
+	49	migrations.AlterField(
+	50	model_name='preregistration',
+	51	name='POB',
+	52	field=models.CharField(help_text='The place you were born.', max_length=64),
+	53	),
+	54	migrations.AlterField(
+	55	model_name='roomreservation',
+	56	name='reservator',
+	57	field=models.ForeignKey(help_text='The person that made the reservation (and thus responsible).', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+	58	),
+	59	migrations.AlterField(
+	60	model_name='roomreservation',
+	61	name='room',
+	62	field=models.ForeignKey(help_text='The room that is being reserved at this point.', limit_choices_to={'reservable': True}, on_delete=django.db.models.deletion.CASCADE, to='administration.Room'),
+	63	),
+	64	migrations.AlterField(
+	65	model_name='user',
+	66	name='DOB',
+	67	field=models.DateField(help_text='The date of birth of this user.'),
+	68	),
+	69	migrations.AlterField(
+	70	model_name='user',
+	71	name='POB',
+	72	field=models.CharField(help_text='The place of birth of this user.', max_length=64),
+	73	),
+	74	migrations.AlterField(
+	75	model_name='user',
+	76	name='national_registry_number',
+	77	field=models.BigIntegerField(help_text='The assigned national registry number of this user.', unique=True),
+	78	),
+	79	]
+	80

administration/models.py ¶

21 additions and 24 deletions.

View changes Hide changes

from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import AbstractUser
import datetime
import os
import uuid

def validate_IBAN(value):
    """ Validates if the given value qualifies as a valid IBAN number.
    This validator checks if the structure is valid, and calculates the control
    number if the structure is correct. If the control number fails, or the
    structure is invalid, a ValidationError will be raised. In that case,
    the Error will specify whether the structure is incorrect, or the control
    number is not valid.
    """
    # FIXME: This function is not complete. When there's time, implement
    # as specified at https://nl.wikipedia.org/wiki/International_Bank_Account_Number#Structuur
    if False:
        raise ValidationError(
            _('%(value)s is not a valid IBAN number.'),
            params={'value': value},)
def validate_BIC(value):
    """ Same functionality as validate_IBAN, but for BIC-codes. """
    # FIXME: This function is not complete. When there's time, implement
    # as specified at https://nl.wikipedia.org/wiki/Business_Identifier_Code
    pass

class User(AbstractUser):
    """ Replacement for the standard Django User model. """
    number = models.AutoField(
        primary_key=True,
        help_text=_("The number assigned to this user."),
        )
    created = models.DateField(auto_now_add=True)
    passphrase = models.CharField(
        max_length=512,
        blank=False,
        help_text=_("The passphrase used for this account. This field must only contain hashed information."),
        )
    first_name = models.CharField(max_length=64, blank=False)
    last_name = models.CharField(max_length=64, blank=False)
    title = models.CharField(
        max_length=64,
        blank=True,
        help_text=_("The academic title of this user, if applicable."),
        )
    DOB = models.DateField(
        blank=False,
        editable=False,
        help_text=_("The date of birth of this user."),
        help_text=_("The date of birth of this user."),
        )
    POB = models.CharField(
        max_length=64,
        blank=False,
        editable=False,
        help_text=_("The place of birth of this user."),
        help_text=_("The place of birth of this user."),
        )
    nationality = models.CharField(
        max_length=64,
        blank=False,
        help_text=_("The current nationality of this user."),
        )
    # XXX: What if this starts with zeros?
    national_registry_number = models.BigIntegerField(
        unique=True,
        editable=False,
        help_text=_("The assigned national registry number of this user."),
        help_text=_("The assigned national registry number of this user."),
        )
    civil_status = models.CharField(
        max_length=32,
        choices = (
            ("Single", _("Single")),
            ("Married", _("Married")),
            ("Divorced", _("Divorced")),
            ("Widowed", _("Widowed")),
            ("Partnership", _("Partnership")),
            ),
        blank=False,
        # There may be more; consult http://www.aantrekkingskracht.com/trefwoord/burgerlijke-staat
        # for more information.
        help_text=_("The civil/marital status of the user."),
        )

    is_staff = models.BooleanField(
        default=False,
        help_text=_("Determines if this user is part of the university's staff."),
        )
    is_student = models.BooleanField(
        default=True,
        help_text=_("Indicates if this user is a student at the university."),
        )

    # Home address
    home_street = models.CharField(max_length=64, blank=False)
    home_number = models.PositiveSmallIntegerField(blank=False)
    home_bus = models.PositiveSmallIntegerField()
    home_postal_code = models.PositiveSmallIntegerField(blank=False)
    home_postal_code = models.PositiveSmallIntegerField(blank=False)
    home_country = models.CharField(max_length=64, blank=False)
    home_telephone = models.CharField(
        max_length=64,
        help_text=_("The telephone number for the house address. Prefix 0 can be presented with the national call code in the system."),
        )
    # Study address
    study_street = models.CharField(max_length=64, blank=False)
    study_number = models.PositiveSmallIntegerField(blank=False)
    study_bus = models.PositiveSmallIntegerField()
    study_postal_code = models.PositiveSmallIntegerField(blank=False)
    study_postal_code = models.PositiveSmallIntegerField(blank=False)
    study_country = models.CharField(max_length=64, blank=False)
    study_telephone = models.CharField(
        max_length=64,
        help_text=_("The telephone number for the study address. Prefix 0 can be presented with the national call code in the system."),
        )
    study_cellphone = models.CharField(
        max_length=64,
        help_text=_("The cellphone number of the person. Prefix 0 can be presented with then national call code in the system."),
        )
    # Titularis address
    # XXX: These fields are only required if this differs from the user itself.
    titularis_street = models.CharField(max_length=64)
    titularis_number = models.PositiveSmallIntegerField()
    titularis_bus = models.PositiveSmallIntegerField()
    titularis_postal_code = models.PositiveSmallIntegerField()
    titularis_country = models.CharField(max_length=64)
    titularis_telephone = models.CharField(
    titularis_number = models.PositiveSmallIntegerField(null=True)
    titularis_bus = models.PositiveSmallIntegerField(null=True)
    titularis_postal_code = models.PositiveSmallIntegerField(null=True)
    titularis_country = models.CharField(max_length=64, null=True)
    titularis_telephone = models.CharField(
        max_length=64,
        help_text=_("The telephone number of the titularis. Prefix 0 can be presented with the national call code in the system."),
        )
        )

    # Financial details
    bank_account_number = models.CharField(
        max_length=34,  # Max length of all IBAN account numbers
        validators=[validate_IBAN],
        help_text=_("The IBAN of this user. No spaces!"),
        )
    BIC = models.CharField(
        max_length=11,
        validators=[validate_BIC],
        help_text=_("The BIC of this user's bank."),
        )

""" NOTE: What about all the other features that should be in the administration?
While there are a lot of things to cover, as of now, I have no way to know which
ones are still valid, which are deprecated, and so on...
Additionally, every feature may have a different set of requirements, data,
and it's very likely making an abstract class won't do any good. Thus I have
decided to postpone making additional tables and forms for these features until
I have clearance about certain aspects. """

class Curriculum(models.Model):
    """ The curriculum of a particular student.
    Every academic year, a student has to hand in a curriculum (s)he wishes to
    follow. This is then reviewed by a committee. A curriculum exists of all the
    courses one wants to partake in in a certain year. """
    student = models.ForeignKey(
        "User",
        on_delete=models.CASCADE,
        limit_choices_to={'is_student': True},
        null=False,
        editable=False,
        unique_for_year="year",  # Only 1 curriculum per year
        unique_for_year="year",  # Only 1 curriculum per year
        )
    year = models.DateField(
        auto_now_add=True,
        db_index=True,
        help_text=_("The academic year for which this curriculum is."),
        )
    last_modified = models.DateTimeField(
        auto_now=True,
        help_text=_("The last timestamp that this was updated."),
        )
    courses = models.ManyToManyField(
        "courses.Course",
        null=False,
        help_text=_("All the courses included in this curriculum."),
        )
    approved = models.NullBooleanField(
        default=None,
        help_text=_("Indicates if this curriculum has been approved. If true, "
                    "that means the responsible committee has reviewed and "
                    "approved the student for this curriculum. False otherwise. "
                    "If review is still pending, the value is NULL. Modifying "
                    "the curriculum implies this setting is set to NULL again."),
        )
    note = models.TextField(
        blank=True,
        help_text=_("Additional notes regarding this curriculum. This has "
                    "multiple uses. For the student, it is used to clarify "
                    "any questions, or to motivate why (s)he wants to take a "
                    "course for which the requirements were not met. "
                    "The reviewing committee can use this field to argument "
                    "their decision, especially for when the curriculum is "
                    "denied."),
        )

    def curriculum_type(self):
        """ Returns the type of this curriculum. At the moment, this is
        either a standard programme, or an individualized programme. """
        # Currently: A standard programme means: All courses are from the
        # same study, ánd from the same year. Additionally, all courses
        # from that year must've been taken.
        # FIXME: Need a way to determine what is the standard programme.
        # If not possible, make this a charfield with options or something
        pass

    def __str__(self):
        year = self.year.year
        if self.year.month < 7:
            return str(self.student) +" | "+ str(year-1) +"-"+ str(year)
        else:
            return str(self.student) +" | "+ str(year) +"-"+ str(year+1)


class CourseResult(models.Model):
    """ A student has to obtain a certain course result. These are stored here,
    together with all the appropriate information. """
    # TODO: Validate that a course programme for a student can only be made once per year for each course, if possible.
    CRED = _("Credit acquired")
    FAIL = _("Credit not acquired")
    TLRD = _("Tolerated")
    ITLD = _("Tolerance used")
    # Possible to add more in the future

    student = models.ForeignKey(
        "User",
        on_delete=models.CASCADE,
        limit_choices_to={'is_student': True},
        null=False,
        )
    course_programme = models.ForeignKey(
        "courses.ProgrammeInformation",
        on_delete=models.PROTECT,
        null=False,
        )
    released = models.DateField(
        auto_now=True,
        help_text=_("The date that this result was last updated."),
        )
    first_score = models.PositiveSmallIntegerField(
        null=True,  # It's possible a score does not exist.
        validators=[MaxValueValidator(
            20,
            _("The score mustn't be higher than 20."),
            )],
        )
    second_score = models.PositiveSmallIntegerField(
        null=True,
        validators=[MaxValueValidator(
            20,
            _("The score mustn't be higher than 20."),
            )],
        )
    result = models.CharField(
        max_length=10,
        choices = (
            ("CRED", CRED),
            ("FAIL", FAIL),
            ("TLRD", TLRD),
            ("ITLD", ITLD),
            ),
        blank=False,
        help_text=_("The final result this record constitutes."),
        )

    def __str__(self):
        stdnum = str(self.student.number)
        result = self.result
        if result == "CRED":
            if self.first_score < 10:
                result = "C" + self.first_score + "1"
            else:
                result = "C" + self.second_score + "2"
        course = str(self.course_programme.course)
        return stdnum +" ("+ result +") | "+ course

class PreRegistration(models.Model):
    """ At the beginning of the new academic year, students can register
    themselves at the university. Online, they can do a preregistration already.
    These records are stored here and can later be retrieved for the actual
    registration process.
    Note: The current system in use at Hasselt University provides a password system.
    That will be eliminated here. Just make sure that the entered details are correct.
    Should there be an error, and the same email address is used to update something,
    a mail will be sent to that address to verify this was a genuine update."""
    created = models.DateField(auto_now_add=True)
    first_name = models.CharField(max_length=64, blank=False, help_text=_("Your first name."))
    last_name = models.CharField(max_length=64, blank=False, help_text=_("Your last name."))
    additional_names = models.CharField(max_length=64, blank=True, help_text=_("Any additional names."))
    title = models.CharField(
        max_length=64,
        blank=True,
        help_text=_("Any additional titles, prefixes, ..."),
        )
    DOB = models.DateField(
        blank=False,
        editable=False,
        help_text=_("Your date of birth."),
        help_text=_("Your date of birth."),
        )
    POB = models.CharField(
        max_length=64,
        blank=False,
        editable=False,
        help_text=_("The place you were born."),
        help_text=_("The place you were born."),
        )
    nationality = models.CharField(
        max_length=64,
        blank=False,
        help_text=_("Your current nationality."),
        )
    national_registry_number = models.BigIntegerField(
        null=True,
        help_text=_("If you have one, your national registry number."),
        )
    civil_status = models.CharField(
        max_length=32,
        choices = (
            ("Single", _("Single")),
            ("Married", _("Married")),
            ("Divorced", _("Divorced")),
            ("Widowed", _("Widowed")),
            ("Partnership", _("Partnership")),
            ),
        blank=False,
        # There may be more; consult http://www.aantrekkingskracht.com/trefwoord/burgerlijke-staat
        # for more information.
        help_text=_("Your civil/marital status."),
        )
    email = models.EmailField(
        blank=False,
        unique=True,
        help_text=_("The e-mail address we will use to communicate until your actual registration."),
        )
    study = models.ForeignKey(
        "courses.Study",
        on_delete=models.PROTECT,
        null=False,
        help_text=_("The study you wish to follow. Be sure to provide all legal"
                    "documents that are required for this study with this "
                    "application, or bring them with you to the final registration."),
        )
    study_type = models.CharField(
        max_length=32,
        choices = (
            ("Diplom contract", _("Diplom contract")),
            ("Exam contract", _("Exam contract")),
            ("Credit contract", _("Credit contract")),
            ),
        blank=False,
        help_text=_("The type of study contract you wish to follow."),
        )
    document = models.FileField(
        upload_to="pre-enrollment/%Y",
        help_text=_("Any legal documents regarding your enrollment."),
        )
    # XXX: If the database in production is PostgreSQL, comment document, and
    # uncomment the next column.
    """documents = models.ArrayField(
        models.FileField(upload_to="pre-enrollment/%Y"),
        help_text=_("Any legal documents regarding your enrollment."),
        )"""

    def __str__(self):
        name = self.last_name +" "+ self.first_name
        dob = self.DOB.strftime("%d/%m/%Y")
        return name +" | "+ dob


# Planning and organization related tables
class Room(models.Model):
    """ Represents a room in the university.
    Rooms can have a number of properties, which are stored in the database.
    """
    # Types of rooms
    LABORATORY = _("Laboratory")  # Chemistry/Physics equipped rooms
    CLASS_ROOM = _("Class room")  # Simple class rooms
    AUDITORIUM = _("Auditorium")  # Large rooms with ample seating and equipment for lectures
    PC_ROOM    = _("PC room"   )  # Rooms equipped for executing PC related tasks
    PUBLIC_ROOM= _("Public room") # Restaurants, restrooms, ... general public spaces
    OFFICE     = _("Office"    )  # Private offices for staff
    PRIVATE_ROOM = _("Private room")  # Rooms accessible for a limited public; cleaning cupboards, kitchens, ...
    WORKSHOP   = _("Workshop"  )  # Rooms with hardware equipment to build and work on materials
    OTHER      = _("Other"     )  # Rooms that do not fit in any other category


    name = models.CharField(
        max_length=20,
        primary_key=True,
        blank=False,
        help_text=_("The name of this room. If more appropriate, this can be the colloquial name."),
        )
    seats = models.PositiveSmallIntegerField(
        help_text=_("The amount of available seats in this room. This can be handy for exams for example."),
        )
    wheelchair_accessible = models.BooleanField(default=True)
    exams_equipped = models.BooleanField(
        default=True,
        help_text=_("Indicates if exams can reasonably be held in this room."),
        )
    computers_available = models.PositiveSmallIntegerField(
        default=False,
        help_text=_("Indicates how many computers are available in this room."),
        )
    projector_available = models.BooleanField(
        default=False,
        help_text=_("Indicates if a projector is available at this room."),
        )
    blackboards_available = models.PositiveSmallIntegerField(
        help_text=_("The amount of blackboards available in this room."),
        )
    whiteboards_available = models.PositiveSmallIntegerField(
        help_text=_("The amount of whiteboards available in this room."),
        )
    category = models.CharField(
        max_length=16,
        blank=False,
        choices = (
            ("LABORATORY", LABORATORY),
            ("CLASS_ROOM", CLASS_ROOM),
            ("AUDITORIUM", AUDITORIUM),
            ("PC_ROOM", PC_ROOM),
            ("PUBLIC_ROOM", PUBLIC_ROOM),
            ("OFFICE", OFFICE),
            ("PRIVATE_ROOM", PRIVATE_ROOM),
            ("WORKSHOP", WORKSHOP),
            ("OTHER", OTHER),
            ),
        help_text=_("The category that best suits the character of this room."),
        )
    reservable = models.BooleanField(
        default=True,
        help_text=_("Indicates if this room can be reserved for something."),
        )
    note = models.TextField(
        blank=True,
        help_text=_("If some additional info is required for this room, like a "
                    "characteristic property (e.g. 'Usually occupied by 2BACH "
                    "informatics'), state it here."),
        )
    # TODO: Add a campus/building field or not?

    def reservation_possible(self, begin, end, seats=None):
        """ Returns a boolean indicating if reservating during the given time
        is possible. If the begin overlaps with a reservation's end or vice versa,
        this is regarded as possible.
        Takes seats as optional argument. If not specified, it is assumed the entire
        room has to be reserved. """
        if self.reservable is False:
            return False
        if seats is not None and seats < 0: raise ValueError(_("seats ∈ ℕ"))

        reservations = RoomReservation.objects.filter(room=self)
        for reservation in reservations:
            if reservation.end <= begin or reservation.begin >= end:
                continue  # Can be trivially skipped, no overlap here
            elif seats is None or reservation.seats is None:
                return False  # The whole room cannot be reserved -> False
            elif seats + reservation.seats > self.seats:
                    return False  # Total amount of seats exceeds the available amount -> False
        return True  # No overlappings found -> True

    def __str__(self):
        return self.name

class RoomReservation(models.Model):
    """ Rooms are to be reserved from time to time. They can be reserved
    by externals, for something else, and whatnot. That is stored in this table.
    """
    room = models.ForeignKey(
        "Room",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        db_index=True,
        db_index=True,
        limit_choices_to={"reservable": True},
        help_text=_("The room that is being reserved at this point."),
        )
    reservator = models.ForeignKey(
        "User",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        help_text=_("The person that made the reservation (and thus responsible)."),
        help_text=_("The person that made the reservation (and thus responsible)."),
        )
    timestamp = models.DateTimeField(auto_now_add=True)
    start_time = models.DateTimeField(
        null=False,
        help_text=_("The time that this reservation starts."),
        )
    end_time = models.DateTimeField(
        null=False,
        help_text=_("The time that this reservation ends."),
        )
    seats = models.PositiveSmallIntegerField(
        null=True,
        help_text=_("Indicates how many seats are required. If this is left null, "
                    "it is assumed the entire room has to be reserved."),
        )
    reason = models.CharField(
        max_length=64,
        blank=True,
        help_text=_("The reason for this reservation, if useful."),
        )
    note = models.TextField(
        blank=True,
        help_text=_("If some additional info is required for this reservation, "
                    "state it here."),
        )

    def __str__(self):
        start = self.start_time.strftime("%H:%M")
        end = self.end_time.strftime("%H:%M")
        return str(self.room) +" | "+ start +"-"+ end

class Degree(models.Model):
    """ Contains all degrees that were achieved at this university.
    There are no foreign keys in this field. This allows system
    administrators to safely remove accounts from alumni, without
    the risk of breaking referential integrity or accidentally removing
    degrees.
    While keeping some fields editable that look like they shouldn't be
    (e.g. first_name), this makes it possible for alumni to have a name change
    later in their life, and still being able to get a copy of their degree. """
    """ Reason for an ID field for every degree:
    This system allows for employers to verify that a certain applicant has indeed,
    achieved the degrees (s)he proclaims to have. Because of privacy concerns,
    a university cannot disclose information about alumni.
    That's where the degree ID comes in. This ID can be printed on all future
    degrees. The employer can then visit the university's website, and simply
    enter the ID. The website will then simply print what study is attached to
    this degree, but not disclose names or anything identifiable. This strikes
    thé perfect balance between (easy and digital) degree verification for employers, and maintaining
    alumni privacy to the highest extent possible. """
    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
    first_name = models.CharField(
        max_length=64,
        blank=False,
        )
    last_name = models.CharField(
        max_length=64,
        blank=False,
        )
    additional_names = models.CharField(
        max_length=64,
        )
        )
    DOB = models.DateField(editable=False, null=False)  # This can't be changed, of course
    POB = models.CharField(
    POB = models.CharField(
        max_length=64,
        blank=False,
        editable=False,
        )
        )
    # The study also has to be a charfield, because if a study is removed,
    # The information will be lost.
    study = models.CharField(
        max_length=64,
        blank=False,
        editable=False,
        )
        )
    achieved = models.DateField(editable=False, null=False)
    user = models.ForeignKey(
    user = models.ForeignKey(
        "User",
        on_delete=models.SET_NULL,
        null=True,
        help_text=_("The person that achieved this degree, if (s)he still has "
                    "an account at this university. If the account is deleted "
                    "at a later date, this field will be set to NULL, but the "
                    "other fields will be retained."),
        )

    def __str__(self):
        return self.first_name +" "+ self.last_name +" | "+ self.study


agora/forms.py ¶

4 additions and 0 deletions.

View changes Hide changes

+	1	from crispy_forms.layout import Submit
+	2	# See https://django-crispy-forms.readthedocs.io/en/latest/crispy_tag_forms.html
+	3	# for more information
+	4

agora/migrations/0003_auto_20171121_1906.py ¶

28 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.db import migrations, models
+	3	import django.db.models.deletion
+	4
+	5
+	6	class Migration(migrations.Migration):
+	7
+	8	dependencies = [
+	9	('agora', '0002_auto_20171118_2203'),
+	10	]
+	11
+	12	operations = [
+	13	migrations.RemoveField(
+	14	model_name='accountsettings',
+	15	name='id',
+	16	),
+	17	migrations.AlterField(
+	18	model_name='accountsettings',
+	19	name='account',
+	20	field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='agora.Account'),
+	21	),
+	22	migrations.AlterField(
+	23	model_name='post',
+	24	name='response_to',
+	25	field=models.ForeignKey(editable=False, help_text='The post to which this was a response, if applicable.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='responses', to='agora.Post'),
+	26	),
+	27	]
+	28

agora/migrations/0004_auto_20171121_2018.py ¶

94 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.db import migrations, models
+	3	import django.db.models.deletion
+	4
+	5
+	6	class Migration(migrations.Migration):
+	7
+	8	dependencies = [
+	9	('agora', '0003_auto_20171121_1906'),
+	10	]
+	11
+	12	operations = [
+	13	migrations.AlterField(
+	14	model_name='accountcollection',
+	15	name='account',
+	16	field=models.ForeignKey(help_text='The account that created this collection.', on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	17	),
+	18	migrations.AlterField(
+	19	model_name='filepost',
+	20	name='file',
+	21	field=models.FileField(help_text='The file you wish to share.', upload_to='agora/posts/%Y/%m/%d/'),
+	22	),
+	23	migrations.AlterField(
+	24	model_name='groupchat',
+	25	name='group',
+	26	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agora.Group'),
+	27	),
+	28	migrations.AlterField(
+	29	model_name='groupinvite',
+	30	name='group',
+	31	field=models.ForeignKey(help_text='The group for which this invitation is.', on_delete=django.db.models.deletion.CASCADE, to='agora.Group'),
+	32	),
+	33	migrations.AlterField(
+	34	model_name='groupinvite',
+	35	name='invitee',
+	36	field=models.ForeignKey(help_text='The account which will receive the invitation.', on_delete=django.db.models.deletion.CASCADE, related_name='invitee', to='agora.Account'),
+	37	),
+	38	migrations.AlterField(
+	39	model_name='groupinvite',
+	40	name='inviter',
+	41	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	42	),
+	43	migrations.AlterField(
+	44	model_name='message',
+	45	name='sender',
+	46	field=models.ForeignKey(help_text='The account that sent this message.', on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	47	),
+	48	migrations.AlterField(
+	49	model_name='post',
+	50	name='author',
+	51	field=models.ForeignKey(help_text='The authoring account of this post.', on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	52	),
+	53	migrations.AlterField(
+	54	model_name='post',
+	55	name='placed_on',
+	56	field=models.ForeignKey(help_text='The page on which this post was placed.', on_delete=django.db.models.deletion.CASCADE, to='agora.Page'),
+	57	),
+	58	migrations.AlterField(
+	59	model_name='post',
+	60	name='response_to',
+	61	field=models.ForeignKey(help_text='The post to which this was a response, if applicable.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='responses', to='agora.Post'),
+	62	),
+	63	migrations.AlterField(
+	64	model_name='privatechat',
+	65	name='account1',
+	66	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	67	),
+	68	migrations.AlterField(
+	69	model_name='privatechat',
+	70	name='account2',
+	71	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='correspondent', to='agora.Account'),
+	72	),
+	73	migrations.AlterField(
+	74	model_name='sharedfile',
+	75	name='file',
+	76	field=models.FileField(help_text='The file you want to share.', upload_to='agora/chat/%Y/%m/%d/'),
+	77	),
+	78	migrations.AlterField(
+	79	model_name='sharedfile',
+	80	name='uploader',
+	81	field=models.ForeignKey(help_text='The account that uploaded this file.', on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	82	),
+	83	migrations.AlterField(
+	84	model_name='vote',
+	85	name='post',
+	86	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agora.Post'),
+	87	),
+	88	migrations.AlterField(
+	89	model_name='vote',
+	90	name='voter',
+	91	field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agora.Account'),
+	92	),
+	93	]
+	94

agora/models.py ¶

22 additions and 16 deletions.

View changes Hide changes

from django.utils.translation import ugettext_lazy as _
from joeni import constants

def validate_hex_color(value):
    pass  # TODO

class Account(models.Model):
    user = models.OneToOneField(
        'administration.User',
        on_delete=models.CASCADE,
        primary_key=True,
        )
    alias = models.CharField(max_length=64, unique=True)

    def __str__(self):
        return self.alias

def account_user_directory(instance, filename):
    return '{0}/account/settings/{1}'.format(instace.account.alias, filename)

class AccountSettings(models.Model):
    account = models.OneToOneField(
        'Account',
        on_delete=models.CASCADE,
        )
        )
    # TODO: Build validator for primary_color to make sure what is given is a
    # valid hexadecimal RGB value.
    color = models.CharField(
        max_length=6,
        help_text=_("The hexadecimal code of the color for this account."),
        default = constants.COLORS["UHasselt default"],
        blank=False,
        validators=[validate_hex_color],
        )
    account_page_banner = models.ImageField(  # Requires the Pillow library!
        upload_to=account_user_directory,
        help_text=_("The banner image to be shown on this account's homepage."),
        )
    avatar = models.ImageField(
        upload_to=account_user_directory,
        help_text=_("The avatar image of this account."),
        )

    def __str__(self):
        return str(self.account)

class Post(models.Model):
    timestamp = models.DateTimeField(auto_now_add=True)
    title = models.CharField(
        max_length=64,
        blank=True,
        help_text=_("The title for this post."),
        )
    text = models.TextField(
        blank=True,
        help_text=_("A text message for this post. May be left blank."),
        )
    author = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,  # There must be an author
        editable=False,  # It makes no sense to change the author after creation
        help_text=_("The authoring account of this post."),
        help_text=_("The authoring account of this post."),
        )
    response_to = models.ForeignKey(
        "self",
        on_delete=models.CASCADE,
        null=True,  # If this is null, this post is not a response, but a beginning post
        editable=False,  # This cannot be changed after creation, wouldn't make sense
        help_text=_("The post to which this was a response, if applicable."),
        related_name="responses",
        help_text=_("The post to which this was a response, if applicable."),
        )
    placed_on = models.ForeignKey(
        "Page",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        help_text=_("The page on which this post was placed."),
        help_text=_("The page on which this post was placed."),
        )
    # Voting fields
    allow_votes = models.BooleanField(
        default=True,
        help_text=_("Decide whether to allow voting or disable it for this post."),
        )
    allow_responses = models.BooleanField(
        default=True,
        help_text=_("Decide if other people can respond to this post or not. "
                    "This does not influence what people allow on their posts."),
        )

    def __str__(self):
        """ Return how many votes this post has. """
        return len(Vote.objects.filter(post=self))

    def __str__(self):
        return str(self.timestamp) + " | " + str(self.author)
    # TODO Add a way to attach geographical data to a post, which could
    # then be used with OpenStreetMap or something

class FilePost(Post):
    """ A special type of Post, which has a file linked with it.
    The poster can specify how to treat this file. """
    image = _("Image")
    video = _("Video")
    music = _("Sound")
    text  = _("Text" )
    other = _("Other")
    file = models.FileField(
        upload_to="agora/posts/%Y/%m/%d/",
        null=False,
        editable=False,
        help_text=_("The file you wish to share."),
        help_text=_("The file you wish to share."),
        )
    file_type = models.CharField(
        max_length=16,
        blank=False,
        choices = (
            ('image', image),
            ('video', video),
            ('music', music),
            ('text' , text ),
            ('other', other),
            ),
        help_text=_("How this file should be seen as."),
        )

class Page(models.Model):
    """ In the university, people can create pages for everything they want and
    then some. These pages are put in the database through this table. """
    name = models.CharField(
        max_length=64,
        primary_key=True,
        blank=False,
        help_text=_("The name of this page."),
        )
    created = models.DateTimeField(auto_now_add=True)
    hidden = models.BooleanField(
        default=False,
        help_text=_("Determines if this page can be found without a direct link."),
        )
    main_content = models.TextField(
        blank=True,
        help_text=_("If you want to put some text on this page, "
                    "you can put it here. You can use Orgmode-syntax to "
                    "get as much out of your page as possible. While doing so, "
                    "be aware of the limitations imposed by the code of conduct."),
        )
    public_posting = models.BooleanField(
        default=True,
        help_text=_("Determines if everyone can post on this page, or only the "
                    "people that are linked with it. Know that if a post is made "
                    "and responding is allowed, everyone can respond to that post."),
        )

    """class Meta:
        abstract=True"""
    """ I've disabled the abstraction, because otherwise I can't relate a Post to a Page. """

class AccountPage(Page):
    """ Every account has its own homepage. This is that page.
    This page can only be edited by the account holder, or staff members. """
    # TODO: Find a way to auto-create one of these every time a new account is created
    # TODO: Require that changes can only occur by either the account holder or staff
    account = models.OneToOneField(
        "Account",
        null=False,
        on_delete=models.CASCADE,
        )

class GroupPage(Page):
    """ A page where a group can present itself to the university.
    This page can only be edited by group members or staff members. """
    # TODO: Find a way to auto-create one of these every time a new group is created
    # TODO: Require that changes can only occur by either the group or staff
    group = models.ForeignKey(
        "Group",
        null=False,
        on_delete=models.CASCADE,
        )

class CoursePage(Page):
    """ A page that serves as a course's main entry point.
    This page can only be edited by the course's educating team or staff members. """
    # TODO: Find a way to auto-create one of these every time a new course is created
    # TODO: Require that changes can only occur by either the course team or staff
    course = models.OneToOneField(
        "courses.Course",
        null=False,
        on_delete=models.CASCADE,
        )

class Group(models.Model):
    """ It is imperative that everyone can come together with other people.
    A Group record is the way to accomplish this. """
    name = models.CharField(
        max_length=64,
        primary_key=True,  # So be unique I'd say
        blank=False,
        help_text=_("The name of your group."),
        )
    color = models.CharField(
        max_length=6,
        help_text=_("The hexadecimal code of the color for this group."),
        default = constants.COLORS["UHasselt default"],
        blank=False,
        validators=[validate_hex_color],
        )
    members = models.ManyToManyField(
        "Account",
        help_text=_("The members of this group."),
        )
    invite_only = models.BooleanField(
        default=True,
        help_text=_("Determines if everyone can join this group, or if "
                    "only members can invite others."),
        )
    private = models.BooleanField(
        default=True,
        help_text=_("Determines if this group is visible to non-members."),
        )

    def __str__(self):
        return self.name


class AccountCollection(models.Model):
    """ Every account can make a collection in which (s)he can list accounts
    at his/her wish. This can be a collection of Friends, study collegues,
    project partners, and so on.
    Accounts that are in a certain collection are not notified of this.
    However, there is one exception:
    If both accounts have a collection named "Friends" (or the localized
    equivalent), and both feature each other in that collection, then
    this is shared between the two accounts. """
    account = models.ForeignKey(
        "Account",
        null=False,
        editable=False,
        on_delete=models.CASCADE,
        on_delete=models.CASCADE,
        help_text=_("The account that created this collection."),
        )
    name = models.CharField(
        max_length=32,
        blank=False,
        help_text=_("The name of this collection."),
        )
    accounts = models.ManyToManyField(
        "Account",
        help_text=_("All accounts that are part of this collection."),
        related_name="in_collection",
        )
    visible_to_public = models.BooleanField(
        default=False,
        help_text=_("Make this collection visible to everybody."),
        )
    visible_to_collection = models.BooleanField(
        default=True,
        help_text=_("Make this collection visible to the accounts in this collection. Other collections are not affected by this."),
        )

    def __str__(self):
        return str(self.account) + " | " + self.name

class Vote(models.Model):
    """ Accounts can vote on posts (using ▲, which is funny because UHasselt).
    These votes are registered in this table. """
    voter = models.ForeignKey(
        "Account",
        null=False,
        editable=False,
        on_delete=models.CASCADE,
        on_delete=models.CASCADE,
        )
    post = models.ForeignKey(
        "Post",
        null=False,  # Duh.
        editable=False,  # Transferring votes doesn't make sense
        on_delete=models.CASCADE,
        on_delete=models.CASCADE,
        )

class SharedFile(models.Model):
    """ Groups and people can share files with each other, through a chat system.
    These files are represented here. """
    timestamp = models.DateTimeField(auto_now_add=True)
    file = models.FileField(
        upload_to="agora/chat/%Y/%m/%d/",
        null=False,
        editable=False,
        help_text=_("The file you want to share."),
        help_text=_("The file you want to share."),
        )
    uploader = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        help_text=_("The account that uploaded this file."),
        help_text=_("The account that uploaded this file."),
        )
    # TODO __str__ ... or maybe not?

class Message(models.Model):
    """ Everyone can communicate with someone else using private messages.
    These messages are recorded here. """
    timestamp = models.DateTimeField(auto_now_add=True)
    text = models.TextField(
        blank=False,
        )
    sender = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        help_text=_("The account that sent this message."),
        help_text=_("The account that sent this message."),
        )
    # TODO __str__


class Chat(models.Model):
    """ Chats can happen between a group, or between two people in private.
    These messages are connected to a particular chat. """
    messages = models.ManyToManyField(
        "Message",
        help_text=_("All messages that were shared in this chat."),
        )
    shared_files = models.ManyToManyField(
        "SharedFile",
        help_text=_("The files that are shared in this chat."),
        )
    class Meta:
        abstract=True

class GroupChat(Chat):
    """ Represents a chat of a group. """
    group = models.ForeignKey(
        "Group",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        )
        )

    def __str__(self):
        return str(self.group)

class PrivateChat(Chat):
    """ Represents a private chat between two accounts. """
    # FIXME: It's theoretically possible to start a chat by one person, and have
    # the other person start the same as well. Find a reliable way to block that.
    account1 = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        )
        )
    account2 = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        related_name="correspondent",
        related_name="correspondent",
        )

    def __str__(self):
        return str(self.account1) +" - "+ str(self.account2)

class GroupInvite(models.Model):
    """ Groups can send invites to other people to join the group, and this is
    not limited to private groups. Group invitations are stored here, as well as their outcome. """
    inviter = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        )
        )
    invitee = models.ForeignKey(
        "Account",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        help_text=_("The account which will receive the invitation."),
        help_text=_("The account which will receive the invitation."),
        related_name="invitee",
        )
    group = models.ForeignKey(
        "Group",
        on_delete=models.CASCADE,
        null=False,
        editable=False,
        db_index=True,
        db_index=True,
        help_text=_("The group for which this invitation is."),
        )
    accepted = models.NullBooleanField(
        default=None,
        help_text=_("Indicates if the invitation was accepted, rejected, or "
                    "pending an answer. if somebody rejects the invitation, "
                    "that group can no longer send an invitation to the invitee, "
                    "unless (s)he removes the answer from her history. Also, "
                    "a person can not reject an invitation, and accept it later. "
                    "For that, a new invitation must be received."),
        )

    def __str__(self):
        return str(self.invitee) +" | "+ str(self.group)


agora/templates/agora/post.djhtml ¶

51 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2	{% load humanize %}
+	3	{% load crispy_forms_tags %}
+	4	{% get_media_prefix as media %}
+	5
+	6
+	7	{{ post.author.alias }}
+	8
+	9	{{ post.timestamp\|naturaltime }}
+	10
+	11
+	12	{% if post.title %}
+	13	{{ post.title }}
+	14	{% endif %}
+	15
+	16	{% if post.text %}
+	17
+	18	{{ post.text\|safe }} {# Disable safe to enhance security #}
+	19
+	20	{% endif %}
+	21
+	22	{% if post.file %}
+	23	{% if post.file_type = "image" %}
+	24
+	25	{% elif post.file_type = "video" %}
+	26
+	27	{% elif post.file_type = "music" %}
+	28
+	29	{% else %} {# TODO text should be rendered a bit if possible #}
+	30	{% trans "Download file" %}
+	31	{% endif %}
+	32	{% endif %}
+	33
+	34	{% if post.allow_votes %}
+	35	▲ {{ post.votes }}
+	36
+	37	{% trans "Vote" %}
+	38
+	39	{% endif %}
+	40
+	41	{% if post.allow_responses %}
+	42	{% trans "Respond" %}
+	43
+	44	{% crispy agora-form-post %}
+	45	{% endif %}
+	46
+	47	{% for subpost in post.responses %}
+	48	{% include "agora/post.djhtml" with post=subpost %}
+	49	{% endfor %}
+	50
+	51

courses/migrations/0002_auto_20171121_2018.py ¶

50 additions and 0 deletions.

View changes Hide changes

+	1
+	2	from django.conf import settings
+	3	from django.db import migrations, models
+	4	import django.db.models.deletion
+	5
+	6
+	7	class Migration(migrations.Migration):
+	8
+	9	dependencies = [
+	10	('courses', '0001_initial'),
+	11	]
+	12
+	13	operations = [
+	14	migrations.AlterField(
+	15	model_name='announcement',
+	16	name='course',
+	17	field=models.ForeignKey(help_text='The course for which this announcement is made.', on_delete=django.db.models.deletion.CASCADE, to='courses.Course'),
+	18	),
+	19	migrations.AlterField(
+	20	model_name='assignment',
+	21	name='course',
+	22	field=models.ForeignKey(help_text='The course for which this task is assigned.', on_delete=django.db.models.deletion.CASCADE, to='courses.Course'),
+	23	),
+	24	migrations.AlterField(
+	25	model_name='studygroup',
+	26	name='course',
+	27	field=models.ForeignKey(help_text='The course for which this group is.', on_delete=django.db.models.deletion.CASCADE, to='courses.Course'),
+	28	),
+	29	migrations.AlterField(
+	30	model_name='studygroup',
+	31	name='group',
+	32	field=models.ForeignKey(help_text='The group that will be seen as the study group.', on_delete=django.db.models.deletion.PROTECT, to='agora.Group'),
+	33	),
+	34	migrations.AlterField(
+	35	model_name='upload',
+	36	name='assignment',
+	37	field=models.ForeignKey(help_text='For which assignment this upload is.', limit_choices_to={'digital_task': True}, on_delete=django.db.models.deletion.CASCADE, to='courses.Assignment'),
+	38	),
+	39	migrations.AlterField(
+	40	model_name='upload',
+	41	name='file',
+	42	field=models.FileField(help_text='The file you want to upload for this assignment.', upload_to='assignments/uploads/%Y/%m/'),
+	43	),
+	44	migrations.AlterField(
+	45	model_name='upload',
+	46	name='student',
+	47	field=models.ForeignKey(help_text='The student who handed this in.', limit_choices_to={'is_student': True}, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+	48	),
+	49	]
+	50

courses/models.py ¶

46 additions and 9 deletions.

View changes Hide changes

from django.utils.translation import ugettext_lazy as _

class Course(models.Model):
    """ Represents a course that is taught at the university. """
    number = models.PositiveSmallIntegerField(
        primary_key=True,
        blank=False,
        help_text=_("The number associated with this course. A leading '0' will be added if the number is smaller than 1000."),
        )
    name = models.CharField(
        max_length=64,
        blank=False,
        help_text=_("The name of this course, in the language that it is taught. Translations are for the appropriate template."),
        )
    contact_person = models.ForeignKey(
        blank=False,
        allow_unicode=True,
        unique=True,
        help_text=_("A so-called 'slug name' for this course."),
        )
    contact_person = models.ForeignKey(
        "administration.User",
        on_delete=models.PROTECT,  # A course must have a contact person
        limit_choices_to={'is_staff': 

1	1	from django.utils.translation import ugettext_lazy as _
2	2	from joeni import constants
3	3
4	4	def validate_hex_color(value):
5	5	pass # TODO
6	6
7	7	class Account(models.Model):
8	8	user = models.OneToOneField(
9	9	'administration.User',
10	10	on_delete=models.CASCADE,
11	11	primary_key=True,
12	12	)
13	13	alias = models.CharField(max_length=64, unique=True)
14	14
15	15	def __str__(self):
16	16	return self.alias
17	17
18	18	def account_user_directory(instance, filename):
19	19	return '{0}/account/settings/{1}'.format(instace.account.alias, filename)
20	20
21	21	class AccountSettings(models.Model):
22	22	account = models.OneToOneField(
23	23	'Account',
24	24	on_delete=models.CASCADE,
25	25	)
+	26	)
26	27	# TODO: Build validator for primary_color to make sure what is given is a
27	28	# valid hexadecimal RGB value.
28	29	color = models.CharField(
29	30	max_length=6,
30	31	help_text=_("The hexadecimal code of the color for this account."),
31	32	default = constants.COLORS["UHasselt default"],
32	33	blank=False,
33	34	validators=[validate_hex_color],
34	35	)
35	36	account_page_banner = models.ImageField( # Requires the Pillow library!
36	37	upload_to=account_user_directory,
37	38	help_text=_("The banner image to be shown on this account's homepage."),
38	39	)
39	40	avatar = models.ImageField(
40	41	upload_to=account_user_directory,
41	42	help_text=_("The avatar image of this account."),
42	43	)
43	44
44	45	def __str__(self):
45	46	return str(self.account)
46	47
47	48	class Post(models.Model):
48	49	timestamp = models.DateTimeField(auto_now_add=True)
49	50	title = models.CharField(
50	51	max_length=64,
51	52	blank=True,
52	53	help_text=_("The title for this post."),
53	54	)
54	55	text = models.TextField(
55	56	blank=True,
56	57	help_text=_("A text message for this post. May be left blank."),
57	58	)
58	59	author = models.ForeignKey(
59	60	"Account",
60	61	on_delete=models.CASCADE,
61	62	null=False, # There must be an author
62	63	editable=False, # It makes no sense to change the author after creation
63	-	help_text=_("The authoring account of this post."),
+	64	help_text=_("The authoring account of this post."),
64	65	)
65	66	response_to = models.ForeignKey(
66	67	"self",
67	68	on_delete=models.CASCADE,
68	69	null=True, # If this is null, this post is not a response, but a beginning post
69	70	editable=False, # This cannot be changed after creation, wouldn't make sense
70	-	help_text=_("The post to which this was a response, if applicable."),
+	71	related_name="responses",
+	72	help_text=_("The post to which this was a response, if applicable."),
71	73	)
72	74	placed_on = models.ForeignKey(
73	75	"Page",
74	76	on_delete=models.CASCADE,
75	77	null=False,
76	78	editable=False,
77	-	help_text=_("The page on which this post was placed."),
+	79	help_text=_("The page on which this post was placed."),
78	80	)
79	81	# Voting fields
80	82	allow_votes = models.BooleanField(
81	83	default=True,
82	84	help_text=_("Decide whether to allow voting or disable it for this post."),
83	85	)
84	86	allow_responses = models.BooleanField(
85	87	default=True,
86	88	help_text=_("Decide if other people can respond to this post or not. "
87	89	"This does not influence what people allow on their posts."),
88	90	)
89	91
90	92	def __str__(self):
+	93	""" Return how many votes this post has. """
+	94	return len(Vote.objects.filter(post=self))
+	95
+	96	def __str__(self):
91	97	return str(self.timestamp) + " \| " + str(self.author)
92	98	# TODO Add a way to attach geographical data to a post, which could
93	99	# then be used with OpenStreetMap or something
94	100
95	101	class FilePost(Post):
96	102	""" A special type of Post, which has a file linked with it.
97	103	The poster can specify how to treat this file. """
98	104	image = _("Image")
99	105	video = _("Video")
100	106	music = _("Sound")
101	107	text = _("Text" )
102	108	other = _("Other")
103	109	file = models.FileField(
104	110	upload_to="agora/posts/%Y/%m/%d/",
105	111	null=False,
106	112	editable=False,
107	-	help_text=_("The file you wish to share."),
+	113	help_text=_("The file you wish to share."),
108	114	)
109	115	file_type = models.CharField(
110	116	max_length=16,
111	117	blank=False,
112	118	choices = (
113	119	('image', image),
114	120	('video', video),
115	121	('music', music),
116	122	('text' , text ),
117	123	('other', other),
118	124	),
119	125	help_text=_("How this file should be seen as."),
120	126	)
121	127
122	128	class Page(models.Model):
123	129	""" In the university, people can create pages for everything they want and
124	130	then some. These pages are put in the database through this table. """
125	131	name = models.CharField(
126	132	max_length=64,
127	133	primary_key=True,
128	134	blank=False,
129	135	help_text=_("The name of this page."),
130	136	)
131	137	created = models.DateTimeField(auto_now_add=True)
132	138	hidden = models.BooleanField(
133	139	default=False,
134	140	help_text=_("Determines if this page can be found without a direct link."),
135	141	)
136	142	main_content = models.TextField(
137	143	blank=True,
138	144	help_text=_("If you want to put some text on this page, "
139	145	"you can put it here. You can use Orgmode-syntax to "
140	146	"get as much out of your page as possible. While doing so, "
141	147	"be aware of the limitations imposed by the code of conduct."),
142	148	)
143	149	public_posting = models.BooleanField(
144	150	default=True,
145	151	help_text=_("Determines if everyone can post on this page, or only the "
146	152	"people that are linked with it. Know that if a post is made "
147	153	"and responding is allowed, everyone can respond to that post."),
148	154	)
149	155
150	156	"""class Meta:
151	157	abstract=True"""
152	158	""" I've disabled the abstraction, because otherwise I can't relate a Post to a Page. """
153	159
154	160	class AccountPage(Page):
155	161	""" Every account has its own homepage. This is that page.
156	162	This page can only be edited by the account holder, or staff members. """
157	163	# TODO: Find a way to auto-create one of these every time a new account is created
158	164	# TODO: Require that changes can only occur by either the account holder or staff
159	165	account = models.OneToOneField(
160	166	"Account",
161	167	null=False,
162	168	on_delete=models.CASCADE,
163	169	)
164	170
165	171	class GroupPage(Page):
166	172	""" A page where a group can present itself to the university.
167	173	This page can only be edited by group members or staff members. """
168	174	# TODO: Find a way to auto-create one of these every time a new group is created
169	175	# TODO: Require that changes can only occur by either the group or staff
170	176	group = models.ForeignKey(
171	177	"Group",
172	178	null=False,
173	179	on_delete=models.CASCADE,
174	180	)
175	181
176	182	class CoursePage(Page):
177	183	""" A page that serves as a course's main entry point.
178	184	This page can only be edited by the course's educating team or staff members. """
179	185	# TODO: Find a way to auto-create one of these every time a new course is created
180	186	# TODO: Require that changes can only occur by either the course team or staff
181	187	course = models.OneToOneField(
182	188	"courses.Course",
183	189	null=False,
184	190	on_delete=models.CASCADE,
185	191	)
186	192
187	193	class Group(models.Model):
188	194	""" It is imperative that everyone can come together with other people.
189	195	A Group record is the way to accomplish this. """
190	196	name = models.CharField(
191	197	max_length=64,
192	198	primary_key=True, # So be unique I'd say
193	199	blank=False,
194	200	help_text=_("The name of your group."),
195	201	)
196	202	color = models.CharField(
197	203	max_length=6,
198	204	help_text=_("The hexadecimal code of the color for this group."),
199	205	default = constants.COLORS["UHasselt default"],
200	206	blank=False,
201	207	validators=[validate_hex_color],
202	208	)
203	209	members = models.ManyToManyField(
204	210	"Account",
205	211	help_text=_("The members of this group."),
206	212	)
207	213	invite_only = models.BooleanField(
208	214	default=True,
209	215	help_text=_("Determines if everyone can join this group, or if "
210	216	"only members can invite others."),
211	217	)
212	218	private = models.BooleanField(
213	219	default=True,
214	220	help_text=_("Determines if this group is visible to non-members."),
215	221	)
216	222
217	223	def __str__(self):
218	224	return self.name
219	225
220	226
221	227	class AccountCollection(models.Model):
222	228	""" Every account can make a collection in which (s)he can list accounts
223	229	at his/her wish. This can be a collection of Friends, study collegues,
224	230	project partners, and so on.
225	231	Accounts that are in a certain collection are not notified of this.
226	232	However, there is one exception:
227	233	If both accounts have a collection named "Friends" (or the localized
228	234	equivalent), and both feature each other in that collection, then
229	235	this is shared between the two accounts. """
230	236	account = models.ForeignKey(
231	237	"Account",
232	238	null=False,
233	239	editable=False,
234	-	on_delete=models.CASCADE,
+	240	on_delete=models.CASCADE,
235	241	help_text=_("The account that created this collection."),
236	242	)
237	243	name = models.CharField(
238	244	max_length=32,
239	245	blank=False,
240	246	help_text=_("The name of this collection."),
241	247	)
242	248	accounts = models.ManyToManyField(
243	249	"Account",
244	250	help_text=_("All accounts that are part of this collection."),
245	251	related_name="in_collection",
246	252	)
247	253	visible_to_public = models.BooleanField(
248	254	default=False,
249	255	help_text=_("Make this collection visible to everybody."),
250	256	)
251	257	visible_to_collection = models.BooleanField(
252	258	default=True,
253	259	help_text=_("Make this collection visible to the accounts in this collection. Other collections are not affected by this."),
254	260	)
255	261
256	262	def __str__(self):
257	263	return str(self.account) + " \| " + self.name
258	264
259	265	class Vote(models.Model):
260	266	""" Accounts can vote on posts (using ▲, which is funny because UHasselt).
261	267	These votes are registered in this table. """
262	268	voter = models.ForeignKey(
263	269	"Account",
264	270	null=False,
265	271	editable=False,
266	-	on_delete=models.CASCADE,
+	272	on_delete=models.CASCADE,
267	273	)
268	274	post = models.ForeignKey(
269	275	"Post",
270	276	null=False, # Duh.
271	277	editable=False, # Transferring votes doesn't make sense
272	-	on_delete=models.CASCADE,
+	278	on_delete=models.CASCADE,
273	279	)
274	280
275	281	class SharedFile(models.Model):
276	282	""" Groups and people can share files with each other, through a chat system.
277	283	These files are represented here. """
278	284	timestamp = models.DateTimeField(auto_now_add=True)
279	285	file = models.FileField(
280	286	upload_to="agora/chat/%Y/%m/%d/",
281	287	null=False,
282	288	editable=False,
283	-	help_text=_("The file you want to share."),
+	289	help_text=_("The file you want to share."),
284	290	)
285	291	uploader = models.ForeignKey(
286	292	"Account",
287	293	on_delete=models.CASCADE,
288	294	null=False,
289	295	editable=False,
290	-	help_text=_("The account that uploaded this file."),
+	296	help_text=_("The account that uploaded this file."),
291	297	)
292	298	# TODO __str__ ... or maybe not?
293	299
294	300	class Message(models.Model):
295	301	""" Everyone can communicate with someone else using private messages.
296	302	These messages are recorded here. """
297	303	timestamp = models.DateTimeField(auto_now_add=True)
298	304	text = models.TextField(
299	305	blank=False,
300	306	)
301	307	sender = models.ForeignKey(
302	308	"Account",
303	309	on_delete=models.CASCADE,
304	310	null=False,
305	311	editable=False,
306	-	help_text=_("The account that sent this message."),
+	312	help_text=_("The account that sent this message."),
307	313	)
308	314	# TODO __str__
309	315
310	316
311	317	class Chat(models.Model):
312	318	""" Chats can happen between a group, or between two people in private.
313	319	These messages are connected to a particular chat. """
314	320	messages = models.ManyToManyField(
315	321	"Message",
316	322	help_text=_("All messages that were shared in this chat."),
317	323	)
318	324	shared_files = models.ManyToManyField(
319	325	"SharedFile",
320	326	help_text=_("The files that are shared in this chat."),
321	327	)
322	328	class Meta:
323	329	abstract=True
324	330
325	331	class GroupChat(Chat):
326	332	""" Represents a chat of a group. """
327	333	group = models.ForeignKey(
328	334	"Group",
329	335	on_delete=models.CASCADE,
330	336	null=False,
331	337	editable=False,
332	-	)
+	338	)
333	339
334	340	def __str__(self):
335	341	return str(self.group)
336	342
337	343	class PrivateChat(Chat):
338	344	""" Represents a private chat between two accounts. """
339	345	# FIXME: It's theoretically possible to start a chat by one person, and have
340	346	# the other person start the same as well. Find a reliable way to block that.
341	347	account1 = models.ForeignKey(
342	348	"Account",
343	349	on_delete=models.CASCADE,
344	350	null=False,
345	351	editable=False,
346	-	)
+	352	)
347	353	account2 = models.ForeignKey(
348	354	"Account",
349	355	on_delete=models.CASCADE,
350	356	null=False,
351	357	editable=False,
352	-	related_name="correspondent",
+	358	related_name="correspondent",
353	359	)
354	360
355	361	def __str__(self):
356	362	return str(self.account1) +" - "+ str(self.account2)
357	363
358	364	class GroupInvite(models.Model):
359	365	""" Groups can send invites to other people to join the group, and this is
360	366	not limited to private groups. Group invitations are stored here, as well as their outcome. """
361	367	inviter = models.ForeignKey(
362	368	"Account",
363	369	on_delete=models.CASCADE,
364	370	null=False,
365	371	editable=False,
366	-	)
+	372	)
367	373	invitee = models.ForeignKey(
368	374	"Account",
369	375	on_delete=models.CASCADE,
370	376	null=False,
371	377	editable=False,
372	-	help_text=_("The account which will receive the invitation."),
+	378	help_text=_("The account which will receive the invitation."),
373	379	related_name="invitee",
374	380	)
375	381	group = models.ForeignKey(
376	382	"Group",
377	383	on_delete=models.CASCADE,
378	384	null=False,
379	385	editable=False,
380	-	db_index=True,
+	386	db_index=True,
381	387	help_text=_("The group for which this invitation is."),
382	388	)
383	389	accepted = models.NullBooleanField(
384	390	default=None,
385	391	help_text=_("Indicates if the invitation was accepted, rejected, or "
386	392	"pending an answer. if somebody rejects the invitation, "
387	393	"that group can no longer send an invitation to the invitee, "
388	394	"unless (s)he removes the answer from her history. Also, "
389	395	"a person can not reject an invitation, and accept it later. "
390	396	"For that, a new invitation must be received."),
391	397	)
392	398
393	399	def __str__(self):
394	400	return str(self.invitee) +" \| "+ str(self.group)
395	401

1	1	from django.utils.translation import ugettext_lazy as _
2	2
3	3	class Course(models.Model):
4	4	""" Represents a course that is taught at the university. """
5	5	number = models.PositiveSmallIntegerField(
6	6	primary_key=True,
7	7	blank=False,
8	8	help_text=_("The number associated with this course. A leading '0' will be added if the number is smaller than 1000."),
9	9	)
10	10	name = models.CharField(
11	11	max_length=64,
12	12	blank=False,
13	13	help_text=_("The name of this course, in the language that it is taught. Translations are for the appropriate template."),
14	14	)
15	15	contact_person = models.ForeignKey(
+	16	blank=False,
+	17	allow_unicode=True,
+	18	unique=True,
+	19	help_text=_("A so-called 'slug name' for this course."),
+	20	)
+	21	contact_person = models.ForeignKey(
16	22	"administration.User",
17	23	on_delete=models.PROTECT, # A course must have a contact person
18	24	limit_choices_to={'is_staff':