nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change quantity type to decimal number

Browse source
This commit is contained in:
smurail 2014-10-23 13:29:45 +02:00
commit 232e631ae1
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
weboob/applications/boobank/boobank.py
View file

@ -198,8 +198,8 @@ class InvestmentFormatter(IFormatter):
tot_diff = Decimal(0)
def start_format(self, **kwargs):
self.output(' Label Code Quantity Unit Value Valuation diff ')
self.output('-------------------------------+--------+----------+-----------+-----------+--------')
self.output(' Label Code Quantity Unit Value Valuation diff ')
self.output('-------------------------------+----------+------------+------------+------------+---------')
def format_obj(self, obj, alias):
label = obj.label
@ -210,20 +210,20 @@ class InvestmentFormatter(IFormatter):
self.tot_diff += diff
self.tot_valuation += obj.valuation
return u' %s %s %s %s %s %s' % \
return u' %s %s %s %s %s %s' % \
(self.colored('%-30s' % label[:30], 'red'),
self.colored('%-10s' % obj.code[:8], 'yellow') if not empty(obj.code) else ' ' * 10,
self.colored('%6d' % obj.quantity, 'yellow'),
self.colored('%-8s' % obj.code[:8], 'yellow') if not empty(obj.code) else ' ' * 8,
self.colored('%11.2f' % obj.quantity, 'yellow'),
self.colored('%11.2f' % obj.unitvalue, 'yellow'),
self.colored('%11.2f' % obj.valuation, 'yellow'),
self.colored('%8.2f' % diff, 'green' if diff >= 0 else 'red')
)
def flush(self):
self.output('-------------------------------+--------+----------+-----------+-----------+--------')
self.output(u' Total %s %s' %
(self.colored('%8.2f' % self.tot_valuation, 'yellow'),
self.colored('%8.2f' % self.tot_diff, 'green' if self.tot_diff >=0 else 'red')
self.output(u'-------------------------------+----------+------------+------------+------------+---------')
self.output(u' Total %s %s' %
(self.colored('%11.2f' % self.tot_valuation, 'yellow'),
self.colored('%9.2f' % self.tot_diff, 'green' if self.tot_diff >=0 else 'red')
))
self.tot_valuation = Decimal(0)
self.tot_diff = Decimal(0)

2
weboob/capabilities/bank.py
View file

@ -161,7 +161,7 @@ class Investment(BaseObject):
label = StringField('Label of stocks')
code = StringField('Short code identifier of the stock')
description = StringField('Description of the stock')
quantity = IntField('Quantity of stocks')
quantity = DecimalField('Quantity of stocks')
unitprice = DecimalField('Buy price of one stock')
unitvalue = DecimalField('Current value of one stock')
valuation = DecimalField('Total current valuation of the Investment')