diff --git a/device/templates/details.html b/device/templates/details.html index 505b1a8..d74c035 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -3,6 +3,43 @@ {% block content %} +
+ +
+ + + +
+
+
{% trans "Latest Notes" %}
+ +
+
+ {% for note in device_notes|slice:":5" %} +
+
+
+ + {{ note.user.get_full_name|default:note.user.username }} + + + {{ note.date|timesince }} {% trans "ago" %} + +
+

{{ note.description }}

+
+
+ {% empty %} +

{% trans "No notes available." %}

+ {% endfor %} +
+
+

{{ object.shortid }}

diff --git a/device/views.py b/device/views.py index 3411195..695a5f2 100644 --- a/device/views.py +++ b/device/views.py @@ -14,7 +14,7 @@ from django.views.generic.edit import ( DeleteView, ) from django.views.generic.base import TemplateView -from action.models import StateDefinition, State, DeviceLog +from action.models import StateDefinition, State, DeviceLog, Note from dashboard.mixins import DashboardView, Http403 from evidence.models import UserProperty, SystemProperty from lot.models import LotTag @@ -116,6 +116,7 @@ class DetailsView(DashboardView, TemplateView): "state_definitions": StateDefinition.objects.filter(institution=self.request.user.institution).order_by('order'), "device_states": State.objects.filter(snapshot_uuid=uuid).order_by('-date'), "device_logs": DeviceLog.objects.filter(snapshot_uuid=uuid).order_by('-date'), + "device_notes": Note.objects.filter(snapshot_uuid=uuid).order_by('-date'), }) return context