Skip to content
Snippets Groups Projects
Commit f87cf3fe authored by inso's avatar inso
Browse files

Merge remote-tracking branch 'origin/vtexier_fixes' into dev082

parents e303aae0 cf7dcc8b
No related branches found
No related tags found
No related merge requests found
...@@ -148,10 +148,10 @@ class Community(object): ...@@ -148,10 +148,10 @@ class Community(object):
else: else:
return 1 return 1
def get_ud_block(self): def get_ud_block(self, x=0):
ud = self.request(bma.blockchain.UD) blocks = self.request(bma.blockchain.UD)['result']['blocks']
if len(ud['result']['blocks']) > 0: if len(blocks) > 0:
block_number = ud['result']['blocks'][-1] block_number = blocks[len(blocks)-(1+x)]
block = self.request(bma.blockchain.Block, block = self.request(bma.blockchain.Block,
req_args={'number': block_number}) req_args={'number': block_number})
return block return block
......
...@@ -40,6 +40,11 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -40,6 +40,11 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
except Exception as e: except Exception as e:
logging.debug('community get_ud_block error : ' + str(e)) logging.debug('community get_ud_block error : ' + str(e))
return False return False
try:
block_t_minus_1 = self.community.get_ud_block(1)
except Exception as e:
logging.debug('community get_ud_block error : ' + str(e))
return False
# set infos in label # set infos in label
self.label_general.setText( self.label_general.setText(
...@@ -64,7 +69,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -64,7 +69,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
self.get_referential_value(block['monetaryMass'] / block['membersCount']), self.get_referential_value(block['monetaryMass'] / block['membersCount']),
'Monetary Mass per member M(t)/N(t) in', 'Monetary Mass per member M(t)/N(t) in',
self.get_referential_name(), self.get_referential_name(),
block['dividend'] / (block['monetaryMass'] / block['membersCount']), block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']),
params['dt'] / 86400, params['dt'] / 86400,
'Actual growth c = UD(t)/[M(t-1)/N(t)]', 'Actual growth c = UD(t)/[M(t-1)/N(t)]',
datetime.datetime.fromtimestamp(block['medianTime'] + params['dt']).strftime("%d/%m/%Y %I:%M"), datetime.datetime.fromtimestamp(block['medianTime'] + params['dt']).strftime("%d/%m/%Y %I:%M"),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment