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 @@
- + diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index c1d27ba..1cdbcf9 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -20,9 +20,9 @@ - - - + + + @@ -45,7 +45,7 @@ - + @@ -55,17 +55,17 @@ - - + + - - + + - + diff --git a/caotek_mesavoirs/templates/layouts/global_layout.pt b/caotek_mesavoirs/templates/layouts/global_layout.pt index 55765cb..c9c7888 100644 --- a/caotek_mesavoirs/templates/layouts/global_layout.pt +++ b/caotek_mesavoirs/templates/layouts/global_layout.pt @@ -56,8 +56,8 @@ diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index ddfc746..d645aa8 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -62,9 +62,19 @@ def to_int(x): except ValueError: return 0 -def to_percent(x): +def to_percent(x, d): """Takes a float and returns a string""" - return (u"%.1f " % x).replace('.', ',') + "%" + if x == 0: + pc = '' + elif d == 2: + pc = u"%.2f " % x + elif d == 3: + pc = u"%.3f " % x + else: + pc = u"%.1f " % x + if len(pc) > 0: + pc += "%" + return pc.replace('.', ',') @view_config(route_name='home', renderer='../templates/home.pt', permission='view')
MAISONMAISON
${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 TERRendementRdt
${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 %