diff --git a/device/templates/details.html b/device/templates/details.html index 3881c1a..586cc0f 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -1,213 +1,206 @@ -{% extends "base.html" %} +{% extends 'base.html' %} {% load i18n %} {% block content %} -
-
-

{{ object.id }}

-
-
- -
-
- -
-
-
- -
-
Details
-
-
Phid
-
{{ object.id }}
+
+
+

{{ object.id }}

- -
-
Type
-
{{ object.type }}
-
- - {% if object.is_websnapshot %} - {% for k, v in object.last_user_evidence %} -
-
{{ k }}
-
{{ v|default:"" }}
-
- {% endfor %} - {% else %} -
-
Manufacturer
-
{{ object.manufacturer|default:"" }}
-
- -
-
Model
-
{{ object.model|default:"" }}
-
- -
-
Serial Number
-
{{ object.last_evidence.doc.device.serialNumber|default:"" }}
-
- {% endif %} -
-
Identifiers
-
- {% for chid in object.hids %} -
-
{{ chid |default:"" }}
-
- {% endfor %}
-
-
- - - Add new annotation - - +
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + Web +
    • +
- -
Annotations
- - - - - - - - - - - - {% for a in object.get_user_annotations %} - - - - - - - - {% endfor %} - - -
KeyValueCreated on
{{ a.key }}{{ a.value }}{{ a.created }}
- - -
- {% for tag in lot_tags %} -
{{ tag }}
- - {% for lot in object.lots %} - {% if lot.type == tag %} -
-
- {{ lot.name }} +
+
+
Details
+
+
Phid
+
{{ object.id }}
-
- {% endif %} - {% endfor %} - {% endfor %} -
-
-
- +
+
Type
+
{{ object.type }}
+
- - Add new document - - -
- -
Documents
- - - - - - - - - - - - {% for a in object.get_user_documents %} - - - - - - - - {% endfor %} - - -
KeyValueCreated on
{{ a.key }}{{ a.value }}{{ a.created }}
-
- -
-
Components last evidence
-
- {% for c in object.last_evidence.doc.components %} -
-
-
{{ c.type }}
- {{ evidence.created }} + {% if object.is_websnapshot %} + {% for k, v in object.last_user_evidence %} +
+
{{ k }}
+
{{ v|default:'' }}
+
+ {% endfor %} + {% else %} +
+
Manufacturer
+
{{ object.manufacturer|default:'' }}
-

- {{ c.manufacturer }}
- {{ c.model }}
- {{ c.serialNumber }}
-

- - -
- {% endfor %} -
-
-
-
List of evidences
-
- {% for snap in object.evidences %} -
-
-
- {{ snap.created }} +
+
Model
+
{{ object.model|default:'' }}
-

- {{ snap.uuid }} -

- - + +
+
Serial Number
+
{{ object.last_evidence.doc.device.serialNumber|default:'' }}
+
+ {% endif %} +
+
Identifiers
+ {% for chid in object.hids %} +
+
{{ chid|default:'' }}
+
{% endfor %}
+ +
+
+ + + Add new annotation + + +
+ +
Annotations
+ + + + + + + + + + + + {% for a in object.get_user_annotations %} + + + + + + + + {% endfor %} + +
KeyValueCreated on
{{ a.key }}{{ a.value }}{{ a.created }}
+
+ +
+ {% for tag in lot_tags %} +
{{ tag }}
+ + {% for lot in object.lots %} + {% if lot.type == tag %} +
+
+ {{ lot.name }} +
+
+ {% endif %} + {% endfor %} + {% endfor %} +
+ +
+
+ + + Add new document + + +
+ +
Documents
+ + + + + + + + + + + + {% for a in object.get_user_documents %} + + + + + + + + {% endfor %} + +
KeyValueCreated on
{{ a.key }}{{ a.value }}{{ a.created }}
+
+ +
+
Components last evidence
+
+ {% for c in object.last_evidence.doc.components %} +
+
+
{{ c.type }}
+ {{ evidence.created }} +
+

+ {{ c.manufacturer }}
+ {{ c.model }}
+ {{ c.serialNumber }}
+

+ +
+ {% endfor %} +
+
+ +
+
List of evidences
+
+ {% for snap in object.evidences %} +
+
+
+ {{ snap.created }} +
+

+ {{ snap.uuid }} +

+ +
+ {% endfor %} +
+
-
{% endblock %} diff --git a/device/templates/device_web.html b/device/templates/device_web.html new file mode 100644 index 0000000..90aa5dd --- /dev/null +++ b/device/templates/device_web.html @@ -0,0 +1,81 @@ +{% extends 'base.html' %} + +{% block content %} + +

{{ title }}

+ +
Details
+
+
Phid
+
{{ object.id }}
+
+ +
+
Type
+
{{ object.type }}
+
+ + {% if object.is_websnapshot %} + {% for k, v in object.last_user_evidence %} +
+
{{ k }}
+
{{ v|default:'' }}
+
+ {% endfor %} + {% else %} +
+
Manufacturer
+
{{ object.manufacturer|default:'' }}
+
+ +
+
Model
+
{{ object.model|default:'' }}
+
+ +
+
Serial Number
+
{{ object.last_evidence.doc.device.serialNumber|default:'' }}
+
+ {% endif %} +
+
Identifiers
+
+ {% for chid in object.hids %} +
+
{{ chid|default:'' }}
+
+ {% endfor %} + + + {% comment %}

User Anotations

{% endcomment %} + +

Components

+
    + {% for c in object.last_evidence.doc.components %} +
    +
    +
    {{ c.type }}
    + {{ evidence.created }} +
    +

    + {{ c.manufacturer }}
    + {{ c.model }}
    + {{ c.serialNumber }}
    +

    + +
    + {% endfor %} + + + +

    Last Evidence Snapshot

    +

    {{ snapshot }}

    + + {% comment %}

    Lot Tags

    +
      + {% for tag in lot_tags %} +
    • {{ tag.name }}
      • + {% endfor %} +
    {% endcomment %} +{% endblock %} diff --git a/device/urls.py b/device/urls.py index 3d7c12b..63f2a34 100644 --- a/device/urls.py +++ b/device/urls.py @@ -9,4 +9,6 @@ urlpatterns = [ path("/", views.DetailsView.as_view(), name="details"), path("/annotation/add", views.AddAnnotationView.as_view(), name="add_annotation"), path("/document/add", views.AddDocumentView.as_view(), name="add_document"), + path("/web/", views.DeviceWebView.as_view(), name="device_web"), + ] diff --git a/device/views.py b/device/views.py index 0fd9365..ddd295a 100644 --- a/device/views.py +++ b/device/views.py @@ -101,6 +101,29 @@ class DetailsView(DashboardView, TemplateView): return context +class DeviceWebView(DashboardView, TemplateView): + template_name = "device_web.html" + title = _("Device Web") + breadcrumb = "Device / Web" + model = Annotation + + def get(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + self.object = Device(id=self.pk) + return super().get(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + self.object.initial() + lot_tags = LotTag.objects.filter(owner=self.request.user.institution) + context.update({ + 'object': self.object, + 'snapshot': self.object.get_last_evidence(), + 'lot_tags': lot_tags, + }) + return context + + class AddAnnotationView(DashboardView, CreateView): template_name = "new_annotation.html" title = _("New annotation")