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

Merge pull request #165 from eReuse/changes/dhid 

adding dhid
This commit is contained in:
cayop 2021-09-22 12:28:25 +02:00 committed by GitHub
parent 9df5872a44 23cb5a2bf6
commit 4adcff0d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ereuse_devicehub/__init__.py
View File

@ -1 +1 @@
__version__ = "1.0.10-beta" __version__ = "1.0.9-beta"

4
ereuse_devicehub/resources/documents/device_row.py
View File

@ -42,7 +42,7 @@ class DeviceRow(OrderedDict):
software = "{software} {version}".format( software = "{software} {version}".format(
software=snapshot.software.name, version=snapshot.version) software=snapshot.software.name, version=snapshot.version)
# General information about device # General information about device
self['DevicehubID'] = device.devicehub_id self['DHID'] = device.devicehub_id
self['DocumentID'] = self.document_id self['DocumentID'] = self.document_id
self['Public Link'] = '{url}{id}'.format( self['Public Link'] = '{url}{id}'.format(
url=url_for('Device.main', _external=True), url=url_for('Device.main', _external=True),
@ -425,7 +425,7 @@ class ActionRow(OrderedDict):
def __init__(self, allocate): def __init__(self, allocate):
super().__init__() super().__init__()
# General information about allocates, deallocate and lives # General information about allocates, deallocate and lives
self['DevicehubID'] = allocate['devicehubID'] self['DHID'] = allocate['devicehubID']
self['Hid'] = allocate['hid'] self['Hid'] = allocate['hid']
self['Start'] = allocate['start'] self['Start'] = allocate['start']
self['FinalUserCode'] = allocate['finalUserCode'] self['FinalUserCode'] = allocate['finalUserCode']

2
tests/files/basic.csv
View File

File diff suppressed because one or more lines are too long

2
tests/files/proposal_extended_csv_report.csv
View File

File diff suppressed because one or more lines are too long

2
tests/test_documents.py
View File

@ -183,7 +183,7 @@ def test_live_export_csv2(user: UserClient, client: Client, app: Devicehub):
assert "4692" in csv_user assert "4692" in csv_user
assert "8692" in csv_user assert "8692" in csv_user
assert "DevicehubID" in csv_user assert "DHID" in csv_user
@pytest.mark.mvp @pytest.mark.mvp