joeni | Gitar

Lots of changes regarding administration app

These should've better been in different commits, but I forgot about doing that. Nevertheless, here's a list of all the major changes that went in this commit:
- Added forms to the administration app. This will gradually expand to include all forms that can be displayed in to the users. - Changes to the models. The User has been split into a User and a UserData model, the latter holding all relevant data such as addresses and billing accounts. Some new models have been added, such as events (will be displayed in the roster), and decisions from the exam committee can now be stored as well. - Migrations of the mentioned model changes have been included. - A *lot* of new templates. These templates are almost all for the administration app. Their goals are self-explanatory. Most of them have their URLs already added, although I may have forgotten some of them. - New view functions. Some are already completely finished (like settings() and exam_commission_decisions()), others only have a pass for now. - New base templates. These will be used in almost all templates, so they look very general and flexible. - django-crispy-forms *has dishonorably been removed.* I thought I had something cool here, but when I got to work with it, it only supported JS-infected CSS/JS libraries like Bootstrap, which *COMPLETELY* defeated the purpose and benefits that it offers. I took my chances with Django's standard form system and was ashamed of myself that it worked so well, and that I had the audacity to distrust it before even doing something sensible with it first. I do need a little bit more of code than with crispy, but most of the extra code is tucked away in a seperate form for exactly that purpose. And now I actually *CAN* use simple HTML5 and CSS to make everything work properly, instead of using Bootstrap.

Author: Maarten 'Vngngdn' Vangeneugden
Date: Jan. 28, 2018, 9:37 p.m.
Hash: f454425f58f752e0d4a2b49fcba4bd7215383d8f
Parent: 389f9833d742c0fd04de07f7f999cccb62e5dda4
Modified files: administration/admin.py; administration/forms.py; administration/migrations/0010_auto_20180124_1712.py; administration/migrations/0011_auto_20180128_1935.py; administration/models.py; administration/templates/administration/exam_commission.djhtml; administration/templates/administration/index.djhtml; administration/templates/administration/login.djhtml; administration/templates/administration/nav.djhtml; administration/templates/administration/public.djhtml; administration/templates/administration/roster.djhtml; administration/templates/administration/settings.djhtml; administration/urls.py; administration/views.py; courses/urls.py; courses/views.py; joeni/settings.py; joeni/templates/joeni/base.djhtml; joeni/templates/joeni/footer.djhtml; joeni/templates/joeni/header.djhtml; joeni/urls.py

administration/admin.py ¶

4 additions and 0 deletions.

View changes Hide changes

from .models import *
from django.contrib.auth.admin import UserAdmin

admin.site.register(User, UserAdmin)

admin.site.register(Curriculum)
admin.site.register(CourseResult)
admin.site.register(CourseResult)
admin.site.register(PreRegistration)
admin.site.register(Room)
admin.site.register(RoomReservation)
admin.site.register(Degree)

admin.site.register(CourseEvent)
admin.site.register(UniversityEvent)
admin.site.register(StudyEvent)


administration/forms.py ¶

33 additions and 0 deletions.

View changes Hide changes

+	1	from django.forms import ModelForm
+	2	from . import models
+	3
+	4	class UserDataForm(ModelForm):
+	5	class Meta:
+	6	model = models.UserData
+	7	fields = ['first_name',
+	8	'last_name',
+	9	'title',
+	10	'nationality',
+	11	'civil_status',
+	12	'home_street',
+	13	'home_number',
+	14	'home_bus',
+	15	'home_postal_code',
+	16	'home_country',
+	17	'home_telephone',
+	18	'study_street',
+	19	'study_number',
+	20	'study_bus',
+	21	'study_postal_code',
+	22	'study_country',
+	23	'study_telephone',
+	24	'study_cellphone',
+	25	'titularis_street',
+	26	'titularis_number',
+	27	'titularis_bus',
+	28	'titularis_postal_code',
+	29	'titularis_country',
+	30	'titularis_telephone',
+	31	'bank_account_number',
+	32	]
+	33

administration/migrations/0010_auto_20180124_1712.py ¶

185 additions and 0 deletions.

View changes Hide changes

+	1
+	2	import administration.models
+	3	from django.conf import settings
+	4	from django.db import migrations, models
+	5	import django.db.models.deletion
+	6
+	7
+	8	class Migration(migrations.Migration):
+	9
+	10	dependencies = [
+	11	('administration', '0009_auto_20180124_0049'),
+	12	]
+	13
+	14	operations = [
+	15	migrations.CreateModel(
+	16	name='UserData',
+	17	fields=[
+	18	('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+	19	('first_name', models.CharField(max_length=64)),
+	20	('last_name', models.CharField(max_length=64)),
+	21	('title', models.CharField(blank=True, help_text='The academic title of this user, if applicable.', max_length=64)),
+	22	('DOB', models.DateField(help_text='The date of birth of this user.')),
+	23	('POB', models.CharField(help_text='The place of birth of this user.', max_length=64)),
+	24	('nationality', models.CharField(help_text='The current nationality of this user.', max_length=64)),
+	25	('national_registry_number', models.BigIntegerField(help_text='The assigned national registry number of this user.', unique=True)),
+	26	('civil_status', models.CharField(choices=[('Single', 'Single'), ('Married', 'Married'), ('Divorced', 'Divorced'), ('Widowed', 'Widowed'), ('Partnership', 'Partnership')], help_text='The civil/marital status of the user.', max_length=32)),
+	27	('is_staff', models.BooleanField(default=False, help_text="Determines if this user is part of the university's staff.")),
+	28	('is_student', models.BooleanField(default=True, help_text='Indicates if this user is a student at the university.')),
+	29	('home_street', models.CharField(max_length=64)),
+	30	('home_number', models.PositiveSmallIntegerField()),
+	31	('home_bus', models.PositiveSmallIntegerField(null=True)),
+	32	('home_postal_code', models.PositiveSmallIntegerField()),
+	33	('home_country', models.CharField(max_length=64)),
+	34	('home_telephone', models.CharField(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)),
+	35	('study_street', models.CharField(max_length=64)),
+	36	('study_number', models.PositiveSmallIntegerField()),
+	37	('study_bus', models.PositiveSmallIntegerField(null=True)),
+	38	('study_postal_code', models.PositiveSmallIntegerField()),
+	39	('study_country', models.CharField(max_length=64)),
+	40	('study_telephone', models.CharField(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)),
+	41	('study_cellphone', models.CharField(help_text='The cellphone number of the person. Prefix 0 can be presented with then national call code in the system.', max_length=64)),
+	42	('titularis_street', models.CharField(max_length=64, null=True)),
+	43	('titularis_number', models.PositiveSmallIntegerField(null=True)),
+	44	('titularis_bus', models.PositiveSmallIntegerField(null=True)),
+	45	('titularis_postal_code', models.PositiveSmallIntegerField(null=True)),
+	46	('titularis_country', models.CharField(max_length=64, null=True)),
+	47	('titularis_telephone', 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)),
+	48	('bank_account_number', models.CharField(help_text='The IBAN of this user. No spaces!', max_length=34, validators=[administration.models.validate_IBAN])),
+	49	('BIC', models.CharField(help_text="The BIC of this user's bank.", max_length=11, validators=[administration.models.validate_BIC])),
+	50	],
+	51	),
+	52	migrations.RemoveField(
+	53	model_name='user',
+	54	name='BIC',
+	55	),
+	56	migrations.RemoveField(
+	57	model_name='user',
+	58	name='DOB',
+	59	),
+	60	migrations.RemoveField(
+	61	model_name='user',
+	62	name='POB',
+	63	),
+	64	migrations.RemoveField(
+	65	model_name='user',
+	66	name='bank_account_number',
+	67	),
+	68	migrations.RemoveField(
+	69	model_name='user',
+	70	name='civil_status',
+	71	),
+	72	migrations.RemoveField(
+	73	model_name='user',
+	74	name='home_bus',
+	75	),
+	76	migrations.RemoveField(
+	77	model_name='user',
+	78	name='home_country',
+	79	),
+	80	migrations.RemoveField(
+	81	model_name='user',
+	82	name='home_number',
+	83	),
+	84	migrations.RemoveField(
+	85	model_name='user',
+	86	name='home_postal_code',
+	87	),
+	88	migrations.RemoveField(
+	89	model_name='user',
+	90	name='home_street',
+	91	),
+	92	migrations.RemoveField(
+	93	model_name='user',
+	94	name='home_telephone',
+	95	),
+	96	migrations.RemoveField(
+	97	model_name='user',
+	98	name='is_student',
+	99	),
+	100	migrations.RemoveField(
+	101	model_name='user',
+	102	name='national_registry_number',
+	103	),
+	104	migrations.RemoveField(
+	105	model_name='user',
+	106	name='nationality',
+	107	),
+	108	migrations.RemoveField(
+	109	model_name='user',
+	110	name='study_bus',
+	111	),
+	112	migrations.RemoveField(
+	113	model_name='user',
+	114	name='study_cellphone',
+	115	),
+	116	migrations.RemoveField(
+	117	model_name='user',
+	118	name='study_country',
+	119	),
+	120	migrations.RemoveField(
+	121	model_name='user',
+	122	name='study_number',
+	123	),
+	124	migrations.RemoveField(
+	125	model_name='user',
+	126	name='study_postal_code',
+	127	),
+	128	migrations.RemoveField(
+	129	model_name='user',
+	130	name='study_street',
+	131	),
+	132	migrations.RemoveField(
+	133	model_name='user',
+	134	name='study_telephone',
+	135	),
+	136	migrations.RemoveField(
+	137	model_name='user',
+	138	name='title',
+	139	),
+	140	migrations.RemoveField(
+	141	model_name='user',
+	142	name='titularis_bus',
+	143	),
+	144	migrations.RemoveField(
+	145	model_name='user',
+	146	name='titularis_country',
+	147	),
+	148	migrations.RemoveField(
+	149	model_name='user',
+	150	name='titularis_number',
+	151	),
+	152	migrations.RemoveField(
+	153	model_name='user',
+	154	name='titularis_postal_code',
+	155	),
+	156	migrations.RemoveField(
+	157	model_name='user',
+	158	name='titularis_street',
+	159	),
+	160	migrations.RemoveField(
+	161	model_name='user',
+	162	name='titularis_telephone',
+	163	),
+	164	migrations.AlterField(
+	165	model_name='user',
+	166	name='first_name',
+	167	field=models.CharField(blank=True, max_length=30, verbose_name='first name'),
+	168	),
+	169	migrations.AlterField(
+	170	model_name='user',
+	171	name='is_staff',
+	172	field=models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status'),
+	173	),
+	174	migrations.AlterField(
+	175	model_name='user',
+	176	name='last_name',
+	177	field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+	178	),
+	179	migrations.AddField(
+	180	model_name='userdata',
+	181	name='user',
+	182	field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+	183	),
+	184	]
+	185

administration/migrations/0011_auto_20180128_1935.py ¶

94 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', '0010_auto_20180124_1712'),
+	9	]
+	10
+	11	operations = [
+	12	migrations.AddField(
+	13	model_name='userdata',
+	14	name='home_city',
+	15	field=models.CharField(default='Diepenbeek', max_length=64),
+	16	preserve_default=False,
+	17	),
+	18	migrations.AlterField(
+	19	model_name='userdata',
+	20	name='home_bus',
+	21	field=models.CharField(blank=True, max_length=10, null=True),
+	22	),
+	23	migrations.AlterField(
+	24	model_name='userdata',
+	25	name='home_country',
+	26	field=models.CharField(default='België', max_length=64),
+	27	),
+	28	migrations.AlterField(
+	29	model_name='userdata',
+	30	name='home_postal_code',
+	31	field=models.PositiveIntegerField(),
+	32	),
+	33	migrations.AlterField(
+	34	model_name='userdata',
+	35	name='home_telephone',
+	36	field=models.CharField(help_text='The telephone number for the house address. Prefix 0 can be presented with the national call code in the system ("32" for Belgium).', max_length=64),
+	37	),
+	38	migrations.AlterField(
+	39	model_name='userdata',
+	40	name='national_registry_number',
+	41	field=models.BigIntegerField(blank=True, help_text='The assigned national registry number of this user.'),
+	42	),
+	43	migrations.AlterField(
+	44	model_name='userdata',
+	45	name='nationality',
+	46	field=models.CharField(default='Belg', help_text='The current nationality of this user.', max_length=64),
+	47	),
+	48	migrations.AlterField(
+	49	model_name='userdata',
+	50	name='study_bus',
+	51	field=models.CharField(blank=True, max_length=10, null=True),
+	52	),
+	53	migrations.AlterField(
+	54	model_name='userdata',
+	55	name='study_country',
+	56	field=models.CharField(blank=True, max_length=64),
+	57	),
+	58	migrations.AlterField(
+	59	model_name='userdata',
+	60	name='study_number',
+	61	field=models.PositiveSmallIntegerField(blank=True),
+	62	),
+	63	migrations.AlterField(
+	64	model_name='userdata',
+	65	name='study_postal_code',
+	66	field=models.PositiveSmallIntegerField(blank=True),
+	67	),
+	68	migrations.AlterField(
+	69	model_name='userdata',
+	70	name='study_street',
+	71	field=models.CharField(blank=True, max_length=64),
+	72	),
+	73	migrations.AlterField(
+	74	model_name='userdata',
+	75	name='study_telephone',
+	76	field=models.CharField(blank=True, 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),
+	77	),
+	78	migrations.AlterField(
+	79	model_name='userdata',
+	80	name='titularis_bus',
+	81	field=models.CharField(blank=True, max_length=10, null=True),
+	82	),
+	83	migrations.AlterField(
+	84	model_name='userdata',
+	85	name='titularis_country',
+	86	field=models.CharField(blank=True, max_length=64, null=True),
+	87	),
+	88	migrations.AlterField(
+	89	model_name='userdata',
+	90	name='titularis_street',
+	91	field=models.CharField(blank=True, max_length=64, null=True),
+	92	),
+	93	]
+	94

administration/models.py ¶

41 additions and 13 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)
    first_name = models.CharField(max_length=64, blank=False)
class UserData(models.Model):
    user = models.OneToOneField(User, on_delete=models.CASCADE)
    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."),
        )
    POB = models.CharField(
        max_length=64,
        blank=False,
        #editable=False,
        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,
        # TODO Validator!
        #editable=False,
        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(null=True)
    home_postal_code = models.PositiveSmallIntegerField(blank=False)
    home_country = models.CharField(max_length=64, blank=False)
    home_telephone = models.CharField(
    home_postal_code = models.PositiveIntegerField(blank=False)
    home_city = models.CharField(max_length=64, blank=False)
    home_country = models.CharField(max_length=64, blank=False, default="België")
    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(null=True)
    study_postal_code = models.PositiveSmallIntegerField(blank=False)
    study_country = models.CharField(max_length=64, blank=False)
    study_telephone = models.CharField(
    study_number = models.PositiveSmallIntegerField(blank=True)
    study_bus = models.CharField(max_length=10, null=True, blank=True)
    study_postal_code = models.PositiveSmallIntegerField(blank=True)
    study_country = models.CharField(max_length=64, blank=True)
    study_telephone = models.CharField(
        max_length=64,
        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, null=True)
    titularis_number = models.PositiveSmallIntegerField(null=True)
    titularis_number = models.PositiveSmallIntegerField(null=True)
    titularis_bus = models.PositiveSmallIntegerField(null=True)
    titularis_postal_code = models.PositiveSmallIntegerField(null=True)
    titularis_postal_code = models.PositiveSmallIntegerField(null=True)
    titularis_country = models.CharField(max_length=64, null=True)
    titularis_telephone = models.CharField(
    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."),
        null=True,
        )

    # 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
        )
    year = models.DateField(
        auto_now_add=True,
        db_index=True,
        help_text=_("The academic year for which this curriculum is. "
                    "If this field is equal to 2008, then that means "
                    "this curriculum is for the academic year "
                    "2008-2009."),
        )
    last_modified = models.DateTimeField(
        auto_now=True,
        help_text=_("The last timestamp that this was updated."),
        )
    course_programmes = models.ManyToManyField(
        "courses.CourseProgramme",
        null=False,
        help_text=_("All the course programmes 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 courses(self):
        """ Returns a set of all the courses that are in this curriculum.
        This is not the same as CourseProgrammes, as these can differ depending
        on which study one follows. """
        course_set = set()
        for course_programme in self.course_programmes:
            course_set.add(course_programme.course)
        return course_set

    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.CourseProgramme",
        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."),
        )
    POB = models.CharField(
        max_length=64,
        blank=False,
        #editable=False,
        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,
        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)."),
        )
    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,
        blank=True,
        )
    DOB = models.DateField(null=False)#editable=False, null=False)  # This can't be changed, of course
    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(null=False)#editable=False, null=False)
    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


# Classes regarding roster items

class Event(models.Model):
    """An event that will show up in the roster of accounts that need to be
    aware of this event. This can be a multitude of things, like colleges
    for certain courses, meetings like blood donations, and so on. There are
    specialized classes for certain types of events that take place."""
    begin_time = models.DateTimeField(
        null=False,
        help_text=_("The begin date and time that this event takes place."),
        verbose_name=_("begin time"),
        )
    end_time = models.DateTimeField(
        null=False,
        help_text=_("The end date and time that this event takes place."),
        verbose_name=_("end time"),
        )
    note = models.TextField(
        blank=True,
        help_text=_("Optional. If necessary, this field allows for additional "
                    "information that can be shown to the people for whom this "
                    "event is."),
        )
    created = models.DateTimeField(
        auto_now_add=True,
        )
    last_update = models.DateTimeField(
        auto_now=True,
        )

class CourseEvent(Event):
    """An event related to a particular course. This includes a location,
    a group (if applicable), and other data."""
    course = models.ForeignKey(
        "courses.CourseProgramme",
        on_delete=models.CASCADE,
        null=False,
        )
    docent = models.ForeignKey(
        "User",
        on_delete=models.PROTECT,
        null=False,
        limit_choices_to={'is_staff': True},
        help_text=_("The person who will be the main overseer of this event."),
        )
    room = models.ForeignKey(
        "Room",
        on_delete=models.PROTECT,
        null=False,
        help_text=_("The room in which this event will be held."),
        )
    subject = models.CharField(
        max_length=32,
        blank=False,
        help_text=_("The subject of this event. Examples are 'Hoorcollege', "
                    "'Zelfstudie', ..."),
        )
    group = models.ForeignKey(
        "courses.Group",
        on_delete = models.CASCADE,
        null=True,
        help_text=_("Some courses have multiple groups. If that's the case, "
                    "and this event is only for a specific group, then that "
                    "group must be referenced here."),
        )

class UniversityEvent(Event):
    """University wide events. These include events like blood donations for the
    Red Cross, for example."""
    pass

class StudyEvent(Event):
    """An event that is linked to a particular study, like lectures from guest
    speakers about a certain subject."""
    pass

class ExamCommissionDecision(models.Model):
    """The Exam commission can make certain decisions regarding individual
    students. Every decision on its own is stored in this table, and is linked
    to the recipient's account."""
    user = models.ForeignKey(
        User,
        on_delete=models.CASCADE,
        null=False,
        help_text=_("The recipient of this decision."),
        )
    date = models.DateField(auto_now_add=True)
    text = models.TextField(
        blank=False,
        help_text=_("The text describing the decision. Org syntax available.")
    def __str__(self):
        return str(self.user) + " | " + str(self.date)

    class Meta:
        verbose_name = _("Decision of the exam commission")
        verbose_name_plural = _("Decisions of the exam commission")


administration/templates/administration/exam_commission.djhtml ¶

48 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2	{% load humanize %}
+	3
+	4	{% block title %}
+	5	{% trans "Decisions of the exam commission" %} \| ◀ Joeni /▶
+	6	{% endblock %}
+	7
+	8
+	9	{% blocktrans %}
+	10	Whenever the exam commission comes together to make a decision regarding
+	11	you, the eventual decision resulting from the meetings will be posted
+	12	here.
+	13	{% endblocktrans %}
+	14
+	15	{% for decision in decisions %}
+	16	{{ decision.date\|date:"DATE_FORMAT" }}
+	17
+	18	{{ decision.text\|org }}
+	19
+	20	{% empty %}
+	21
+	22	{% trans "There are no decisions that affect you." %}
+	23
+	24
+	25	{% endfor %}
+	26
+	27
+	28	{% blocktrans %} {# TODO #}
+	29	Raadpleeg het onderwijs- en examenreglement
+	30
+	31	Op grond van de Rechtspositieregeling in de OER-regeling voor studenten van de UHasselt/tUL kan een student die oordeelt dat een ongunstige studievoortgangsbeslissing (omschreven in Art. 1.2 van de Rechtspositieregeling) aangetast is door een schending van het recht, intern beroep aantekenen, voor zover dit geen voorwerp was van een eerder beroep. Dit beroep wordt formeel ingediend bij de secretaris van de beroepscommissie conform Art. 1.3 lid 4 van de Rechtspositieregeling op volgend adres:
+	32
+	33	Secretaris interne beroepscommissie
+	34	Lien Mampaey
+	35	Universiteit Hasselt
+	36	Martelarenlaan 42
+	37	B-3500 Hasselt
+	38
+	39	Om administratieve redenen wordt de student verzocht om het beroep ook te melden op het volgende emailadres:intern.beroep@uhasselt.be. Het verzoekschrift wordt op straffe van niet-ontvankelijkheid ingediend per aangetekend schrijven binnen een vervaltermijn van 7 kalenderdagen, die ingaat op de dag na de kennisgeving van de genomen studievoortgangsbeslissing aan de student. Als datum van het beroep geldt de datum van het postmerk van de aangetekende zending. Het verzoekschrift van de student omvat op straffe van niet-ontvankelijkheid tenminste:
+	40
+	41	De naam, een correspondentieadres en de handtekening van de student of zijn raadsman;
+	42	een vermelding van de beslissing waartegen het beroep gericht is en alle relevante (bewijs)stukken;
+	43	een omschrijving van de ingeroepen bezwaren.
+	44	{% endblocktrans %}
+	45
+	46
+	47
+	48

administration/templates/administration/index.djhtml ¶

59 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2	{% load humanize %}
+	3	{% load crispy_forms_tags %}
+	4	{% load joeni_org %}
+	5
+	6	{% block title %}
+	7	{% trans "Administration" %} \| ◀ Joeni /▶
+	8	{% endblock %}
+	9
+	10	{% block main %}
+	11	{% include "administration/nav.djhtml" %}
+	12	{% trans "Administration" %}
+	13
+	14	{% blocktrans %}
+	15	Welcome to the administration website of Hasselt University. Here,
+	16	you can find all links related to the university's services,
+	17	events, messages, and so on.
+	18	{% endblocktrans %}
+	19
+	20
+	21	{% trans "Education department bulletin board" %}
+	22	{% for message in education_dept_messages %}
+	23	{{message.title}}
+	24
+	25	{{ message.date\|naturaltime }}
+	26
+	27	{{message.text\|org}}
+	28	{% empty %}
+	29	{% trans "There are no messages available." %}
+	30	{% endfor %}
+	31
+	32	{% trans "Important telephone numbers and contact services" %}
+	33
+	34	{% trans "Student secretary during working hours" %}
+	35	(+32)11 26 81 00
+	36	{% trans "Student police \| District office" %}
+	37	(+32)11 26 81 15
+	38	{% trans "Student police \| District service" %}
+	39	(+32)11 32 33 00
+	40
+	41	{% comment %}
+	42	Psychosociale opvang binnen de kantooruren
+	43	Studentenpsycholoog:studentenpsycholoog@uhasselt.be - tel.:011 26 90 48
+	44	Maatschappelijk assistent: Liesbeth Huber
+	45	Logistieke vragen buiten de kantooruren
+	46	Dienst MAT Diepenbeek: 0475 94 30 02
+	47	Dienst MAT Hasselt: 0493 59 38 33
+	48	Studentenpolitie
+	49	Wijkkantoor: 011 26 81 15
+	50	Wijkdienst: 011 32 33 00
+	51	0499 59 57 28
+	52	Tele-Onthaal (24u/24u)
+	53	106
+	54	#TODO
+	55	{% endcomment %}
+	56
+	57	{% endblock main %}
+	58
+	59

53 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2
+	3	{% block title %}
+	4	{% trans "Log in \| ◀ Joeni /▶" %}
+	5	{% endblock %}
+	6
+	7	{% block main %}
+	8	{% trans "Authenticate with Joeni" %}
+	9
+	10	{% blocktrans %}
+	11	This page is only visible for students and personnel of Hasselt University.
+	12	Please authenticate yourself with Joeni in order to continue.
+	13	{% endblocktrans %}
+	14
+	15
+	16
+	43
+	44	{% csrf_token %} {# This is necessary for forms, CSRF protection. #}
+	45	{% trans "Name" %}
+	46
+	47
+	48	{% trans "Passphrase" %}
+	49
+	50
+	51
+	52	{% endblock main %}
+	53

administration/templates/administration/nav.djhtml ¶

10 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2
+	3	{% trans "Personal settings" %}
+	4	{% trans "Curricula" %}
+	5	{% trans "Course results" %}
+	6	{% trans "Forms" %}
+	7	{% trans "Rooms" %}
+	8	{% trans "Personal Roster" %}
+	9
+	10

administration/templates/administration/public.djhtml ¶

18 additions and 0 deletions.

View changes Hide changes

+	1	{# Redirect to this template when there is no account logged in #}
+	2	{% load i18n %}
+	3
+	4	{% block title %}
+	5	{% trans "▶▶ Hasselt University \| Administration" %}
+	6	{% endblock %}
+	7
+	8	{% block main %}
+	9	{% include "administration/nav.djhtml" %}
+	10	{% trans "Administration" %}
+	11
+	12	{% blocktrans %}
+	13	Welcome to the administration system of Hasselt University.
+	14	{% endblocktrans %}
+	15
+	16	{% endblock main %}
+	17
+	18

administration/templates/administration/roster.djhtml ¶

12 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2
+	3	{% block title %}
+	4	{% trans "Roster \| ◀ Joeni /▶" %}
+	5	{% endblock %}
+	6
+	7	{% block main %}
+	8	{% include "administration/nav.djhtml" %}
+	9	{% trans "" %}
+	10	{% endblock main %}
+	11
+	12

administration/templates/administration/settings.djhtml ¶

34 additions and 0 deletions.

View changes Hide changes

+	1	{% load i18n %}
+	2	{% load humanize %}
+	3
+	4	{% block title %}
+	5	{% trans "Settings" %} \| ◀ Joeni /▶
+	6	{% endblock %}
+	7
+	8	{% block main %}
+	9	{% include "administration/nav.djhtml" %}
+	10	{% trans "Settings" %}
+	11	{% trans "Guidelines" %}
+	12
+	13	{% blocktrans %}
+	14	On this screen, you can edit your personal details regarding your
+	15	address, nationality, and other details.
+	16	{% endblocktrans %}
+	17
+	18
+	19	{% blocktrans %}
+	20	The address data of where you study and the titularis address only
+	21	need to be filled out if it differs from your home address. If not,
+	22	you can leave those fields blank.
+	23	{% endblocktrans %}
+	24
+	25
+	26	{#{% crispy user_data_form %}#}
+	27
+	28	{% csrf_token %} {# TODO I don't think that's necessary here #}
+	29	{% include "joeni/form.djhtml" with form=user_data_form %}
+	30
+	31
+	32	{% endblock main %}
+	33
+	34

administration/urls.py ¶

8 additions and 5 deletions.

View changes Hide changes

from . import views
from . import views
from django.utils.translation import ugettext_lazy as _


urlpatterns = [
    path('index', views.index, name='administration-index'),
    path(_('pre-registration'), views.pre_registration, name='administration-pre-registration'),
    path('', views.index, name='administration-index'),
    path(_('pre-registration'), views.pre_registration, name='administration-pre-registration'),
    path(_('settings'), views.settings, name='administration-settings'),
    path(_('curriculum'), views.curriculum, name='administration-curriculum'),
    path(_('results'), views.results, name='administration-results'),
    path(_('results/<slug:course>'), views.result, name='administration-results'),
    path(_('results/<int:student_id>'), views.result, name='administration-results'),
    path(_('forms'), views.forms, name='administration-forms'),  # In Dutch: "Attesten"
    path(_('forms/<str:form>'), views.forms, name='administration-forms'),
    path(_('rooms'), views.rooms, name='administration-rooms'),
    path(_('rooms/<str:room>'), views.rooms, name='administration-rooms'),
    path(_('rooms/reservate'), views.room-reservate, name='administration-room-reservate'),
    path(_('roster'), views.roster, name='administration-roster'),
    path(_('roster'), views.roster, name='administration-roster'),
    ]

    path('login', views.login, name='administration-login'),
    ])


administration/views.py ¶

113 additions and 8 deletions.

View changes Hide changes

import datetime
from django.urls import reverse # Why?
from django.utils.translation import gettext as _
from .models import *
import administration
import administration
from django.contrib.auth.decorators import login_required

@login_required
def roster(begin=None, end=None):
    """Collects and renders the data that has to be displayed in the roster.
    """Collects and renders the data that has to be displayed in the roster.

    The begin and end date can be specified. Only roster points in that range
    will be included in the response. If no begin and end are specified, it will
    take the current week as begin and end point. If it's
    weekend, it will take next week."""
    if begin is None or end is None:
        today = date.today()
        if today.isoweekday() in {6,7}:  # Weekend
        if today.isoweekday() in {6,7}:  # Weekend
            begin = today + date.timedelta(days=8-today.isoweekday())
            end = today + date.timedelta(days=13-today.isoweekday())
        else:  # Same week
            end = today + datetime.timedelta(days=13-today.isoweekday())
        else:  # Same week
            begin = today - date.timedelta(days=today.weekday())
            end = today + date.timedelta(days=5-today.isoweekday())

    

            end = today + datetime.timedelta(days=5-today.isoweekday())

        return roster


def index(request):
    template = "administration/index.djhtml"
    context = {}
    return render(request, template, context)

    pass

def pre_registration(request):
    user_data_form = UserDataForm()
    template = "administration/pre_registration.djhtml"
    context = dict()

    if request.method == 'POST':
        user_data_form = UserDataForm(request.POST)
        context['user_data_form'] = user_data_form
        if user_data_form.is_valid():
            user_data_form.save()
            context['messsage'] = _("Your registration has been completed. You will receive an e-mail shortly.")
        else:
            context['messsage'] = _("The data you supplied had errors. Please review your submission.")
    else:
        context['user_data_form'] = UserDataForm(instance = user_data)

    return render(request, template, context)
    pass

@login_required
def settings(request):
    user_data = UserData.objects.get(user=request.user)
    user_data_form = UserDataForm(instance = user_data)
    template = "administration/settings.djhtml"
    context = dict()

    if request.method == 'POST':
        user_data_form = UserDataForm(request.POST, instance = user_data)
        context['user_data_form'] = user_data_form
        if user_data_form.is_valid():
            user_data_form.save()
            context['messsage'] = _("Your settings were successfully updated.")
        else:
            context['messsage'] = _("The data you supplied had errors. Please review your submission.")
    else:
        context['user_data_form'] = UserDataForm(instance = user_data)

    return render(request, template, context)

@login_required
def exam_commission_decisions(request):
    context = dict()
    context['decisions'] = ExamCommissionDecision.objects.filter(user=request.user)
    template = "administration/exam_commission.djhtml"
    return render(request, template, context)


def curriculum(request):
    pass

def result(request):
    pass

def results(request):
    pass

def forms(request):
    pass

def rooms(request):
    pass

def room_reservate(request):
    pass

def login(request):
    if request.method == "POST":
        name = request.POST['name']
        passphrase = request.POST['password']
        user = authenticate(username=name, password=passphrase)
        if user is not None: # The user was successfully authenticated.
            login(request, user)
            # Because of Leen, I now track when and where is logged in:
            loginRecord = Login()
            loginRecord.ip = request.META['REMOTE_ADDR']
            loginRecord.name = name
            loginRecord.save()
            return HttpResponseRedirect(reverse('ITdays-index'))

    template = 'administration/login.djhtml'

    footer_links = [
            ["Home", "/"],
            ["Contact", "mailto:maarten.vangeneugden@student.uhasselt.be"],
            ]

    context = {
            'materialDesign_color': "deep-purple",
            'materialDesign_accentColor': "amber",
            'navbar_title': "Authentication",
            'navbar_fixed': True,
            'navbar_backArrow': True,
            'footer_title': "Quotebook",
            'footer_description': "Een lijst van citaten uit 2BACH Informatica @ UHasselt.",
            'footer_links': footer_links,
            }
    return render(request, template, context)


courses/urls.py ¶

1 addition and 1 deletion.

View changes Hide changes

from . import views
from django.utils.translation import ugettext_lazy as _

urlpatterns = [
    path('index', views.main, name='courses-index'),
    path('<slug:course_slug>', views.course, name='courses-course-index'),
    path('<slug:course_slug>', views.course, name='courses-course-index'),
    path(_('<slug:course_slug>/<int:assignment_id>/upload'), views.upload, name='courses-upload'),
    path(_('<slug:course_slug>/new-item'), views.new_item, name='courses-new-item'),
    path(_('<slug:course_slug>/groups'), views.groups, name='courses-groups'),
    ]


courses/views.py ¶

8 additions and 0 deletions.

View changes Hide changes

import datetime
from django.urls import reverse # Why?
from django.utils.translation import gettext as _
from .models import *
import administration
from django.contrib.auth.decorators import login_required

def current_academic_year():
    """ Returns the current academic year. The year is determined as follows:
    - If today is before September 15 of the current year, the returned value
      is the current year - 1.
    - If today is after September 15 of the current year, but before January 1
      of the next year, it returns the current year as is.
    """
    today = datetime.datetime.now()
    switch = datetime.datetime.date(datetime.datetime.year, 9, 15)
    if today < switch:
        return today.year - 1
    else:
        return today.year

@login_required
def index(request):
    """ Starting page regarding the courses. This serves two specific groups:
    - Students: Displays all courses that this student has in his/her curriculum
                for this academic year. Requires the curriculum to be accepted.
    - Staff: Displays all courses in which the staff member is part of the
             educating team, or is otherwise related to the course.
    Users who are not logged in will be sent to the login page.
    """
    template = "courses/index.djhtml"
    courses = set()
    if request.user.is_student:
        curricula = administration.models.Curriculum.objects.filter(student=request.user)
        current_curriculum = curricula.filter(year__year=current_academic_year())
        courses = current_curriculum.courses
    elif request.user.is_staff:
        courses += adminstration.models.Course.filter(course_team__contains=request.user)
    else:
        raise django.exceptions.FieldError("User "+request.user.number+" is neither staff nor student")

    context = {
        'courses': courses,
        }

    return render(request, template, context)

@login_required
def course(request, course_slug):
    template = "courses/course.djhtml"
    course = Course.objects.get(slug_name=course_slug)

    # Check if user can see this page
    if request.user.is_student:
        curricula = administration.models.Curriculum.objects.filter(student=request.user)
        current_curriculum = curricula.filter(year__year=current_academic_year())
        if course not in current_curriculum.courses:
            """ I'm currently just redirecting to the index page, but maybe it's
            just as good to make an announcement that this course cannot be
            used by this user. """
            return index(request)



    context = {
        'course': course,
        'announcements': Announcement.objects.filter(course=course),
        'assignments': Assignment.objects.filter(course=course),
        'course-items': CourseItem.objects.filter(course=course),
        'study-groups': StudyGroup.objects.filter(course=course),
        'uploads': Upload.objects.filter(course=course).filter(student=request.user)
        }

    return render(request, template, context)

# TODO: Find a way to see if it's possible to require some permissions and to
# put them in a decorator
#@permission_required
@login_required
def new_item(request, course_slug):
    template = "courses/new_item.djhtml"
    course = Course.objects.get(slug_name=course_slug)

    if request.user.is_student or request.user not in course.course_team:
        # Students can't add new items. Redirect to index
        # Also redirect people who are not part of the course team
        redirect('courses-index')
    # Now able to assume user is allowed to add items to this course

    context = {
        'course': course,
        'announcements': Announcement.objects.filter(course=course),
        'assignments': Assignment.objects.filter(course=course),
        'course-items': CourseItem.objects.filter(course=course),
        'study-groups': StudyGroup.objects.filter(course=course),
        'uploads': Upload.objects.filter(course=course)
        }

    return render(request, template, context)

@login_required
def remove(request, type, id):
    pass

@login_required
def upload(request):
    pass

@login_required
def groups(request):
    pass


joeni/settings.py ¶

8 additions and 0 deletions.

View changes Hide changes

Django settings for Joeni project.

Generated by 'django-admin startproject' using Django 2.0b1.

For more information on this file, see
https://docs.djangoproject.com/en/dev/topics/settings/

For the full list of settings and their values, see
https://docs.djangoproject.com/en/dev/ref/settings/
"""

import os

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '!2634qc=b*lp0=helzcmvb3+1_wcl!6z@mhzi%p(vg7odq&gfz'

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

# Crispy settings
CRISPY_FAIL_SILENTLY = not DEBUG  # For debugging info for Crispy
CRISPY_TEMPLATE_PACK = "hasselt-university"


ALLOWED_HOSTS = []


# Application definition

INSTALLED_APPS = [
    'django.contrib.admin',
    'django.contrib.auth',
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
    'administration',
    'agora',
    'courses',
    'joeni',
]

MIDDLEWARE = [
    'django.middleware.security.SecurityMiddleware',
    'django.middleware.locale.LocaleMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.security.SecurityMiddleware',
    # Caching middleware
    'django.middleware.cache.UpdateCacheMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.cache.FetchFromCacheMiddleware',
]

# Caching settings
CACHE_MIDDLEWARE_ALIAS = 'default'
CACHE_MIDDLEWARE_SECONDS = 300
CACHE_MIDDLEWARE_KEY_PREFIX = ''

ROOT_URLCONF = 'joeni.urls'

TEMPLATES = [
    {
        'BACKEND': 'django.template.backends.django.DjangoTemplates',
        'DIRS': [],
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
                'django.template.context_processors.debug',
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
                'django.contrib.messages.context_processors.messages',
            ],
        },
    },
]

#WSGI_APPLICATION = 'joeni.wsgi.application'


# Database
# https://docs.djangoproject.com/en/dev/ref/settings/#databases

DATABASES = {
    'default': {
        'ENGINE': 'django.db.backends.sqlite3',
        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
    }
}

# Custom User model
LOGIN_URL = 'administration/login'

# Custom User model
AUTH_USER_MODEL = 'administration.User'

# Password validation
# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
    {
        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
    },
    {
        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
    },
    {
        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
    },
    {
        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
    },
]

CACHES = {
    'default': {
        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
    }
}

# Internationalization
# https://docs.djangoproject.com/en/dev/topics/i18n/

LANGUAGE_CODE = 'en-us'

TIME_ZONE = 'UTC'

USE_I18N = True

USE_L10N = True

USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/dev/howto/static-files/

STATIC_URL = '/static/'
    BASE_DIR + "/static",
    ]
#STATIC_ROOT = BASE_DIR + '/static/'
STATIC_URL = '/static/'
MEDIA_URL = '/media/'


joeni/templates/joeni/base.djhtml ¶

3 additions and 1 deletion.

View changes Hide changes

{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
{% get_language_info for LANGUAGE_CODE as lang %}
{% load static %}
{% get_media_prefix as media %}



    
        </pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A11" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A11" class="accent-on-hover-only"><pre>11</pre>
            <td id="joeni/templates/joeni/base.djhtml-B11" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B11" class="accent-on-hover-only"><pre>11</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>            {% block title %}</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A12" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A12" class="accent-on-hover-only"><pre>12</pre>
            <td id="joeni/templates/joeni/base.djhtml-B12" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B12" class="accent-on-hover-only"><pre>12</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>                ◀ Joeni /▶ | ▶▶ UHasselt</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A13" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A13" class="accent-on-hover-only"><pre>13</pre>
            <td id="joeni/templates/joeni/base.djhtml-B13" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B13" class="accent-on-hover-only"><pre>13</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>            {% endblock title %}</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A14" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A14" class="accent-on-hover-only"><pre>14</pre>
            <td id="joeni/templates/joeni/base.djhtml-B14" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B14" class="accent-on-hover-only"><pre>14</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>        

        {% block stylesheets %}
            
            
            
            </pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A19" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A19" class="accent-on-hover-only"><pre>19</pre>
            <td id="joeni/templates/joeni/base.djhtml-B21" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B21" class="accent-on-hover-only"><pre>21</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>                header, footer {</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A20" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A20" class="accent-on-hover-only"><pre>20</pre>
            <td id="joeni/templates/joeni/base.djhtml-B22" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B22" class="accent-on-hover-only"><pre>22</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>                    background-color: #{{ user.account.settings.color|default:"UHASSELT" }};</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A21" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A21" class="accent-on-hover-only"><pre>21</pre>
            <td id="joeni/templates/joeni/base.djhtml-B23" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B23" class="accent-on-hover-only"><pre>23</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>                }</pre></td>
        </tr>
        
        
        <tr class="nochange">
            <td id="joeni/templates/joeni/base.djhtml-A22" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-A22" class="accent-on-hover-only"><pre>22</pre>
            <td id="joeni/templates/joeni/base.djhtml-B24" class="line-number">
                <a href="#joeni/templates/joeni/base.djhtml-B24" class="accent-on-hover-only"><pre>24</pre>
            </a></td>
        
            <td style="padding-left: 1em;"><pre>            
        {% endblock stylesheets %}

        {% block metaflags %}
            {# This is standard for all web pages and doesn't require changing. #}
            {# UTF-8, always #}
            
            {##}
            {# Indicates this page is suited for mobile devices #}
            
            
                name="description"
                content="{% block description %}
                    {% trans "The digital platform of Hasselt University" %}
                {% endblock description %}" />
        {% endblock metaflags %}
    

    
        
                {% block header %}
                    {% include "joeni/navbar.djhtml" %}
                {% endblock header %}
                {% endblock header %}
        

        
            {% block main %}
            {% endblock main %}
        

        
            {% block footer %}
                {% include "joeni/footer.djhtml" %}
            {% endblock footer %}
        

    

1	1	from .models import *
2	2	from django.contrib.auth.admin import UserAdmin
3	3
4	4	admin.site.register(User, UserAdmin)
5	5
6	6	admin.site.register(Curriculum)
7	7	admin.site.register(CourseResult)
+	8	admin.site.register(CourseResult)
8	9	admin.site.register(PreRegistration)
9	10	admin.site.register(Room)
10	11	admin.site.register(RoomReservation)
11	12	admin.site.register(Degree)
12	13
13	14	admin.site.register(CourseEvent)
+	15	admin.site.register(UniversityEvent)
+	16	admin.site.register(StudyEvent)
+	17

1	1	from . import views
+	2	from . import views
2	3	from django.utils.translation import ugettext_lazy as _
3	-
+	4
4	5	urlpatterns = [
5	-	path('index', views.index, name='administration-index'),
6	-	path(_('pre-registration'), views.pre_registration, name='administration-pre-registration'),
+	6	path('', views.index, name='administration-index'),
+	7	path(_('pre-registration'), views.pre_registration, name='administration-pre-registration'),
7	8	path(_('settings'), views.settings, name='administration-settings'),
8	9	path(_('curriculum'), views.curriculum, name='administration-curriculum'),
9	10	path(_('results'), views.results, name='administration-results'),
10	11	path(_('results/<slug:course>'), views.result, name='administration-results'),
11	12	path(_('results/<int:student_id>'), views.result, name='administration-results'),
12	13	path(_('forms'), views.forms, name='administration-forms'), # In Dutch: "Attesten"
13	14	path(_('forms/<str:form>'), views.forms, name='administration-forms'),
14	15	path(_('rooms'), views.rooms, name='administration-rooms'),
15	16	path(_('rooms/<str:room>'), views.rooms, name='administration-rooms'),
16	17	path(_('rooms/reservate'), views.room-reservate, name='administration-room-reservate'),
17	-	path(_('roster'), views.roster, name='administration-roster'),
+	18	path(_('roster'), views.roster, name='administration-roster'),
18	19	]
19	-
+	20	path('login', views.login, name='administration-login'),
+	21	])
+	22

1	1	import datetime
2	2	from django.urls import reverse # Why?
3	3	from django.utils.translation import gettext as _
4	4	from .models import *
5	5	import administration
+	6	import administration
6	7	from django.contrib.auth.decorators import login_required
7	8
8	9	@login_required
9	10	def roster(begin=None, end=None):
10	-	"""Collects and renders the data that has to be displayed in the roster.
+	11	"""Collects and renders the data that has to be displayed in the roster.
11	12
12	13	The begin and end date can be specified. Only roster points in that range
13	14	will be included in the response. If no begin and end are specified, it will
14	15	take the current week as begin and end point. If it's
15	16	weekend, it will take next week."""
16	17	if begin is None or end is None:
17	18	today = date.today()
18	-	if today.isoweekday() in {6,7}: # Weekend
+	19	if today.isoweekday() in {6,7}: # Weekend
19	20	begin = today + date.timedelta(days=8-today.isoweekday())
20	-	end = today + date.timedelta(days=13-today.isoweekday())
21	-	else: # Same week
+	21	end = today + datetime.timedelta(days=13-today.isoweekday())
+	22	else: # Same week
22	23	begin = today - date.timedelta(days=today.weekday())
23	-	end = today + date.timedelta(days=5-today.isoweekday())
24	-
25	-
26	-
+	24	end = today + datetime.timedelta(days=5-today.isoweekday())
+	25
27	26	return roster
28	27
+	28
+	29	def index(request):
+	30	template = "administration/index.djhtml"
+	31	context = {}
+	32	return render(request, template, context)
+	33
+	34	pass
+	35
+	36	def pre_registration(request):
+	37	user_data_form = UserDataForm()
+	38	template = "administration/pre_registration.djhtml"
+	39	context = dict()
+	40
+	41	if request.method == 'POST':
+	42	user_data_form = UserDataForm(request.POST)
+	43	context['user_data_form'] = user_data_form
+	44	if user_data_form.is_valid():
+	45	user_data_form.save()
+	46	context['messsage'] = _("Your registration has been completed. You will receive an e-mail shortly.")
+	47	else:
+	48	context['messsage'] = _("The data you supplied had errors. Please review your submission.")
+	49	else:
+	50	context['user_data_form'] = UserDataForm(instance = user_data)
+	51
+	52	return render(request, template, context)
+	53	pass
+	54
+	55	@login_required
+	56	def settings(request):
+	57	user_data = UserData.objects.get(user=request.user)
+	58	user_data_form = UserDataForm(instance = user_data)
+	59	template = "administration/settings.djhtml"
+	60	context = dict()
+	61
+	62	if request.method == 'POST':
+	63	user_data_form = UserDataForm(request.POST, instance = user_data)
+	64	context['user_data_form'] = user_data_form
+	65	if user_data_form.is_valid():
+	66	user_data_form.save()
+	67	context['messsage'] = _("Your settings were successfully updated.")
+	68	else:
+	69	context['messsage'] = _("The data you supplied had errors. Please review your submission.")
+	70	else:
+	71	context['user_data_form'] = UserDataForm(instance = user_data)
+	72
+	73	return render(request, template, context)
+	74
+	75	@login_required
+	76	def exam_commission_decisions(request):
+	77	context = dict()
+	78	context['decisions'] = ExamCommissionDecision.objects.filter(user=request.user)
+	79	template = "administration/exam_commission.djhtml"
+	80	return render(request, template, context)
+	81
+	82
+	83	def curriculum(request):
+	84	pass
+	85
+	86	def result(request):
+	87	pass
+	88
+	89	def results(request):
+	90	pass
+	91
+	92	def forms(request):
+	93	pass
+	94
+	95	def rooms(request):
+	96	pass
+	97
+	98	def room_reservate(request):
+	99	pass
+	100
+	101	def login(request):
+	102	if request.method == "POST":
+	103	name = request.POST['name']
+	104	passphrase = request.POST['password']
+	105	user = authenticate(username=name, password=passphrase)
+	106	if user is not None: # The user was successfully authenticated.
+	107	login(request, user)
+	108	# Because of Leen, I now track when and where is logged in:
+	109	loginRecord = Login()
+	110	loginRecord.ip = request.META['REMOTE_ADDR']
+	111	loginRecord.name = name
+	112	loginRecord.save()
+	113	return HttpResponseRedirect(reverse('ITdays-index'))
+	114
+	115	template = 'administration/login.djhtml'
+	116
+	117	footer_links = [
+	118	["Home", "/"],
+	119	["Contact", "mailto:maarten.vangeneugden@student.uhasselt.be"],
+	120	]
+	121
+	122	context = {
+	123	'materialDesign_color': "deep-purple",
+	124	'materialDesign_accentColor': "amber",
+	125	'navbar_title': "Authentication",
+	126	'navbar_fixed': True,
+	127	'navbar_backArrow': True,
+	128	'footer_title': "Quotebook",
+	129	'footer_description': "Een lijst van citaten uit 2BACH Informatica @ UHasselt.",
+	130	'footer_links': footer_links,
+	131	}
+	132	return render(request, template, context)
+	133

1	1	Django settings for Joeni project.
2	2
3	3	Generated by 'django-admin startproject' using Django 2.0b1.
4	4
5	5	For more information on this file, see
6	6	https://docs.djangoproject.com/en/dev/topics/settings/
7	7
8	8	For the full list of settings and their values, see
9	9	https://docs.djangoproject.com/en/dev/ref/settings/
10	10	"""
11	11
12	12	import os
13	13
14	14	# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
15	15	BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
16	16
17	17
18	18	# Quick-start development settings - unsuitable for production
19	19	# See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
20	20
21	21	# SECURITY WARNING: keep the secret key used in production secret!
22	22	SECRET_KEY = '!2634qc=b*lp0=helzcmvb3+1_wcl!6z@mhzi%p(vg7odq&gfz'
23	23
24	24	# SECURITY WARNING: don't run with debug turned on in production!
25	25	DEBUG = True
26	26
27	27	# Crispy settings
28	28	CRISPY_FAIL_SILENTLY = not DEBUG # For debugging info for Crispy
29	29	CRISPY_TEMPLATE_PACK = "hasselt-university"
30	30
31	31
32	32	ALLOWED_HOSTS = []
33	33
34	34
35	35	# Application definition
36	36
37	37	INSTALLED_APPS = [
38	38	'django.contrib.admin',
39	39	'django.contrib.auth',
40	40	'django.contrib.contenttypes',
41	41	'django.contrib.sessions',
+	42	'django.contrib.sessions',
42	43	'django.contrib.messages',
43	44	'django.contrib.staticfiles',
44	45	'administration',
45	46	'agora',
46	47	'courses',
47	48	'joeni',
48	49	]
49	50
50	51	MIDDLEWARE = [
51	52	'django.middleware.security.SecurityMiddleware',
52	53	'django.middleware.locale.LocaleMiddleware',
53	54	'django.middleware.common.CommonMiddleware',
54	55	'django.middleware.csrf.CsrfViewMiddleware',
55	56	'django.contrib.sessions.middleware.SessionMiddleware',
56	57	'django.contrib.auth.middleware.AuthenticationMiddleware',
57	58	'django.contrib.sessions.middleware.SessionMiddleware',
58	59	'django.contrib.messages.middleware.MessageMiddleware',
59	60	'django.middleware.clickjacking.XFrameOptionsMiddleware',
60	61	'django.middleware.security.SecurityMiddleware',
61	62	# Caching middleware
62	63	'django.middleware.cache.UpdateCacheMiddleware',
63	64	'django.middleware.common.CommonMiddleware',
64	65	'django.middleware.cache.FetchFromCacheMiddleware',
65	66	]
66	67
67	68	# Caching settings
68	69	CACHE_MIDDLEWARE_ALIAS = 'default'
69	70	CACHE_MIDDLEWARE_SECONDS = 300
70	71	CACHE_MIDDLEWARE_KEY_PREFIX = ''
71	72
72	73	ROOT_URLCONF = 'joeni.urls'
73	74
74	75	TEMPLATES = [
75	76	{
76	77	'BACKEND': 'django.template.backends.django.DjangoTemplates',
77	78	'DIRS': [],
78	79	'APP_DIRS': True,
79	80	'OPTIONS': {
80	81	'context_processors': [
81	82	'django.template.context_processors.debug',
82	83	'django.template.context_processors.request',
83	84	'django.contrib.auth.context_processors.auth',
84	85	'django.contrib.messages.context_processors.messages',
85	86	],
86	87	},
87	88	},
88	89	]
89	90
90	91	#WSGI_APPLICATION = 'joeni.wsgi.application'
91	92
92	93
93	94	# Database
94	95	# https://docs.djangoproject.com/en/dev/ref/settings/#databases
95	96
96	97	DATABASES = {
97	98	'default': {
98	99	'ENGINE': 'django.db.backends.sqlite3',
99	100	'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
100	101	}
101	102	}
102	103
103	104	# Custom User model
+	105	LOGIN_URL = 'administration/login'
+	106
+	107	# Custom User model
104	108	AUTH_USER_MODEL = 'administration.User'
105	109
106	110	# Password validation
107	111	# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
108	112
109	113	AUTH_PASSWORD_VALIDATORS = [
110	114	{
111	115	'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
112	116	},
113	117	{
114	118	'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
115	119	},
116	120	{
117	121	'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
118	122	},
119	123	{
120	124	'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
121	125	},
122	126	]
123	127
124	128	CACHES = {
125	129	'default': {
126	130	'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
127	131	}
128	132	}
129	133
130	134	# Internationalization
131	135	# https://docs.djangoproject.com/en/dev/topics/i18n/
132	136
133	137	LANGUAGE_CODE = 'en-us'
134	138
135	139	TIME_ZONE = 'UTC'
136	140
137	141	USE_I18N = True
138	142
139	143	USE_L10N = True
140	144
141	145	USE_TZ = True
142	146
143	147
144	148	# Static files (CSS, JavaScript, Images)
145	149	# https://docs.djangoproject.com/en/dev/howto/static-files/
146	150
147	151	STATIC_URL = '/static/'
+	152	BASE_DIR + "/static",
+	153	]
+	154	#STATIC_ROOT = BASE_DIR + '/static/'
+	155	STATIC_URL = '/static/'
148	156	MEDIA_URL = '/media/'
149	157

1	1	{% load i18n %}
2	2	{% get_current_language as LANGUAGE_CODE %}
3	3	{% get_language_info for LANGUAGE_CODE as lang %}
4	4	{% load static %}
5	5	{% get_media_prefix as media %}
6	6
7	7
8	8
9	9
10	10	</pre></td> </tr> <tr class="nochange"> <td id="joeni/templates/joeni/base.djhtml-A11" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-A11" class="accent-on-hover-only"><pre>11</pre> <td id="joeni/templates/joeni/base.djhtml-B11" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-B11" class="accent-on-hover-only"><pre>11</pre> </a></td> <td style="padding-left: 1em;"><pre> {% block title %}</pre></td> </tr> <tr class="nochange"> <td id="joeni/templates/joeni/base.djhtml-A12" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-A12" class="accent-on-hover-only"><pre>12</pre> <td id="joeni/templates/joeni/base.djhtml-B12" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-B12" class="accent-on-hover-only"><pre>12</pre> </a></td> <td style="padding-left: 1em;"><pre> ◀ Joeni /▶ \| ▶▶ UHasselt</pre></td> </tr> <tr class="nochange"> <td id="joeni/templates/joeni/base.djhtml-A13" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-A13" class="accent-on-hover-only"><pre>13</pre> <td id="joeni/templates/joeni/base.djhtml-B13" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-B13" class="accent-on-hover-only"><pre>13</pre> </a></td> <td style="padding-left: 1em;"><pre> {% endblock title %}</pre></td> </tr> <tr class="nochange"> <td id="joeni/templates/joeni/base.djhtml-A14" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-A14" class="accent-on-hover-only"><pre>14</pre> <td id="joeni/templates/joeni/base.djhtml-B14" class="line-number"> <a href="#joeni/templates/joeni/base.djhtml-B14" class="accent-on-hover-only"><pre>14</pre> </a></td> <td style="padding-left: 1em;"><pre>
15	15
16	16	{% block stylesheets %}
17	17
+	18
+	19
18	20
23	25	{% endblock stylesheets %}
24	26
25	27	{% block metaflags %}
26	28	{# This is standard for all web pages and doesn't require changing. #}
27	29	{# UTF-8, always #}
28	30
29	31	{##}
30	32	{# Indicates this page is suited for mobile devices #}
31	33
32	34
33	35	name="description"
34	36	content="{% block description %}
35	37	{% trans "The digital platform of Hasselt University" %}
36	38	{% endblock description %}" />
37	39	{% endblock metaflags %}
38	40
39	41
40	42
41	43
42	44	{% block header %}
43	45	{% include "joeni/navbar.djhtml" %}
44	-	{% endblock header %}
+	46	{% endblock header %}
45	47
46	48
47	49
48	50	{% block main %}
49	51	{% endblock main %}
50	52
51	53
52	54
53	55	{% block footer %}
54	56	{% include "joeni/footer.djhtml" %}
55	57	{% endblock footer %}
56	58
57	59
58	60

Lots of changes regarding administration app

administration/admin.py ¶

administration/forms.py ¶

administration/migrations/0010_auto_20180124_1712.py ¶

administration/migrations/0011_auto_20180128_1935.py ¶

administration/models.py ¶

administration/templates/administration/exam_commission.djhtml ¶

administration/templates/administration/index.djhtml ¶

{% trans "Administration" %}

{% trans "Education department bulletin board" %}

{{message.title}}

{% trans "Important telephone numbers and contact services" %}

administration/templates/administration/login.djhtml ¶

{% trans "Authenticate with Joeni" %}

administration/templates/administration/nav.djhtml ¶

administration/templates/administration/public.djhtml ¶

{% trans "Administration" %}

administration/templates/administration/roster.djhtml ¶

{% trans "" %}

administration/templates/administration/settings.djhtml ¶

{% trans "Settings" %}

{% trans "Guidelines" %}

administration/urls.py ¶

administration/views.py ¶

courses/urls.py ¶

courses/views.py ¶

joeni/settings.py ¶

joeni/templates/joeni/base.djhtml ¶