From 12e31758b3733ddbd1ddd1dfa401dc32d6da7c27 Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 8 Oct 2024 07:26:48 +0200 Subject: [PATCH 01/25] 90-initial-ugly-view --- device/templates/details.html | 381 +++++++++++++++---------------- device/templates/device_web.html | 81 +++++++ device/urls.py | 2 + device/views.py | 23 ++ 4 files changed, 293 insertions(+), 194 deletions(-) create mode 100644 device/templates/device_web.html 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 }}

-
-
- -
-
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - Web -
    • -
-
-
-
- -
-
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") From b8946dfbde4548b3ec8e0a9191531363e26d6d19 Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 8 Oct 2024 08:00:35 +0200 Subject: [PATCH 02/25] 90: Playing with CSS to make it look good --- device/templates/device_web.html | 238 +++++++++++++++++++++---------- 1 file changed, 165 insertions(+), 73 deletions(-) diff --git a/device/templates/device_web.html b/device/templates/device_web.html index 90aa5dd..85d6f04 100644 --- a/device/templates/device_web.html +++ b/device/templates/device_web.html @@ -1,81 +1,173 @@ -{% 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:'' }}
    -
    + + + + + + {{ title }} + + + + + +
    +

    {{ title }}

    -
    Model
    -
    {{ object.model|default:'' }}
    -
    +
    +

    Details

    +
    +
    Phid
    +
    +
    {{ object.id }}
    +
    +
    +
    +
    Type
    +
    {{ object.type }}
    +
    -
    -
    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 }} + {% 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 %}
      -

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

      - -
      - {% endfor %} +
      +

      Identifiers

      + {% for chid in object.hids %} +
      +
      {{ chid|default:'' }}
      +
      + {% endfor %} +
      +
    +

    Components

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

    + Manufacturer: {{ c.manufacturer }}
    + Model: {{ c.model }}
    + Serial Number: {{ c.serialNumber }} +

    + {{ evidence.created }} +
    +
    +
    + {% endfor %} +
    -

    Last Evidence Snapshot

    -

    {{ snapshot }}

    +

    Last Evidence Snapshot

    +
    +
    +

    {{ snapshot }}

    +
    +
    +
    - {% comment %}

    Lot Tags

    -
      - {% for tag in lot_tags %} -
    • {{ tag.name }}
      • - {% endfor %} -
    {% endcomment %} -{% endblock %} +
    +

    © {% now "Y" %} eReuse. All rights reserved.

    +
    + + + + \ No newline at end of file From 99eccc82aa105a2a3c6bcfa4268f05722aaf05eb Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 8 Oct 2024 08:02:42 +0200 Subject: [PATCH 03/25] 90: Add device model in the title --- device/templates/device_web.html | 6 +++--- device/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device/templates/device_web.html b/device/templates/device_web.html index 85d6f04..919dec7 100644 --- a/device/templates/device_web.html +++ b/device/templates/device_web.html @@ -3,7 +3,7 @@ - {{ title }} + {{ title }} - {{ object.type }} - - + +
    -

    {{ title }} - {{ object.type }}

    +

    {{ title }} - {{ object.type }}

    -
    -
    -

    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 %} +
    +
    +

    Details

    +
    +
    Phid
    +
    +
    {{ object.id }}
    +
    +
    +
    Type
    +
    {{ object.type }}
    +
    -
    -

    Identifiers

    - {% for chid in object.hids %} -
    -
    {{ chid|default:'' }}
    -
    - {% endfor %} -
    -
    - -

    Components

    -
    - {% for c in object.last_evidence.doc.components %} -
    -
    -
    -
    {{ c.type }}
    -

    - Manufacturer: {{ c.manufacturer }}
    - Model: {{ c.model }}
    - Serial Number: {{ c.serialNumber }} -

    - {{ evidence.created }} -
    -
    -
    + {% 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 %}
    -

    Last Evidence Snapshot

    -
    -
    -

    {{ snapshot }}

    +
    +

    Identifiers

    + {% for chid in object.hids %} +
    +
    {{ chid|default:'' }}
    + {% endfor %}
    +
    + +

    Components

    +
    + {% comment %}Iterates over legacy snapshot components{% endcomment %} + {% for component in object.last_evidence.doc.components %} +
    +
    +
    +
    {{ component.type }}
    +

    + Manufacturer: {{ component.manufacturer }}
    + Model: {{ component.model }}
    + Serial Number: {{ component.serialNumber }} +

    + {{ component.created }} +
    +
    +
    + {% endfor %} + {% comment %}Iterates over new snapshot components{% endcomment %} + {% for component in object.components %} +
    +
    +
    +
    {{ component.type }}
    +

    + {% for component_key, component_value in component.items %} + {% if component_key not in 'actions,type' %} + {{ component_key }}: {{ component_value }}
    + {% endif %} + {% endfor %} +

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

    Last Evidence Snapshot

    +
    +
    +

    {{ snapshot }}

    +
    +
    -

    © {% now "Y" %} eReuse. All rights reserved.

    +

    + ©{% now 'Y' %}eReuse. All rights reserved. +

    - - \ No newline at end of file + + From a9137dbacf05e633034bb1e7757dac3f47aefe9d Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 22 Oct 2024 08:15:17 +0200 Subject: [PATCH 09/25] Remove unneccessary stuff from view --- device/views.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/device/views.py b/device/views.py index 0c80d4d..b99e66b 100644 --- a/device/views.py +++ b/device/views.py @@ -110,11 +110,8 @@ class DetailsView(DashboardView, TemplateView): return context -class DeviceWebView(DashboardView, TemplateView): +class DeviceWebView(TemplateView): template_name = "device_web.html" - title = _("Device Website") - breadcrumb = "Device / Public" - model = Annotation def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] @@ -124,11 +121,9 @@ class DeviceWebView(DashboardView, TemplateView): 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 From a295896b33cd4e5d1b3fe35b5333b40900da9e9b Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 22 Oct 2024 08:20:26 +0200 Subject: [PATCH 10/25] Initial json response when GETting with json header --- device/views.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/device/views.py b/device/views.py index b99e66b..6e305f8 100644 --- a/device/views.py +++ b/device/views.py @@ -1,4 +1,5 @@ import json +from django.http import JsonResponse from django.http import Http404 from django.urls import reverse_lazy @@ -100,7 +101,6 @@ class DetailsView(DashboardView, TemplateView): 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, @@ -116,6 +116,8 @@ class DeviceWebView(TemplateView): def get(self, request, *args, **kwargs): self.pk = kwargs['pk'] self.object = Device(id=self.pk) + if self.request.headers.get('Accept') == 'application/json': + return self.get_json_response() return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs): @@ -127,6 +129,23 @@ class DeviceWebView(TemplateView): }) return context + def get_json_response(self): + data = { + 'object': self.get_object_data(), + # 'components': self.get_components_data(), + } + return JsonResponse(data) + + def get_object_data(self): + object_data = { + 'phid': self.object.id, + 'type': self.object.type, + 'manufacturer': self.object.manufacturer, + 'model': self.object.model, + # 'serial_number': object.last_evidence.doc.device.serialNumber, + } + return object_data + class AddAnnotationView(DashboardView, CreateView): template_name = "new_annotation.html" From 1ec7a69c06e010d797084805cb056e0f704e7a9c Mon Sep 17 00:00:00 2001 From: sergio_gimenez Date: Tue, 22 Oct 2024 09:18:46 +0200 Subject: [PATCH 11/25] Fix title --- device/templates/device_web.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/device/templates/device_web.html b/device/templates/device_web.html index 539c2f9..1a26753 100644 --- a/device/templates/device_web.html +++ b/device/templates/device_web.html @@ -3,7 +3,7 @@ - {{ title }} - {{ object.type }} + {{ object.type }}