diff --git a/caotek_mesavoirs/models/actifs.py b/caotek_mesavoirs/models/actifs.py index 906e6a9..687fd0e 100644 --- a/caotek_mesavoirs/models/actifs.py +++ b/caotek_mesavoirs/models/actifs.py @@ -109,3 +109,12 @@ def get_classes(request, classe): results = request.dbsession.execute(query, {'classe': classe}).first() return results +def get_histo_by_date(request, date): + if date == '0': + query = "SELECT * FROM histo ORDER BY date" + results = request.dbsession.execute(query).fetchall() + else: + # lire le histo par la date + query = """SELECT * FROM histo WHERE date=:date;""" + results = request.dbsession.execute(query, {'date': date}).first() + return results diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py index 65269ce..cdadfd6 100644 --- a/caotek_mesavoirs/routes.py +++ b/caotek_mesavoirs/routes.py @@ -10,6 +10,7 @@ def includeme(config): config.add_route('actif2_edit', '/actif2_edit/{no_id}') config.add_route('allocation_list', '/allocation_list') config.add_route('allocation_edit', '/allocation_edit/{no_cat}') + config.add_route('histo_list', '/histo_list') # members config.add_route('changer_mdp', '/changer_mdp') config.add_route('envoyer_mdp', '/envoyer_mdp') diff --git a/caotek_mesavoirs/templates/actifs/histo_list.pt b/caotek_mesavoirs/templates/actifs/histo_list.pt new file mode 100644 index 0000000..f1ec282 --- /dev/null +++ b/caotek_mesavoirs/templates/actifs/histo_list.pt @@ -0,0 +1,46 @@ + +
+ +

+ + Retour +

+ + + + + + + + + + + + + +
DateMvt CashValeur PfNb PartValeur PartNb Part refValeur Part ref
+ +
+
+ + + +
+
+ + diff --git a/caotek_mesavoirs/views/actifs.py b/caotek_mesavoirs/views/actifs.py index c436704..48f36da 100644 --- a/caotek_mesavoirs/views/actifs.py +++ b/caotek_mesavoirs/views/actifs.py @@ -32,6 +32,7 @@ from ..models.members import ( from ..views.default import ( to_euro, to_usd, + to_decimal, ) import json @@ -267,3 +268,18 @@ def allocation_edit(request): 'message': message, } +@view_config(route_name='histo_list', renderer='../templates/actifs/histo_list.pt', permission='manage') +def histo_list(request): + # lire l historique + items = get_histo_by_date(request, '0') + + # construire la liste + liste=[] + for item in items: + d = (item.date.strftime('%d/%m/%Y'), to_euro(item.mvt_cash), to_euro(item.valeur_pf), to_euro(item.nb_part), to_euro(item.val_part), to_euro(item.nb_part_ref), to_euro(item.val_part_ref)) + liste.append(d) + + return { + 'page_title': u'Historique', + 'dt_data': json.dumps(liste), + }