From 6687898784b5650ff56273b09a7638dc2eb0f854 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 9 Aug 2022 17:52:18 +0200 Subject: [PATCH] add placeholder datas --- .../resources/documents/device_row.py | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py index 7fda6684..edca2752 100644 --- a/ereuse_devicehub/resources/documents/device_row.py +++ b/ereuse_devicehub/resources/documents/device_row.py @@ -181,7 +181,6 @@ class BaseDeviceRow(OrderedDict): self['Test DataStorage 3 Power cycle count'] = '' self['Test DataStorage 3 Lifetime (days)'] = '' self['Test DataStorage 3 Power on hours'] = '' - self['DHID'] = '' self['DataStorage 4'] = '' self['DataStorage 4 Manufacturer'] = '' self['DataStorage 4 Model'] = '' @@ -251,12 +250,24 @@ class BaseDeviceRow(OrderedDict): self['Data Storage Rate'] = '' self['Data Storage Range'] = '' self['Benchmark RamSysbench (points)'] = '' + # Placeholder + self['PHID'] = '' + self['Is Abstract'] = '' + self['Pallet'] = '' + self['id Supplier'] = '' + self['Real Info'] = '' + self['Real Components'] = '' + self['Real Type'] = '' + self['Real Serial Number'] = '' + self['Real Model'] = '' + self['Real Manufacturer'] = '' class DeviceRow(BaseDeviceRow): def __init__(self, device: d.Device, document_ids: dict) -> None: super().__init__() - self.device = device + self.placeholder = device.binding or device.placeholder + self.device = self.placeholder.binding or self.placeholder.device self.document_id = document_ids.get(device.id, '') snapshot = get_action(device, 'Snapshot') software = '' @@ -325,6 +336,8 @@ class DeviceRow(BaseDeviceRow): if benchram: self['Benchmark RamSysbench (points)'] = none2str(benchram.rate) + self.get_placeholder_datas() + def components(self): """Function to get all components information of a device.""" assert isinstance(self.device, d.Computer) @@ -489,6 +502,19 @@ class DeviceRow(BaseDeviceRow): if component: self['{} {} Memory (MB)'.format(ctype, i)] = none2str(component.memory) + def get_placeholder_datas(self): + # Placeholder + self['PHID'] = none2str(self.placeholder.phid) + self['Is Abstract'] = none2str(self.device.is_abstract()) + self['Pallet'] = none2str(self.placeholder.pallet) + self['id Supplier'] = none2str(self.placeholder.id_device_supplier) + self['Real Info'] = none2str(self.placeholder.info) + self['Real Components'] = none2str(self.placeholder.components) + self['Real Type'] = none2str(self.placeholder.device.type) + self['Real Manufacturer'] = none2str(self.placeholder.device.manufacturer) + self['Real Model'] = none2str(self.placeholder.device.model) + self['Real Serial Number'] = none2str(self.placeholder.device.serial_number) + class StockRow(OrderedDict): def __init__(self, device: d.Device) -> None: