joeni | Gitar

Add bulletin board page

I changed the appropriate files to make a bulletin board page on which messages from the different departments will be posted.

Author: Maarten 'Vngngdn' Vangeneugden
Date: Feb. 1, 2018, 3:55 p.m.
Hash: bf3254b908dee6e18e21bccce1b5d832e87d871e
Parent: f3c3a199e290c7722eb1c3b5907c38a3cd00038b
Modified files: administration/models.py; administration/templates/administration/bulletin_board.djhtml; administration/urls.py; administration/views.py

administration/models.py ¶

20 additions and 0 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)

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."),
        default="Belg",
        )
    # XXX: What if this starts with zeros?
    national_registry_number = models.BigIntegerField(
        blank=True,  # Only possible if Belgian
        # 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.CharField(max_length=10, null=True, blank=True)
    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 (\"32\" for Belgium)."),
        )
    # Study address
    study_street = models.CharField(max_length=64, blank=True)
    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(
        blank=True,
        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, blank=True)
    titularis_number = models.PositiveSmallIntegerField(null=True)
    titularis_bus = models.CharField(max_length=10, null=True, blank=True)
    titularis_postal_code = models.PositiveSmallIntegerField(null=True)
    titularis_country = models.CharField(max_length=64, null=True, blank=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."),
        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")
    BDRG = _("Fraud committed")
    VRST = _("Exemption")
    STOP = _("Course cancelled")
    # 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,
        )
    year = models.PositiveIntegerField(
        null=False,
        default=datetime.date.today().year,
        help_text=_("The academic year this course took place in. If 2018 is entered, "
                    "then that means academic year '2018-2019'."),
        )
    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")

class EducationDepartmentMessages(models.Model):
    """The department of education can issue messages that are to be shown to
    all students. Their contents are stored here."""
    date = models.DateField(auto_now_add=True)
    title = models.CharField(
        max_length=64,
        blank=False,
        help_text=_("A short, well-describing title for this message."),
        )
    text = models.TextField(
        blank=False,
        help_text=_("The message text. Org syntax available.")
        )
    def __str__(self):
        return str(self.date) + " | " + str(self.title)

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


administration/templates/administration/bulletin_board.djhtml ¶

19 additions and 5 deletions.

View changes Hide changes

{% load i18n %}
{% load humanize %}

{% block title %}
    {% trans "Decisions of the exam commission" %} | ◀ Joeni /▶
{% endblock %}
{% endblock %}

<p>
    {% blocktrans %}
        Whenever the exam commission comes together to make a decision regarding
        you, the eventual decision resulting from the meetings will be posted
        here.
    {% endblocktrans %}
        listed. Some of these messages are public, some are private.
    {% endblocktrans %}
</p>
{% for decision in decisions %}
    <time datetime="{{ decision.date|date:"c" }}">{{ decision.date|date:"DATE_FORMAT" }}</time>
<h2 id="{% trans "exam-commission" %}">{% trans "Exam commission" %}</h2>
{% for decision in exam_commission_decisions %}
    <time datetime="{{ decision.date|date:"c" }}">{{ decision.date|date:"DATE_FORMAT" }}</time>
    <br />
    {{ decision.text|org }}
    <hr />
{% empty %}
    <p>
        {% trans "There are no decisions that affect you." %}
    </p>
    <hr />
{% endfor %}

<p>
{% for message in education_department_messages %}
    <h3 id="{{ message.title|slugify }}">{{ message.title }}</h3>
    <time datetime="{{ message.date|date:"c" }}">{{ message.date|date:"DATE_FORMAT" }}</time>
    <br />
    {{ message.text|org }}
    <hr />
{% empty %}
    <p>
        {% trans "No messages have been issued by the education department." %}
    </p>

<h2 id="{% trans "rights" %}">{% trans "Rights" %}</h2>
<p>
    {% blocktrans %} {# TODO #}
        Raadpleeg het onderwijs- en examenreglement

        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:

        Secretaris interne beroepscommissie
        Lien Mampaey
        Universiteit Hasselt
        Martelarenlaan 42
        B-3500 Hasselt

        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:

            De naam, een correspondentieadres en de handtekening van de student of zijn raadsman;
            een vermelding van de beslissing waartegen het beroep gericht is en alle relevante (bewijs)stukken;
            een omschrijving van de ingeroepen bezwaren.
    {% endblocktrans %}
</p>


administration/urls.py ¶

1 addition and 0 deletions.

View changes Hide changes

from django.contrib.auth import views as auth_views
from . import views
from django.utils.translation import gettext_lazy as _

urlpatterns = ([
    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(_('jobs'), views.jobs, name='administration-jobs'),


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


administration/views.py ¶

10 additions and 4 deletions.

View changes Hide changes

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

@login_required
def roster(request, begin=None, end=None):
    """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."""

    template = "administration/roster.djhtml"

    if begin is None or end is None:
        today = datetime.date.today()
        if today.isoweekday() in {6,7}:  # Weekend
            begin = today + datetime.timedelta(days=8-today.isoweekday())
            end = today + datetime.timedelta(days=13-today.isoweekday())
        else:  # Same week
            begin = today - datetime.timedelta(days=today.weekday())
            end = today + datetime.timedelta(days=5-today.isoweekday())


    return render(request, template, context)
    university_events = UniversityEvent.objects.filter(begin_time__gte=begin).filter(end_time__lte=end)
    study_events = StudyEvent.objects.filter(begin_time__gte=begin).filter(end_time__lte=end)
    events = Event.objects.filter(begin_time__gte=begin).filter(end_time__lte=end)

    return render(request, template, context)
    # TODO Finish!

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 = dict()
    context['decisions'] = ExamCommissionDecision.objects.filter(user=request.user)
    template = "administration/exam_commission.djhtml"
    return render(request, template, context)
    context['education_department_messages'] = ExamCommissionDecision.objects.filter(user=request.user)
    template = "administration/bulletin_board.djhtml"
    return render(request, template, context)

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


def curriculum(request):
    return render(request, template, context)

def result(request):
    return render(request, template, context)

@login_required
def results(request):
    results = CourseResult.objects.filter(student=request.user)
    template = "administration/results.djhtml"
    # TODO
    return render(request, template, context)

def forms(request):
    return render(request, template, context)

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

def room_reservate(request):
    return render(request, template, context)

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)


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

1	1	{% load i18n %}
2	2	{% load humanize %}
3	3
4	4	{% block title %}
5	5	{% trans "Decisions of the exam commission" %} \| ◀ Joeni /▶
6	-	{% endblock %}
+	6	{% endblock %}
7	7
8	8	<p>
9	9	{% blocktrans %}
10	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 %}
+	11	listed. Some of these messages are public, some are private.
+	12	{% endblocktrans %}
14	13	</p>
15	14	{% for decision in decisions %}
16	-	<time datetime="{{ decision.date\|date:"c" }}">{{ decision.date\|date:"DATE_FORMAT" }}</time>
+	15	<h2 id="{% trans "exam-commission" %}">{% trans "Exam commission" %}</h2>
+	16	{% for decision in exam_commission_decisions %}
+	17	<time datetime="{{ decision.date\|date:"c" }}">{{ decision.date\|date:"DATE_FORMAT" }}</time>
17	18	<br />
18	19	{{ decision.text\|org }}
19	20	<hr />
20	21	{% empty %}
21	22	<p>
22	23	{% trans "There are no decisions that affect you." %}
23	24	</p>
24	25	<hr />
25	26	{% endfor %}
26	27
27	28	<p>
+	29	{% for message in education_department_messages %}
+	30	<h3 id="{{ message.title\|slugify }}">{{ message.title }}</h3>
+	31	<time datetime="{{ message.date\|date:"c" }}">{{ message.date\|date:"DATE_FORMAT" }}</time>
+	32	<br />
+	33	{{ message.text\|org }}
+	34	<hr />
+	35	{% empty %}
+	36	<p>
+	37	{% trans "No messages have been issued by the education department." %}
+	38	</p>
+	39
+	40	<h2 id="{% trans "rights" %}">{% trans "Rights" %}</h2>
+	41	<p>
28	42	{% blocktrans %} {# TODO #}
29	43	Raadpleeg het onderwijs- en examenreglement
30	44
31	45	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	46
33	47	Secretaris interne beroepscommissie
34	48	Lien Mampaey
35	49	Universiteit Hasselt
36	50	Martelarenlaan 42
37	51	B-3500 Hasselt
38	52
39	53	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	54
41	55	De naam, een correspondentieadres en de handtekening van de student of zijn raadsman;
42	56	een vermelding van de beslissing waartegen het beroep gericht is en alle relevante (bewijs)stukken;
43	57	een omschrijving van de ingeroepen bezwaren.
44	58	{% endblocktrans %}
45	59	</p>
46	60

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