From 2da17d06c03ff724c94f070811c35263b456e20d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 3 Mar 2023 12:11:11 +0100 Subject: [PATCH] fix dpp template in new version --- .../resources/did/templates/dpp.html | 193 ++++++++++++------ .../templates/inventory/device_detail.html | 26 +-- 2 files changed, 138 insertions(+), 81 deletions(-) diff --git a/ereuse_devicehub/resources/did/templates/dpp.html b/ereuse_devicehub/resources/did/templates/dpp.html index 3a447355..d5399c1e 100644 --- a/ereuse_devicehub/resources/did/templates/dpp.html +++ b/ereuse_devicehub/resources/did/templates/dpp.html @@ -1,83 +1,140 @@ + - - - - - Devicehub | Stamp create and Stamp verify - + + + + + + + + + + + + + + + + + + + + + + - -
-
-
- This is the info for Digital Passport: {{result.dpp}} -
-
-
Hardware
-
    -
  • Device
    • -
      -
    • Chassis: {{ result.result.data.hardware.device.chassis }}
      • -
    • Manufacturer: {{ result.result.data.hardware.device.manufacturer }}
      • -
    • Model: {{ result.result.data.hardware.device.model }}
      • -
    • SerialNumber: {{ result.result.data.hardware.device.serialNumber }}
      • -
    • Sku: {{ result.result.data.hardware.device.sku }}
      • -
    • Type: {{ result.result.data.hardware.device.type }}
      • -
    • Version: {{ result.result.data.hardware.device.version }}
      • -
    -
  • Components
    • -
      - {% for component in result.result.data.hardware.components %} -
    • {{ component }}
      • + +
      + +
      +
      + +
      +
      + +
      +
      +

      + {{ result.result.data.hardware.device.type }} - + {{ result.result.data.hardware.device.manufacturer }} + {{ result.result.data.hardware.device.model }} +

      +
      +
      + This is the info for Digital Passport:
      + {{ result.result.data.dpp }} +
      +
      +
      +
      +
      Device
      + {% for key, value in result.result.data.hardware.device.items() %} +
      +
      + {{ key }} +
      +
      + {{ value or '' }} +
      +
      + {% endfor %} +
      +
      + +
      +
      +
      Components
      + {% for component in result.result.data.hardware.components %} + {% for key, value in component.items() %} +
      +
      + {{ key }} +
      +
      + {{ value or '' }} +
      +
      {% endfor %} -
    -
+ {% endfor %} +
+
- {% if result.result.data.url_last %} -
Last Digital passport
- {{ result.result.data.url_last }} - {% endif %} + {% if result.result.data.url_last %} +
+
+
Last Dpp
+
+
+ Last Dpp +
+
+
+
+ {% endif %} - {% if result.result.data.digitalPassports %} -
Digital Passports
- - {% endif %} -
+
+ + + + + + + +
+
+
+
+
+ © Copyright Usody. All Rights Reserved +
+
+ Help | + Privacy | + Terms +
+
+ DeviceHub +
+
+
+ diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index dcd1e3d2..44fa8e8f 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -275,25 +275,25 @@ {% if placeholder.binding %}
Digital Passports
+ {% for dpp in placeholder.binding.dpps %}
- {% for dpp in placeholder.binding.dpps %}
-
-
-
Time Stamp
- {{ dpp.timestamp }} -
-
-

- {{ dpp.key }}
-

- {{ dpp.created.strftime('%H:%M %d-%m-%Y') }} -
+
+
+
Time Stamp
+ {{ dpp.timestamp }} +
+
+

+ {{ dpp.key }}
+

+ {{ dpp.created.strftime('%H:%M %d-%m-%Y') }} +
- {% endfor %}
+ {% endfor %}
{% endif %}