Team attendance register

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: [3.9, "3.10", "3.11"]
+        python: ["3.10", "3.11"]
     steps:
       - uses: actions/checkout@v4
 

helpdesk/helpdesk/settings.py

@@ -21,9 +21,9 @@
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 # Validate Python version
-if parse_version(platform.python_version()) < parse_version("3.9.0"):  # pragma: nocover
+if parse_version(platform.python_version()) < parse_version("3.10.0"):  # pragma: nocover
     raise RuntimeError(
-        f"Helpdesk requires Python 3.9 or higher (current: Python {platform.python_version()})",
+        f"Helpdesk requires Python 3.10 or higher (current: Python {platform.python_version()})",
     )
 
 #

helpdesk/teams/forms.py

@@ -0,0 +1,13 @@
+from django import forms
+
+from teams.models import Team, TeamAttendanceEvent, TeamAttendanceEventType
+
+
+class TeamAttendanceLogForm(forms.ModelForm):
+    type = forms.Select(choices=TeamAttendanceEventType.choices)
+    comment = forms.CharField(required=False)
+    team = forms.ModelChoiceField(queryset=Team.objects.all(), widget=forms.HiddenInput())
+
+    class Meta:
+        model = TeamAttendanceEvent
+        fields = ("type", "comment", "team")

helpdesk/teams/migrations/0005_alter_team_options_teamattendanceevent.py

@@ -0,0 +1,44 @@
+# Generated by Django 4.2.11 on 2024-12-24 18:40
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("teams", "0004_add_team_comment"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="team",
+            options={"ordering": ["tla"]},
+        ),
+        migrations.CreateModel(
+            name="TeamAttendanceEvent",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                (
+                    "type",
+                    models.TextField(
+                        choices=[("AR", "Arrived"), ("LE", "Left"), ("DE", "Delayed"), ("DO", "Dropped Out")],
+                        max_length=2,
+                    ),
+                ),
+                ("comment", models.TextField()),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "team",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="team_attendance_events",
+                        related_query_name="team_attendance_events",
+                        to="teams.team",
+                    ),
+                ),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

helpdesk/teams/models.py

@@ -58,3 +58,32 @@ class Meta:
 
     def __str__(self) -> str:
         return f"Comment on {self.team.name} at {self.created_at} by {self.author}"
+
+
+class TeamAttendanceEventType(models.TextChoices):
+    ARRIVED = "AR", "Arrived"
+    LEFT = "LE", "Left"
+    DELAYED = "DE", "Delayed"
+    DROPPED_OUT = "DO", "Dropped Out"
+
+
+class TeamAttendanceEvent(models.Model):
+    team = models.ForeignKey(
+        Team,
+        on_delete=models.CASCADE,
+        related_name="team_attendance_events",
+        related_query_name="team_attendance_events",
+    )
+    user = models.ForeignKey(
+        "accounts.User",
+        on_delete=models.PROTECT,
+    )
+    type = models.TextField(
+        max_length=2,
+        choices=TeamAttendanceEventType.choices,
+    )
+    comment = models.TextField()
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self) -> str:
+        return f"Attendance Event: {self.team.name} {self.type} at {self.created_at}"

helpdesk/teams/tables.py

@@ -1,6 +1,6 @@
 import django_tables2 as tables
 
-from .models import Team
+from .models import Team, TeamAttendanceEventType
 
 
 class TeamTable(tables.Table):
@@ -13,3 +13,23 @@ class Meta:
         model = Team
         exclude = ("id", "pit_location")
         order_by = "tla"
+
+
+class TeamAttendanceTable(tables.Table):
+    name = tables.LinkColumn("teams:team_detail", args=[tables.A("tla")])
+    latest_event__0__type = tables.Column("Latest Event")
+    latest_event__0__comment = tables.Column("Comment")
+    latest_event__0__created_at = tables.DateTimeColumn(verbose_name="Time")
+    user = tables.TemplateColumn(
+        verbose_name="Logged by",
+        template_code='{{record.latest_event.0.user|default:"—"}}',
+    )
+    actions = tables.LinkColumn("teams:team_log_attendance_form", args=[tables.A("tla")], text="Log")
+
+    def render_latest_event__0__type(self, value: str) -> str | None:
+        lookups = dict(TeamAttendanceEventType.choices)
+        return lookups.get(value)
+
+    class Meta:
+        model = Team
+        exclude = ["id", "tla", "is_rookie", "pit_location"]

helpdesk/teams/urls.py

@@ -1,6 +1,8 @@
 from django.urls import path
 
 from .views import (
+    TeamAttendanceFormView,
+    TeamAttendanceView,
     TeamDetailAboutView,
     TeamDetailCommentsView,
     TeamDetailTicketsView,
@@ -14,6 +16,8 @@
 
 urlpatterns = [
     path("", TeamListView.as_view(), name="team_list"),
+    path("attendance", TeamAttendanceView.as_view(), name="team_list_attendance"),
+    path("attendance/<slug:tla>", TeamAttendanceFormView.as_view(), name="team_log_attendance_form"),
     path("<slug:slug>/", TicketDetailRedirectView.as_view(), name="team_detail"),
     path("<slug:slug>/about", TeamDetailAboutView.as_view(), name="team_detail_about"),
     path("<slug:slug>/comments", TeamDetailCommentsView.as_view(), name="team_detail_comments"),

helpdesk/teams/views.py

@@ -3,25 +3,26 @@
 from typing import Any
 
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import CharField, F, QuerySet, Value
+from django.db.models import CharField, F, Prefetch, QuerySet, Value
 from django.http import HttpResponse, HttpResponseRedirect
 from django.urls import reverse_lazy
-from django.views.generic import DetailView, RedirectView
+from django.views.generic import CreateView, DetailView, ListView, RedirectView
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import FormMixin, ProcessFormView
 from django_filters.views import FilterView
 from django_tables2 import SingleTableMixin
 
 from helpdesk.forms import CommentSubmitForm
-from helpdesk.utils import is_filterset_filtered
+from helpdesk.utils import get_object_or_none, is_filterset_filtered
 from tickets.filters import TicketFilter
 from tickets.models import Ticket, TicketEvent
 from tickets.tables import TicketTable
 
 from .filters import TeamFilterset
-from .models import Team, TeamComment
+from .forms import TeamAttendanceLogForm
+from .models import Team, TeamAttendanceEvent, TeamComment
 from .srcomp import srcomp
-from .tables import TeamTable
+from .tables import TeamAttendanceTable, TeamTable
 
 
 class TicketDetailRedirectView(RedirectView):
@@ -172,3 +173,49 @@ def get_entries(self) -> QuerySet[Any]:
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return super().get_context_data(entries=self.get_entries(), **kwargs)
+
+
+class TeamAttendanceView(LoginRequiredMixin, SingleTableMixin, ListView):
+    model = Team
+    table_class = TeamAttendanceTable
+
+    def get_queryset(self) -> QuerySet[Any]:
+        return Team.objects.all().prefetch_related(
+            Prefetch(
+                "team_attendance_events",
+                TeamAttendanceEvent.objects.order_by("-created_at")[:1],
+                to_attr="latest_event",
+            )
+        )
+
+
+class TeamAttendanceFormView(LoginRequiredMixin, CreateView):
+    http_method_names = ["get", "post"]
+    model = TeamAttendanceEvent
+    form_class = TeamAttendanceLogForm
+
+    def get_initial(self) -> dict[str, Any]:
+        return {
+            "team": get_object_or_none(Team, tla=self.kwargs["tla"]),
+        }
+
+    def get_success_url(self) -> str:
+        return reverse_lazy("teams:team_list_attendance")
+
+    def form_valid(self, form: TeamAttendanceLogForm) -> HttpResponse:
+        assert self.request.user.is_authenticated
+        team = form.cleaned_data["team"]
+        team.team_attendance_events.create(
+            type=form.cleaned_data["type"],
+            comment=form.cleaned_data["comment"],
+            user=self.request.user,
+        )
+        return HttpResponseRedirect(redirect_to=self.get_success_url())
+
+    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        context["team"] = self.get_initial()["team"]
+        return context
+
+    def form_invalid(self, form: TeamAttendanceLogForm) -> HttpResponse:
+        return HttpResponse("Please fill out the form correctly.")

helpdesk/templates/inc/nav/nav.html

@@ -19,9 +19,19 @@
         <a class="navbar-item" href="{% url 'tickets:queue_default' %}">
           Queues
         </a>
-        <a class="navbar-item" href="{% url 'teams:team_list' %}">
-          Teams
-        </a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link">
+            Teams
+          </a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="{% url 'teams:team_list' %}">
+              All Teams
+            </a>
+            <a class="navbar-item" href="{% url 'teams:team_list_attendance' %}">
+              Attendance
+            </a>
+          </div>
+        </div>
         <a class="navbar-item" href="{% url 'tickets:ticket_all' %}">
           All Tickets
         </a>

helpdesk/templates/inc/nav/team-tabs.html

@@ -12,17 +12,17 @@
                 <span>Tickets</span>
             </a>
         </li>
-        <li {% if active == "comments" %}class="is-active"{% endif %}></li>
-        <a href="{% url 'teams:team_detail_comments' team.tla %}">
-            <span class="icon is-small"><i class="fas fa-comment" aria-hidden="true"></i></span>
-            <span>Comments</span>
-        </a>
-    </li>
-    <li {% if active == "timeline" %}class="is-active"{% endif %}></li>
-    <a href="{% url 'teams:team_detail_timeline' team.tla %}">
-        <span class="icon is-small"><i class="fas fa-timeline" aria-hidden="true"></i></span>
-        <span>Timeline</span>
-    </a>
-</li>
-</ul>
-</div>
+        <li {% if active == "comments" %}class="is-active"{% endif %}>
+            <a href="{% url 'teams:team_detail_comments' team.tla %}">
+                <span class="icon is-small"><i class="fas fa-comment" aria-hidden="true"></i></span>
+                <span>Comments</span>
+            </a>
+        </li>
+        <li {% if active == "timeline" %}class="is-active"{% endif %}>
+            <a href="{% url 'teams:team_detail_timeline' team.tla %}">
+                <span class="icon is-small"><i class="fas fa-timeline" aria-hidden="true"></i></span>
+                <span>Timeline</span>
+            </a>
+        </li>
+    </ul>
+</div>

helpdesk/templates/teams/team_list.html

@@ -0,0 +1,20 @@
+{% extends "layouts/base_app.html" %}
+{% load render_table from django_tables2 %}
+{% load crispy_forms_tags %}
+
+{% block page_title %}Team Attendance{% endblock %}
+{% block title %}Team Attendance{% endblock %}
+
+{% block page_buttons %}
+{#    <input class="input" type="date">#}
+{% endblock %}
+
+{% block content %}
+    <div class="container">
+        <div class="columns">
+            <div class="column">
+                {% render_table table %}
+            </div>
+        </div>
+    </div>
+{% endblock %}

helpdesk/templates/teams/teamattendanceevent_form.html

@@ -0,0 +1,17 @@
+{% extends "layouts/base_app.html" %}
+{% load crispy_forms_tags %}
+
+{% block page_title %}
+    Log attendance for {{ team }}
+{% endblock %}
+{% block title %}
+    Log attendance for {{ team }}
+{% endblock %}
+
+{% block content %}
+    <form class="block" method="post">
+        {% csrf_token %}
+        {{form|crispy}}
+        <input class="button is-primary" type="submit" value="Save">
+    </form>
+{% endblock %}

helpdesk/tickets/tables.py

@@ -15,7 +15,7 @@ class TicketTable(tables.Table):
     status = tables.Column()
     assignee_id = tables.TemplateColumn(
         verbose_name="Assignee",
-        template_code='{{record.assignee|default:"-"}}',
+        template_code='{{record.assignee|default:"—"}}',
     )
     actions = tables.LinkColumn("tickets:ticket_detail", args=[tables.A("id")], text="View")