joeni | Gitar

Small changes to administration app

Added a couple lines of code to the administration's view, and changed some that were due to change eventually. Edit of models: Added a year to course results, to ease sorting on year while displaying. Added the standard form template for almost all forms.

Author: Maarten 'Vngngdn' Vangeneugden
Date: Jan. 28, 2018, 10:37 p.m.
Hash: b8e9de04855e787d25bdd347f29c3217a170a0bc
Parent: 4a6a29f734af5d3f0f96746f84605f38b321acc9
Modified files: administration/models.py; administration/views.py; joeni/templates/joeni/form.djhtml

administration/models.py ¶

10 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")
    # Possible to add more in the future
    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,
        )
    released = models.DateField(
        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):
    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/views.py ¶

16 additions and 7 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."""
    if begin is None or end is None:
    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 roster
    # TODO Finish!
    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['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):
def results(request):
    pass

    template = "administration/results.djhtml"
    # TODO
    return render(request, template, context)

def forms(request):
    pass


def rooms(request):
    pass

    return render(request, template, context)

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)


joeni/templates/joeni/form.djhtml ¶

10 additions and 0 deletions.

View changes Hide changes

+	1	{% for hidden in form.hidden_fields %}
+	2	{{ hidden }}
+	3	{% endfor %}
+	4	{% for field in form.visible_fields %}
+	5	<div class="form-field">
+	6	{{ field.errors }}
+	7	{{ field.label_tag }} {{ field }}
+	8	</div>
+	9	{% endfor %}
+	10

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