Guidance hours to internal by PetterTjeldeVaagen · Pull Request #816 · MAKENTNU/web

PetterTjeldeVaagen · 2026-05-06T17:25:43Z

Proposed changes

Added the guidance hours to the internal pages of the website

Review guidance

Deployment notes

Manually fills in the current times for guidance hours

Checklist

(If any of the points are not relevant, mark them as checked, so that it's easy to see which points you've handled or not)

Added guidance hours objects which are stored in the database Added a guidance hours page which shows these objects as tables

codecov · 2026-05-06T17:42:02Z

Codecov Report

❌ Patch coverage is 86.18421% with 21 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.94%. Comparing base (787ea4b) to head (347caac).

Files with missing lines	Patch %	Lines
src/internal/views.py	83.96%	17 Missing ⚠️
src/internal/admin.py	84.61%	2 Missing ⚠️
src/internal/models.py	87.50%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #816      +/-   ##
==========================================
- Coverage   87.99%   87.94%   -0.06%     
==========================================
  Files         153      153              
  Lines        6249     6394     +145     
==========================================
+ Hits         5499     5623     +124     
- Misses        750      771      +21

Files with missing lines	Coverage Δ
src/internal/forms.py	`86.99% <100.00%> (+1.40%)`	⬆️
src/internal/urls.py	`100.00% <100.00%> (ø)`
src/internal/admin.py	`97.29% <84.61%> (-2.71%)`	⬇️
src/internal/models.py	`93.33% <87.50%> (-0.57%)`	⬇️
src/internal/views.py	`88.17% <83.96%> (-2.60%)`	⬇️

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

ba11e-mos · 2026-05-18T12:34:55Z

This is very nice, I've always wanted something like this on the website! One UX thing tho: could the layout be more compact, similar to Hackerspace's shift schedule? Each slot could just show member names (first name / short name)
inside the box, and clicking a slot opens a popup with the booking/cancel button + the comments textarea. Cuts the visual clutter of separate "book/cancel/full" + "comments" + admin columns down to one boxslot per timeslot.

Most of the backend is already there — GuidanceHoursView.get_context_data (src/internal/views.py:391-407) builds grouped_hours per weekday, so swapping the table layout in src/internal/templates/internal/guidance_hours.html + moving the action/notes UI into a modal would carry over the existing context cleanly. Solid implementation overall, just thought a denser layout could land better with daily users.

TheStrgamer

Most of this looks pretty good
Some smaller changes in style, layout and translation could be beneficial

TheStrgamer · 2026-05-21T12:00:49Z

+    )
+    from_time = models.TimeField(verbose_name=_("from time"))
+    to_time = models.TimeField(verbose_name=_("to time"))
+    notes = models.TextField(blank=True, verbose_name=_("notes"))


Suggested change

notes = models.TextField(blank=True, verbose_name=_("notes"))

notes = models.TextField(blank=True, max_length=MAX_NOTES_LENGTH, verbose_name=_("notes"))

Det er som regel bedre å enforce max lengde i modellen direkte.

TheStrgamer · 2026-05-21T12:11:15Z

+}
+
+:is(.guidance_hours_grey, .guidance_hours_yellow) th {
+    background-color: #0C426A;


Suggested change

background-color: #0C426A;

background-color: var(--make-blue);

Use var from style.css instead

TheStrgamer · 2026-05-21T12:12:49Z

+.guidance_hours_grey td { background-color: #DCDDDE; }
+.guidance_hours_yellow td { background-color: #F8C811; }


Suggested change

.guidance_hours_grey td { background-color: #DCDDDE; }

.guidance_hours_yellow td { background-color: #F8C811; }

.guidance_hours_grey td { background-color: var(--make-light-grey); }

.guidance_hours_yellow td { background-color: var(--make-yellow); }

Var here too

TheStrgamer · 2026-05-21T12:13:25Z

+    margin: 0 auto 10px;
+    padding-left: 6px;
+    background-color: #eef4f8;
+    border-left: 4px solid #0C426A;


Suggested change

border-left: 4px solid #0C426A;

border-left: 4px solid var(--make-blue);

TheStrgamer · 2026-05-21T12:13:39Z

+.cancel_button,
+.book_button,
+.toggle_notes_button {
+    border: 1px solid #0C426A;


Suggested change

border: 1px solid #0C426A;

border: 1px solid var(--make-blue);

TheStrgamer · 2026-05-21T14:34:05Z

+        current_weekday = timezone.localdate().weekday()
+        current_time = timezone.localtime().time()
+
+        for slot in context["hours"]:


Suggested change

for slot in context["hours"]:

all_slots = list(context["hours"])

for slot in all_slots:

This method calls context["hours"] more than needed

TheStrgamer · 2026-05-21T14:34:41Z

+            current_member = None
+        context["current_member"] = current_member
+        context["current_member_slots"] = [
+            slot for slot in context["hours"] if current_member in slot.all_members


Suggested change

slot for slot in context["hours"] if current_member in slot.all_members

slot for slot in all_slots if current_member in slot.all_members

TheStrgamer · 2026-05-21T14:35:24Z

+            if slot.weekday not in grouped:
+                grouped[slot.weekday] = []
+
+            grouped[slot.weekday].append(slot)


Suggested change

if slot.weekday not in grouped:

grouped[slot.weekday] = []

grouped[slot.weekday].append(slot)

grouped.setdefault(slot.weekday, []).append(slot)

TheStrgamer · 2026-05-21T14:55:42Z

        return _("“{quote}” —{quoted}").format(quote=self.quote, quoted=self.quoted)
+
+
+class GuidanceHours(models.Model):


Suggested change

class GuidanceHours(models.Model):

class GuidanceHour(models.Model):

Models should be singular, should be changed all places it us used

TheStrgamer · 2026-05-21T14:55:59Z

+    notes = models.TextField(blank=True, verbose_name=_("notes"))
+    members = models.ManyToManyField(
+        to=Member,
+        related_name="guidance_hours",


Suggested change

related_name="guidance_hours",

related_name="guidance_hour",

singular here too

TheStrgamer

Most of this looks pretty good
Some smaller changes in style, layout and translation could be beneficial

TheStrgamer

I agree with what ba11e-mos says about a more compact layout, with only name showing and not needing a booking button, but i also think we should keep the comment and general layout the same, and maybe make the tables collapsable.

Another thing is that you can now add different times that overlap or are equal, so maybe put a restricion there. for example i can have two 16-18 monday, or one 16-18 and one 17-19

PetterTjeldeVaagen added 8 commits February 10, 2026 17:07

Added guidance hours objects and page to view them as tables

79a3660

Added guidance hours objects which are stored in the database Added a guidance hours page which shows these objects as tables

Finished the model with notes and updated the migration

7291836

Updated the views and urls

4d7e882

Added updated main page and added create slot page

4cf92fd

Added translations

968f62f

Merge branch 'main' into feature/guidance-hours-to-internal

6c8ed64

Fixed guidance hours UI, permissions, and naming

f8244a7

linting

d0c421b

PetterTjeldeVaagen added the feature New functionality on the page label May 6, 2026

make-bot Bot added this to web May 6, 2026

make-bot Bot moved this to Ready for Review in web May 6, 2026

PetterTjeldeVaagen added 2 commits May 6, 2026 19:29

Updated unrelease section of the changelog

084ef3a

added wrong number to unreleased

eea7f05

Made a custom admin class for th eguidance hours

347caac

PetterTjeldeVaagen added the has-deployment-notes label May 6, 2026

TheStrgamer requested changes May 21, 2026

View reviewed changes

TheStrgamer reviewed May 22, 2026

View reviewed changes

	notes = models.TextField(blank=True, verbose_name=_("notes"))
	notes = models.TextField(blank=True, max_length=MAX_NOTES_LENGTH, verbose_name=_("notes"))

	background-color: #0C426A;
	background-color: var(--make-blue);

		.guidance_hours_grey td { background-color: #DCDDDE; }
		.guidance_hours_yellow td { background-color: #F8C811; }

	border-left: 4px solid #0C426A;
	border-left: 4px solid var(--make-blue);

	border: 1px solid #0C426A;
	border: 1px solid var(--make-blue);

-        for slot in context["hours"]:
+        all_slots = list(context["hours"])
+        for slot in all_slots:

	slot for slot in context["hours"] if current_member in slot.all_members
	slot for slot in all_slots if current_member in slot.all_members

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


		class GuidanceHours(models.Model):

	class GuidanceHours(models.Model):
	class GuidanceHour(models.Model):

Conversation

PetterTjeldeVaagen commented May 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes

Review guidance

Deployment notes

Checklist

Uh oh!

codecov Bot commented May 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ba11e-mos commented May 18, 2026

Uh oh!

TheStrgamer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TheStrgamer left a comment

Choose a reason for hiding this comment

Uh oh!

TheStrgamer left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

PetterTjeldeVaagen commented May 6, 2026 •

edited

Loading

codecov Bot commented May 6, 2026 •

edited

Loading