From df44849ad3946160f8fb665251b3745f8674de9a Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Fri, 13 May 2022 12:51:31 +0200
Subject: [PATCH] add allocate status in devices export

---
 .../resources/documents/device_row.py         | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py
index f4b8ba93..5f48eaa3 100644
--- a/ereuse_devicehub/resources/documents/device_row.py
+++ b/ereuse_devicehub/resources/documents/device_row.py
@@ -70,16 +70,19 @@ class DeviceRow(OrderedDict):
         self['Updated in (software)'] = device.updated
         self['Updated in (web)'] = ''
 
+        self['Physical state'] = ''
+        if device.physical_status:
+            self['Physical state'] = device.physical_status.type
+
+        self['Allocate state'] = ''
+        if device.allocated_status:
+            self['Allocate state'] = device.allocated_status.type
+
         try:
-            self['Physical state'] = device.last_action_of(
-                *states.Physical.actions()).t
-        except LookupError:
-            self['Physical state'] = ''
-        try:
-            self['Trading state'] = device.last_action_of(
+            self['Lifecycle state'] = device.last_action_of(
                 *states.Trading.actions()).t
         except LookupError:
-            self['Trading state'] = ''
+            self['Lifecycle state'] = ''
         if isinstance(device, d.Computer):
             self['Processor'] = none2str(device.processor_model)
             self['RAM (MB)'] = none2str(device.ram_size)
@@ -367,15 +370,18 @@ class StockRow(OrderedDict):
         self['Model'] = none2str(device.model)
         self['Manufacturer'] = none2str(device.manufacturer)
         self['Registered in'] = format(device.created, '%c')
+        self['Physical state'] = ''
+        if device.physical_status:
+            self['Physical state'] = device.physical_status.type
+
+        self['Allocate state'] = ''
+        if device.allocated_status:
+            self['Allocate state'] = device.allocated_status.type
+
         try:
-            self['Physical state'] = device.last_action_of(
-                *states.Physical.actions()).t
+            self['Lifecycle state'] = device.last_action_of(*states.Trading.actions()).t
         except LookupError:
-            self['Physical state'] = ''
-        try:
-            self['Trading state'] = device.last_action_of(*states.Trading.actions()).t
-        except LookupError:
-            self['Trading state'] = ''
+            self['Lifecycle state'] = ''
             self['Price'] = none2str(device.price)
             self['Processor'] = none2str(device.processor_model)
             self['RAM (MB)'] = none2str(device.ram_size)