Merge branch 'dpp' into join-to-manuals
This commit is contained in:
commit
5e3af04a8c
|
@ -1,5 +1,3 @@
|
|||
import json
|
||||
|
||||
import flask
|
||||
import requests
|
||||
from ereuseapi.methods import API
|
||||
|
@ -163,13 +161,14 @@ class DidView(View):
|
|||
|
||||
def get_result(self):
|
||||
data = {
|
||||
'hardware': {},
|
||||
'document': {},
|
||||
'dpp': self.id_dpp,
|
||||
'algorithm': "sha3_256",
|
||||
}
|
||||
result = {'data': data}
|
||||
|
||||
if self.dpp:
|
||||
data['hardware'] = json.loads(self.dpp.snapshot.json_hw)
|
||||
data['document'] = self.dpp.snapshot.json_hw
|
||||
last_dpp = self.get_last_dpp()
|
||||
url_last = ''
|
||||
if last_dpp:
|
||||
|
@ -181,7 +180,11 @@ class DidView(View):
|
|||
|
||||
dpps = []
|
||||
for d in self.device.dpps:
|
||||
rr = {'dpp': d.key, 'hardware': json.loads(d.snapshot.json_hw)}
|
||||
rr = {
|
||||
'dpp': d.key,
|
||||
'document': d.snapshot.json_hw,
|
||||
'algorithm': "sha3_256",
|
||||
}
|
||||
dpps.append(rr)
|
||||
return {'data': dpps}
|
||||
|
||||
|
|
Reference in a new issue