trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add new Events DataStorage fields in export

Browse source
This commit is contained in:
nad 2019-03-06 18:42:50 +01:00
parent 8f4ba8d503
commit f1f285eb1d
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ereuse_devicehub/resources/documents/device_row.py
View file

@ -3,6 +3,7 @@ from collections import OrderedDict
from flask import current_app from flask import current_app
from ereuse_devicehub.resources.device import models as d from ereuse_devicehub.resources.device import models as d
from ereuse_devicehub.resources.event.models import TestDataStorage, BenchmarkDataStorage
class DeviceRow(OrderedDict): class DeviceRow(OrderedDict):
@ -15,6 +16,7 @@ class DeviceRow(OrderedDict):
d.SoundCard.t: 2 d.SoundCard.t: 2
} }
# TODO Add more fields information
def __init__(self, device: d.Device) -> None: def __init__(self, device: d.Device) -> None:
super().__init__() super().__init__()
self.device = device self.device = device
@ -22,6 +24,8 @@ class DeviceRow(OrderedDict):
self['Type'] = device.t self['Type'] = device.t
if isinstance(device, d.Computer): if isinstance(device, d.Computer):
self['Chassis'] = device.chassis self['Chassis'] = device.chassis
else:
self['Chassis'] = ''
self['Tag 1'] = self['Tag 2'] = self['Tag 3'] = '' self['Tag 1'] = self['Tag 2'] = self['Tag 3'] = ''
for i, tag in zip(range(1, 3), device.tags): for i, tag in zip(range(1, 3), device.tags):
self['Tag {}'.format(i)] = format(tag) self['Tag {}'.format(i)] = format(tag)
@ -29,12 +33,12 @@ class DeviceRow(OrderedDict):
self['Model'] = device.model self['Model'] = device.model
self['Manufacturer'] = device.manufacturer self['Manufacturer'] = device.manufacturer
# self['State'] = device.last_event_of() # self['State'] = device.last_event_of()
self['Price'] = device.price
self['Registered in'] = format(device.created, '%c') self['Registered in'] = format(device.created, '%c')
self['Price'] = device.price
if isinstance(device, d.Computer): if isinstance(device, d.Computer):
self['Processor'] = device.processor_model self['Processor'] = device.processor_model
self['RAM (GB)'] = device.ram_size self['RAM (GB)'] = device.ram_size
self['Storage Size (MB)'] = device.data_storage_size self['Data Storage Size (MB)'] = device.data_storage_size
rate = device.rate rate = device.rate
if rate: if rate:
self['Rate'] = rate.rating self['Rate'] = rate.rating
@ -54,7 +58,7 @@ class DeviceRow(OrderedDict):
Function to get all components information of a device Function to get all components information of a device
""" """
assert isinstance(self.device, d.Computer) assert isinstance(self.device, d.Computer)
# todo put an input specific order (non alphabetic) # todo put an input specific order (non alphabetic) & where are a list of types components
for type in sorted(current_app.resources[d.Component.t].subresources_types): # type: str for type in sorted(current_app.resources[d.Component.t].subresources_types): # type: str
max = self.NUMS.get(type, 4) max = self.NUMS.get(type, 4)
if type not in ['Component', 'HardDrive', 'SolidStateDrive']: if type not in ['Component', 'HardDrive', 'SolidStateDrive']:
@ -87,11 +91,18 @@ class DeviceRow(OrderedDict):
if isinstance(component, d.DataStorage): if isinstance(component, d.DataStorage):
self['{} {} Size (MB)'.format(type, i)] = component.size self['{} {} Size (MB)'.format(type, i)] = component.size
self['{} {} Privacy'.format(type, i)] = component.privacy self['{} {} Privacy'.format(type, i)] = component.privacy
try:
# todo decide if is relevant more info about Motherboard self['{} {} Lifetime'.format(type, i)] = component.last_event_of(TestDataStorage).lifetime
""" Particular fields for component Motherboard """ except:
if isinstance(component, d.Motherboard): self['{} {} Lifetime'.format(type, i)] = ''
self['{} {} Slots'.format(type, i)] = component.slots try:
self['{} {} Reading speed'.format(type, i)] = component.last_event_of(BenchmarkDataStorage).read_speed
except:
self['{} {} Reading speed'.format(type, i)] = ''
try:
self['{} {} Writing speed'.format(type, i)] = component.last_event_of(BenchmarkDataStorage).write_speed
except:
self['{} {} Writing speed'.format(type, i)] = ''
""" Particular fields for component Processor """ """ Particular fields for component Processor """
if isinstance(component, d.Processor): if isinstance(component, d.Processor):
@ -102,7 +113,6 @@ class DeviceRow(OrderedDict):
if isinstance(component, d.RamModule): if isinstance(component, d.RamModule):
self['{} {} Size (MB)'.format(type, i)] = component.size self['{} {} Size (MB)'.format(type, i)] = component.size
self['{} {} Speed (MHz)'.format(type, i)] = component.speed self['{} {} Speed (MHz)'.format(type, i)] = component.speed
self['{} {} Size'.format(type, i)] = component.size
# todo add Display size, ... # todo add Display size, ...
# todo add NetworkAdapter speedLink? # todo add NetworkAdapter speedLink?