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

Merge branch 'dev' of https://github.com/ucoin-io/sakia into dev

parents 6e4962e1 f89f1c43
No related branches found
No related tags found
No related merge requests found
...@@ -91,6 +91,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -91,6 +91,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_mass = await self.account.current_ref(block_ud['monetaryMass'], localized_mass = await self.account.current_ref(block_ud['monetaryMass'],
self.community, self.app)\ self.community, self.app)\
.diff_localized(True, self.app.preferences['international_system_of_units']) .diff_localized(True, self.app.preferences['international_system_of_units'])
if block_ud_minus_1: if block_ud_minus_1:
mass_minus_1 = (float(0) if block_ud['membersCount'] == 0 else mass_minus_1 = (float(0) if block_ud['membersCount'] == 0 else
block_ud_minus_1['monetaryMass'] / block_ud['membersCount']) block_ud_minus_1['monetaryMass'] / block_ud['membersCount'])
...@@ -100,7 +101,11 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -100,7 +101,11 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_mass_minus_1 = await self.account.current_ref(block_ud_minus_1['monetaryMass'], localized_mass_minus_1 = await self.account.current_ref(block_ud_minus_1['monetaryMass'],
self.community, self.app)\ self.community, self.app)\
.diff_localized(True, self.app.preferences['international_system_of_units']) .diff_localized(True, self.app.preferences['international_system_of_units'])
# avoid divide by zero !
if block_ud['membersCount'] == 0 or block_ud_minus_1['monetaryMass'] == 0:
actual_growth = float(0)
else:
actual_growth = block_ud['dividend'] / (block_ud_minus_1['monetaryMass'] / block_ud['membersCount'])
else: else:
localized_mass_minus_1_per_member = QLocale().toString( localized_mass_minus_1_per_member = QLocale().toString(
float(0), 'f', self.app.preferences['digits_after_comma'] float(0), 'f', self.app.preferences['digits_after_comma']
...@@ -108,6 +113,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -108,6 +113,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_mass_minus_1 = QLocale().toString( localized_mass_minus_1 = QLocale().toString(
float(0), 'f', self.app.preferences['digits_after_comma'] float(0), 'f', self.app.preferences['digits_after_comma']
) )
actual_growth = float(0)
# set infos in label # set infos in label
self.label_general.setText( self.label_general.setText(
...@@ -134,9 +140,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -134,9 +140,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_mass_minus_1_per_member, localized_mass_minus_1_per_member,
self.tr('Monetary Mass per member M(t-1)/N(t) in'), self.tr('Monetary Mass per member M(t-1)/N(t) in'),
self.account.current_ref(0, self.community, self.app, None).diff_units, self.account.current_ref(0, self.community, self.app, None).diff_units,
float(0) if block_ud['membersCount'] == 0 or block_ud_minus_1['monetaryMass'] == 0 else actual_growth,
block_ud['dividend'] / (block_ud_minus_1['monetaryMass'] / block_ud['membersCount']),
params['dt'] / 86400, params['dt'] / 86400,
self.tr('Actual growth c = UD(t)/[M(t-1)/N(t)]'), self.tr('Actual growth c = UD(t)/[M(t-1)/N(t)]'),
QLocale.toString( QLocale.toString(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment