diff --git a/device/templates/details.html b/device/templates/details.html index 8fd9b85..acc79cf 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -37,6 +37,9 @@
  • {% trans 'General details' %}
    • +
  • + {% trans 'States' %} +
  • {% trans 'User properties' %}
    • @@ -134,14 +137,30 @@
    {% trans 'Current State' %}
    -
    -
    {% trans 'State' %}
    -
    {{ device_states.0.state }}
    -
    -
    -
    {% trans 'Date' %}
    -
    {{ device_states.0.date|date:"SHORT_DATETIME_FORMAT" }}
    -
    +
    + + + + + + + + + + {% if device_states %} + + + + + + {% else %} + + + + {% endif %} + +
    {% trans 'State' %}{% trans 'User' %}{% trans 'Date' %}
    {{ device_states.0.state }}{{ device_states.0.user.responsable_person|default:device_states.0.user.username }}{{ device_states.0.date|date:"SHORT_DATETIME_FORMAT" }}
    {% trans 'No state recorded.' %}
    +
    {% if last_note %} @@ -157,6 +176,38 @@ + + + +
    +
    {% trans 'History of States' %}
    +
    + + + + + + + + + + {% for state_change in device_states %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans 'Date' %}{% trans 'User' %}{% trans 'State' %}
    {{ state_change.state }}{{ state_change.user.responsable_person|default:state_change.user.username }}{{ state_change.date|date:"SHORT_DATETIME_FORMAT" }}
    {% trans 'No state changes recorded.' %}
    +
    +
    +
    diff --git a/device/views.py b/device/views.py index 48db1a4..92216a6 100644 --- a/device/views.py +++ b/device/views.py @@ -125,7 +125,7 @@ class DetailsView(DashboardView, TemplateView): 'lot_tags': lot_tags, 'dpps': dpps, "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_states": State.objects.filter(snapshot_uuid=uuid).order_by('-date'), }) return context