Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and a new, empty "Unreleased" section should be added.
Lastly, a new [release](https://github.com/MAKENTNU/web/releases) must be created, whose title and tag name should also be the current date.

## Unreleased
-Added guidance hours to the internal pages (MAKENTNU/web#816)


### New features
Expand Down
18 changes: 17 additions & 1 deletion src/internal/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.utils.translation import gettext_lazy as _
from simple_history.admin import SimpleHistoryAdmin

from internal.models import Member, Quote, Secret, SystemAccess
from internal.models import GuidanceHours, Member, Quote, Secret, SystemAccess
from util import html_utils
from util.admin_utils import (
DefaultAdminWidgetsMixin,
Expand Down Expand Up @@ -106,7 +106,23 @@ class QuoteAdmin(DefaultAdminWidgetsMixin, UserSearchFieldsMixin, admin.ModelAdm
autocomplete_fields = ("author",)


class GuidanceHoursAdmin(admin.ModelAdmin):
list_display = ("get_display", "get_member_count", "notes")
list_filter = ("weekday",)
filter_horizontal = ("members",)
search_fields = ("notes",)

@admin.display(description=_("slot"), ordering="weekday")
def get_display(self, obj: GuidanceHours):
return str(obj)

@admin.display(description=_("members booked"))
def get_member_count(self, obj: GuidanceHours):
return obj.members.count()


admin.site.register(Member, MemberAdmin)
admin.site.register(SystemAccess, SystemAccessAdmin)
admin.site.register(Secret, SecretAdmin)
admin.site.register(Quote, QuoteAdmin)
admin.site.register(GuidanceHours, GuidanceHoursAdmin)
25 changes: 24 additions & 1 deletion src/internal/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from card import utils as card_utils
from card.formfields import CardNumberField
from internal.models import Member, Quote, Secret, SystemAccess
from internal.models import GuidanceHours, Member, Quote, Secret, SystemAccess
from users.models import User
from web.widgets import (
SemanticDateInput,
Expand Down Expand Up @@ -200,3 +200,26 @@ class Meta:
widgets = {
"date": SemanticDateInput(),
}


class GuidanceHoursForm(forms.ModelForm):
def clean(self):
cleaned_data = super().clean()
from_time = cleaned_data.get("from_time")
to_time = cleaned_data.get("to_time")

if from_time and to_time and from_time >= to_time:
raise forms.ValidationError(
_("Start time must be before end time."),
code="invalid_time_range",
)

return cleaned_data

class Meta:
model = GuidanceHours
fields = ("from_time", "to_time", "weekday")
widgets = {
"from_time": forms.TimeInput(attrs={"type": "time"}),
"to_time": forms.TimeInput(attrs={"type": "time"}),
}
92 changes: 92 additions & 0 deletions src/internal/migrations/0027_guidance_hours.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# Generated by Django 5.0.2 on 2026-03-03 16:55

import datetime

from django.db import migrations, models

schedule = {
0: [
(datetime.time(12, 15), datetime.time(14, 7)),
(datetime.time(14, 7), datetime.time(16, 7)),
(datetime.time(16, 7), datetime.time(18, 0)),
],
1: [
(datetime.time(12, 15), datetime.time(14, 7)),
(datetime.time(14, 7), datetime.time(16, 7)),
(datetime.time(16, 7), datetime.time(18, 0)),
],
2: [
(datetime.time(12, 15), datetime.time(14, 7)),
(datetime.time(14, 7), datetime.time(16, 7)),
(datetime.time(16, 7), datetime.time(18, 0)),
],
3: [
(datetime.time(12, 15), datetime.time(14, 7)),
(datetime.time(14, 7), datetime.time(16, 7)),
(datetime.time(16, 7), datetime.time(18, 0)),
],
4: [
(datetime.time(12, 15), datetime.time(14, 7)),
(datetime.time(14, 7), datetime.time(16, 0)),
],
}


def add_guidance_hours(apps, schema_editor):
GuidanceHours = apps.get_model("internal", "GuidanceHours")

for weekday in range(0, 5):
for from_time, to_time in schedule[weekday]:
GuidanceHours.objects.get_or_create(
weekday=weekday,
from_time=from_time,
to_time=to_time,
)


class Migration(migrations.Migration):
dependencies = [
("internal", "0026_add_secret_permissions"),
]

operations = [
migrations.CreateModel(
name="GuidanceHours",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"weekday",
models.PositiveSmallIntegerField(
choices=[
(0, "Monday"),
(1, "Tuesday"),
(2, "Wednesday"),
(3, "Thursday"),
(4, "Friday"),
],
verbose_name="weekday",
),
),
("from_time", models.TimeField(verbose_name="from time")),
("to_time", models.TimeField(verbose_name="to time")),
(
"members",
models.ManyToManyField(
related_name="guidance_hours",
to="internal.member",
verbose_name="members",
),
),
("notes", models.TextField(blank=True, verbose_name="notes")),
],
),
migrations.RunPython(add_guidance_hours, migrations.RunPython.noop),
]
38 changes: 38 additions & 0 deletions src/internal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,3 +391,41 @@ class Meta:

def __str__(self):
return _("“{quote}” —{quoted}").format(quote=self.quote, quoted=self.quoted)


class GuidanceHours(models.Model):
MAX_MEMBERS = 5
MAX_NOTES_LENGTH = 2000

WEEKDAYS = [
(0, _("Monday")),
(1, _("Tuesday")),
(2, _("Wednesday")),
(3, _("Thursday")),
(4, _("Friday")),
]

weekday = models.PositiveSmallIntegerField(
choices=WEEKDAYS,
verbose_name=_("weekday"),
)
from_time = models.TimeField(verbose_name=_("from time"))
to_time = models.TimeField(verbose_name=_("to time"))
notes = models.TextField(
blank=True, max_length=MAX_NOTES_LENGTH, verbose_name=_("notes")
)
members = models.ManyToManyField(
to=Member,
related_name="guidance_hours",
verbose_name=_("members"),
)

class Meta:
ordering = ("weekday", "from_time")

def __str__(self):
weekday = self.get_weekday_display()
return f"{weekday} {self.from_time:%H:%M} - {self.to_time:%H:%M}"

def is_full(self):
return self.members.count() >= self.MAX_MEMBERS
Loading
Loading