ajout histo_edit.pt et calcul de l'évolution de la valeur de la part

caotek_mesavoirs/views/default.py

@@ -29,7 +29,7 @@ from ..models.default import *
 from ..models.actifs import (
     get_actifs,
     get_allocation,
-    get_histo_by_date,
+    get_histo,
 )
 from ..models.members import (
     get_member_by_email,
@@ -80,6 +80,9 @@ def to_percent(x, d):
 
 @view_config(route_name='home', renderer='../templates/home.pt', permission='view')
 def home(request):
+    logged_in = authenticated_userid(request)
+    member = get_member_by_email(request, logged_in)
+
     message = ''
     
     # lire les categories 
@@ -108,10 +111,10 @@ def home(request):
         total_valeur += item.valeur
         total_pv += item.plus_value
         total_pc_value = total_pv / total_valeur * 100
-        total_rdt += item.valeur * item.rdt / 100
+        total_rdt += item.rendement
 
     # lire l'historique
-    histos = get_histo_by_date(request,'0')
+    histos = get_histo(request,'0')
     courbe_evoln=[]
     courbe_evoln.append(('Date', 'Valeur part PF', 'Valeur part Indice'))
 
@@ -124,6 +127,7 @@ def home(request):
         'page_title': u"Allocation d'actifs",
         'message': message,
         'items': items,
+        'member': member,
         'donut_cible': json.dumps(donut_cible),
         'donut_actuel': json.dumps(donut_actuel),
         'courbe_evoln': json.dumps(courbe_evoln),
@@ -131,7 +135,7 @@ def home(request):
         'total_valeur': total_valeur,
         'total_pv': total_pv,
         'total_pc_value': total_pc_value,
-        'total_rdt': int(total_rdt)
+        'total_rdt': total_rdt
     }    
 
 @view_config(route_name='doc_list', renderer='../templates/doc_list.pt', permission='view')