diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 1e0896de..8f374a95 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -1137,6 +1137,9 @@ class SnapshotListView(GenericMixin): 'status': snap.get_status(), 'severity': snap.severity, 'created': snap.created, + 'type_device': snap.get_type_device(), + 'original_dhid': snap.get_original_dhid(), + 'new_device': snap.get_new_device(), } continue diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 769e43a1..4d298af0 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -48,6 +48,36 @@ class SnapshotsLog(Thing): return '' + def get_original_dhid(self): + if self.snapshot: + dev = self.snapshot.device + if dev.dhid_bk: + return dev.dhid_bk + + return self.get_device() + + def get_type_device(self): + if self.snapshot: + if self.snapshot.device.binding: + return self.snapshot.device.binding.status + + return '' + + def get_new_device(self): + if not self.snapshot: + return '' + + if not self.snapshot.device: + return '' + + snapshots = [] + for s in self.snapshot.device.actions: + if s == self.snapshot: + continue + if s.type == self.snapshot.type: + snapshots.append(s) + return snapshots and 'Update' or 'New Device' + class PlaceholdersLog(Thing): """A Placeholder log.""" diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html index 77e37ae5..2c6b5645 100644 --- a/ereuse_devicehub/templates/inventory/snapshots_list.html +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -31,6 +31,9 @@ DHID System UUID Status + Type Upload + Type Device + Original DHID Time @@ -68,6 +71,15 @@ {{ snap.status }} + + {{ snap.new_device }} + + + {{ snap.type_device }} + + + {{ snap.original_dhid }} + {{ snap.created.strftime('%H:%M %d-%m-%Y') }} {% if snap.snapshot_uuid %} diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index a088df5a..0ff63885 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -1699,7 +1699,6 @@ def test_export_lots(user3: UserClientFlask): @pytest.mark.mvp @pytest.mark.usefixtures(conftest.app_context.__name__) def test_export_snapshot_json(user3: UserClientFlask): - file_name = 'real-eee-1001pxd.snapshot.13.json' snap = create_device(user3, file_name)