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

Fixing export csv fields (first iteration)

Browse source
This commit is contained in:
nad 2020-03-11 18:47:27 +01:00
parent 6731d81c9b
commit 7f5dcb3679
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ from flask import current_app
from ereuse_devicehub.resources.action.models import BenchmarkDataStorage, RateComputer, \ from ereuse_devicehub.resources.action.models import BenchmarkDataStorage, RateComputer, \
TestDataStorage TestDataStorage
from ereuse_devicehub.resources.device import models as d from ereuse_devicehub.resources.device import models as d, states
class DeviceRow(OrderedDict): class DeviceRow(OrderedDict):
@ -35,10 +35,22 @@ class DeviceRow(OrderedDict):
self['Manufacturer'] = device.manufacturer self['Manufacturer'] = device.manufacturer
# self['State'] = device.last_action_of() # self['State'] = device.last_action_of()
self['Registered in'] = format(device.created, '%c') self['Registered in'] = format(device.created, '%c')
self['Price'] = device.price try:
self['Physical state'] = device.last_action_of(*states.Physical.actions()).t
except:
self['Physical state'] = ''
try:
self['Trading state'] = device.last_action_of(*states.Trading.actions()).t
except:
self['Trading state'] = ''
self['Price'] = device.price.price or ''
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 (MB)'] = device.ram_size
self['Data Storage Size (MB)'] = device.data_storage_size
if isinstance(device, d.Mobile):
self['Display Size'] = device.display_size
self['RAM (MB)'] = device.ram_size
self['Data 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:
@ -61,7 +73,7 @@ class DeviceRow(OrderedDict):
# todo put an input specific order (non alphabetic) & where are a list of types components # 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', 'Camera', 'Battery']:
i = 1 i = 1
for component in (r for r in self.device.components if r.type == type): for component in (r for r in self.device.components if r.type == type):
self.fill_component(type, i, component) self.fill_component(type, i, component)