diff --git a/modules/axabanque/pages/bank.py b/modules/axabanque/pages/bank.py index ee6c41e0b0f38ab8a45a0d865115b34acc3abf1a..d49d14ff61def6695e4bcca8c9a89993b7fed4f0 100644 --- a/modules/axabanque/pages/bank.py +++ b/modules/axabanque/pages/bank.py @@ -515,7 +515,7 @@ class item(ItemElement): obj_code = Regexp(CleanText(TableCell('code')), r'(.{12})', default=NotAvailable) obj_code_type = lambda self: Investment.CODE_TYPE_ISIN if Field('code')(self) is not NotAvailable else NotAvailable - def obj_diff_percent(self): + def obj_diff_ratio(self): diff_percent = MyDecimal(TableCell('diff')(self)[0])(self) return diff_percent/100 if diff_percent != NotAvailable else diff_percent diff --git a/modules/binck/pages.py b/modules/binck/pages.py index 7249bd5237e6477bbc50dd2d2c3ef051ae9469aa..cfece4d33a4706d6a7949fd76eea9bf52ff0f2b8 100644 --- a/modules/binck/pages.py +++ b/modules/binck/pages.py @@ -217,7 +217,7 @@ class item(ItemElement): obj_unitprice = Env('unitprice', default=NotAvailable) obj_valuation = MyDecimal(Dict('ValueInEuro')) obj_diff = MyDecimal(Dict('ResultValueInEuro')) - obj_diff_percent = Eval(lambda x: x / 100, MyDecimal(Dict('ResultPercentageInEuro'))) + obj_diff_ratio = Eval(lambda x: x / 100, MyDecimal(Dict('ResultPercentageInEuro'))) obj_original_currency = Env('o_currency', default=NotAvailable) obj_original_unitvalue = Env('o_unitvalue', default=NotAvailable) obj_original_unitprice = Env('o_unitprice', default=NotAvailable) diff --git a/modules/caissedepargne/pages.py b/modules/caissedepargne/pages.py index 03053c4d0691bd01d9da6e5f80f4fda0f24a4667..c057df6ab04295ee7f5c74f6ccc0a8a038988d62 100644 --- a/modules/caissedepargne/pages.py +++ b/modules/caissedepargne/pages.py @@ -1169,7 +1169,7 @@ def obj_diff(self): return Eval(float_to_decimal, Dict('montantPlusValue/valeur'))(self) return NotAvailable - def obj_diff_percent(self): + def obj_diff_ratio(self): if Dict('tauxPlusValue')(self): return Eval(lambda x: float_to_decimal(x) / 100, Dict('tauxPlusValue'))(self) return NotAvailable diff --git a/modules/cragr/regions/pages.py b/modules/cragr/regions/pages.py index e7f53892292ff8faefc5c3be4e242f21b487ba42..869de8af53e9b1b0b8d6105665f1d402c6755163 100644 --- a/modules/cragr/regions/pages.py +++ b/modules/cragr/regions/pages.py @@ -833,7 +833,7 @@ class item(ItemElement): CleanDecimal.French('.//span[@class="box"][span[span[text()="RĂ©partition"]]]/span[2]/span') ) - def obj_diff_percent(self): + def obj_diff_ratio(self): # Euro funds have '-' instead of a diff_percent value if CleanText('.//span[@class="box"][span[span[text()="+/- value latente (%)"]]]/span[2]/span')(self) == '-': return NotAvailable diff --git a/modules/fortuneo/pages/accounts_list.py b/modules/fortuneo/pages/accounts_list.py index 7ac35ba9d54598a4ee9b001fdf6e106390baf4de..e3e5c5cdb0acf18f2cfcd0c61fae254cc525543e 100644 --- a/modules/fortuneo/pages/accounts_list.py +++ b/modules/fortuneo/pages/accounts_list.py @@ -180,7 +180,7 @@ def get_investments(self, account): inv.valuation = self.parse_decimal(cols[self.COL_VALUATION]) inv.diff = self.parse_decimal(cols[self.COL_PERF]) diff_percent = self.parse_decimal(cols[self.COL_PERF_PERCENT]) - inv.diff_percent = diff_percent / 100 if diff_percent else NotAvailable + inv.diff_ratio = diff_percent / 100 if diff_percent else NotAvailable if is_isin_valid(inv.code): inv.code_type = Investment.CODE_TYPE_ISIN diff --git a/modules/hsbc/pages/investments.py b/modules/hsbc/pages/investments.py index 19dc4e0e362fc4b9873ac38dac6d3c6528214411..1432aba2d239ae983fd2d1f2f12f2dd543d50cab 100644 --- a/modules/hsbc/pages/investments.py +++ b/modules/hsbc/pages/investments.py @@ -385,7 +385,7 @@ def obj_vdate(self): obj_valuation = CleanDecimal(Dict( 'holdingDetailInformation/0/holdingDetailMultipleCurrencyInformation/0/productHoldingMarketValueAmount' ), default=NotAvailable) - obj_diff_percent = CleanDecimal(Dict( + obj_diff_ratio = CleanDecimal(Dict( 'holdingDetailInformation/0/holdingDetailMultipleCurrencyInformation/0' '/profitLossUnrealizedPercent' ), default=NotAvailable) @@ -443,7 +443,7 @@ def obj__invest_account_id(self): obj_unitprice = CleanDecimal(Dict( 'holdingSummaryMultipleCurrencyInformation/0/productHoldingUnitCostAverageAmount' ),default=NotAvailable) - obj_diff_percent = CleanDecimal(Dict( + obj_diff_ratio = CleanDecimal(Dict( 'holdingSummaryMultipleCurrencyInformation/0/profitLossUnrealizedPercent' ), default=NotAvailable) obj_diff = CleanDecimal(Dict( @@ -546,7 +546,7 @@ class item(ItemElement): obj_unitprice = CleanDecimal(TableCell('unitprice'), replace_dots=True) obj_unitvalue = CleanDecimal(TableCell('unitvalue'), replace_dots=True) - def obj_diff_percent(self): + def obj_diff_ratio(self): diff_percent = CleanDecimal( Regexp(CleanText(TableCell('diff_percent')), r'\d+,\d+'), replace_dots=True diff --git a/modules/ing/web/accounts_list.py b/modules/ing/web/accounts_list.py index 801f0bd6a21371678227461b36f46b98b1eccf35..681971d203757c353cc193dd66b130b97aac858b 100644 --- a/modules/ing/web/accounts_list.py +++ b/modules/ing/web/accounts_list.py @@ -400,7 +400,7 @@ def obj_code(self): else: return NotAvailable - def obj_diff_percent(self): + def obj_diff_ratio(self): diff = CleanDecimal(TableCell('diff_percent'), replace_dots=True, default=NotAvailable)(self) if not diff: return diff diff --git a/modules/linebourse/api/pages.py b/modules/linebourse/api/pages.py index b0ec69defafe5410c97c636049cea0e37a5b010f..98e9afcd171dc293ff5eb44a8f60a755b8a326ed 100644 --- a/modules/linebourse/api/pages.py +++ b/modules/linebourse/api/pages.py @@ -84,10 +84,10 @@ def obj_unitprice(self): return CleanDecimal(Dict('pam'))(self) return NotAvailable - def obj_diff_percent(self): + def obj_diff_ratio(self): if not Env('sign')(self): return NotAvailable - # obj_diff_percent key can have several names: + # obj_diff_ratio key can have several names: if Dict('plvPourcentage', default=None)(self): return CleanDecimal(Dict('plvPourcentage'), sign=lambda x: Env('sign')(self))(self) elif Dict('pourcentagePlv', default=None)(self): diff --git a/modules/spirica/pages.py b/modules/spirica/pages.py index 6ef6b5d35934e4f6f6a49193ec9d335a5745b282..aa8012af36469b565c081d180125a6a9cd73f7b2 100644 --- a/modules/spirica/pages.py +++ b/modules/spirica/pages.py @@ -216,10 +216,10 @@ class iter_pm_investment(TableInvestment): class item(ItemInvestment): obj_diff = MyDecimal(TableCell('diff'), default=NotAvailable) - obj_diff_percent = Eval(lambda x: x/100, MyDecimal(TableCell('diff_percent'))) + obj_diff_ratio = Eval(lambda x: x/100, MyDecimal(TableCell('diff_percent'))) obj_unitprice = MyDecimal(TableCell('unitprice')) - def obj_diff_percent(self): + def obj_diff_ratio(self): diff_percent = MyDecimal(TableCell('diff_percent'))(self) if diff_percent: return diff_percent / 100