Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
19 changes: 17 additions & 2 deletions src/staff/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import django_tables2 as tables
from django.db.models import IntegerField
from django.db.models.functions import Cast
from django.template.loader import render_to_string
from django.utils.safestring import mark_safe

from capps.users.models import User
from genlab_bestilling.models import (
AnalysisOrder,
EquipmentOrder,
Expand Down Expand Up @@ -411,12 +413,25 @@ class Meta:

class NewUnseenOrderTable(StaffIDMixinTable):
seen = tables.TemplateColumn(
verbose_name="",
orderable=False,
verbose_name="Seen",
template_name="staff/components/seen_column.html",
empty_values=(),
template_name="staff/components/seen_column.html",
)

def __init__(self, *args, user: User = None, request: Any = None, **kwargs):
super().__init__(*args, **kwargs)
self.user = user

def render_seen(self, record: Order) -> str:
return render_to_string(
"staff/components/seen_column.html",
{
"record": record,
"user": self.user, # manually pass user into template context
},
)

description = tables.Column(
accessor="genrequest__name",
verbose_name="Description",
Expand Down
8 changes: 7 additions & 1 deletion src/staff/templates/staff/components/seen_column.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{% load order_tags %}

{% if record.genrequest.responsible_staff.all|is_responsible:user %}
<form method="post" action="{% url 'staff:mark-as-seen' pk=record.id %}">
{% csrf_token %}
<input type="hidden" name="return_to" value="dashboard">
<button class="btn bg-secondary text-white" style="background-color: darkgoldenrod; height: auto;" type="submit">Mark as seen</button>
<button class="btn bg-secondary text-white" style="background-color: darkgoldenrod; height: auto;" type="submit">
Mark as seen
</button>
</form>
{% endif %}
10 changes: 9 additions & 1 deletion src/staff/templatetags/order_tags.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django import template
from django.db import models

from capps.users.models import User
from genlab_bestilling.models import Area, Order

from ..tables import (
Expand All @@ -14,6 +15,13 @@
register = template.Library()


@register.filter
def is_responsible(staff_queryset: models.QuerySet, user: User) -> bool:
print(staff_queryset)
print(user)
return staff_queryset.filter(id=user.id).exists()


@register.inclusion_tag("staff/components/order_table.html", takes_context=True)
def urgent_orders_table(context: dict, area: Area | None = None) -> dict:
urgent_orders = (
Expand Down Expand Up @@ -113,7 +121,7 @@ def new_unseen_orders_table(context: dict, area: Area | None = None) -> dict:

return {
"title": "New unseen orders",
"table": NewUnseenOrderTable(new_orders),
"table": NewUnseenOrderTable(new_orders, user=context.get("request").user),
"count": new_orders.count(),
"request": context.get("request"),
}
Expand Down
Loading