diff --git a/caotek_mesavoirs/layout.py b/caotek_mesavoirs/layout.py index 5d4fae6..1f7ab26 100644 --- a/caotek_mesavoirs/layout.py +++ b/caotek_mesavoirs/layout.py @@ -23,8 +23,8 @@ class GlobalLayout(object): def to_euro(self, x): return to_euro(x) - def to_percent(self, x): - return to_percent(x) + def to_percent(self, x, d): + return to_percent(x, d) def isAnonymous(self): user = authenticated_userid(self.request) diff --git a/caotek_mesavoirs/templates/doc_list.pt b/caotek_mesavoirs/templates/doc_list.pt index 626c2d0..bc56a98 100644 --- a/caotek_mesavoirs/templates/doc_list.pt +++ b/caotek_mesavoirs/templates/doc_list.pt @@ -32,7 +32,7 @@
| MAISON | +MAISON | |||||||
|---|---|---|---|---|---|---|---|---|
| ${item.classe} | ${item.pc_cible} % | -${layout.to_percent(item.pc_atteint)} | -${layout.to_percent(item.pc_atteint - item.pc_cible)} | -${layout.to_percent(item.pc_atteint - item.pc_cible)} | +${layout.to_percent(item.pc_atteint,1)} | +${layout.to_percent(item.pc_atteint - item.pc_cible,1)} | +${layout.to_percent(item.pc_atteint - item.pc_cible,1)} | ${layout.to_euro(item.valeur)} | % de +/- | % PF | TER | -Rendement | +Rdt | @@ -55,17 +55,17 @@${layout.to_euro(ligne.valeur)} | ${layout.to_euro(ligne.plus_value)} | ${layout.to_euro(ligne.plus_value)} | -${layout.to_percent(ligne.pc_plusvalue)} | -${layout.to_percent(ligne.pc_plusvalue)} | +${layout.to_percent(ligne.pc_plusvalue,1)} | +${layout.to_percent(ligne.pc_plusvalue,1)} | ${ligne.pc_allocation} % | -${layout.to_percent(ligne.ter)} | -${layout.to_percent(ligne.rdt)} | +${layout.to_percent(ligne.ter,2)} | +${layout.to_percent(ligne.rdt,1)} |
| ${layout.to_euro(total_valeur)} | ${layout.to_euro(total_pv)} | -${layout.to_percent(total_pc_value)} | +${layout.to_percent(total_pc_value,1)} | 100 % | ||||