diff --git a/caotek_mesavoirs/models/actifs.py b/caotek_mesavoirs/models/portfolio.py similarity index 100% rename from caotek_mesavoirs/models/actifs.py rename to caotek_mesavoirs/models/portfolio.py diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py index 3f257e5..763e647 100644 --- a/caotek_mesavoirs/routes.py +++ b/caotek_mesavoirs/routes.py @@ -6,7 +6,7 @@ def includeme(config): config.add_route('doc_edit', '/doc_edit/{doc_id}') config.add_route('doc_view', '/doc_view/{doc_id}') config.add_route('doc_search', '/doc_search') - # actifs + # portfolio config.add_route('actif_edit', '/actif_edit/{no_id}') config.add_route('actif2_edit', '/actif2_edit/{no_id}') config.add_route('allocation_edit', '/allocation_edit/{no_cat}') diff --git a/caotek_mesavoirs/templates/actifs/actif2_edit.pt b/caotek_mesavoirs/templates/portfolio/actif2_edit.pt similarity index 100% rename from caotek_mesavoirs/templates/actifs/actif2_edit.pt rename to caotek_mesavoirs/templates/portfolio/actif2_edit.pt diff --git a/caotek_mesavoirs/templates/actifs/actif_edit.pt b/caotek_mesavoirs/templates/portfolio/actif_edit.pt similarity index 100% rename from caotek_mesavoirs/templates/actifs/actif_edit.pt rename to caotek_mesavoirs/templates/portfolio/actif_edit.pt diff --git a/caotek_mesavoirs/templates/actifs/allocation_edit.pt b/caotek_mesavoirs/templates/portfolio/allocation_edit.pt similarity index 96% rename from caotek_mesavoirs/templates/actifs/allocation_edit.pt rename to caotek_mesavoirs/templates/portfolio/allocation_edit.pt index db9662b..11a6b70 100644 --- a/caotek_mesavoirs/templates/actifs/allocation_edit.pt +++ b/caotek_mesavoirs/templates/portfolio/allocation_edit.pt @@ -12,7 +12,7 @@
-
+
@@ -33,7 +33,7 @@
- + Retour diff --git a/caotek_mesavoirs/templates/actifs/histo_edit.pt b/caotek_mesavoirs/templates/portfolio/histo_edit.pt similarity index 100% rename from caotek_mesavoirs/templates/actifs/histo_edit.pt rename to caotek_mesavoirs/templates/portfolio/histo_edit.pt diff --git a/caotek_mesavoirs/templates/actifs/histo_list.pt b/caotek_mesavoirs/templates/portfolio/histo_list.pt similarity index 100% rename from caotek_mesavoirs/templates/actifs/histo_list.pt rename to caotek_mesavoirs/templates/portfolio/histo_list.pt diff --git a/caotek_mesavoirs/templates/actifs/portfolio.pt b/caotek_mesavoirs/templates/portfolio/portfolio.pt similarity index 99% rename from caotek_mesavoirs/templates/actifs/portfolio.pt rename to caotek_mesavoirs/templates/portfolio/portfolio.pt index 2206234..9acce31 100644 --- a/caotek_mesavoirs/templates/actifs/portfolio.pt +++ b/caotek_mesavoirs/templates/portfolio/portfolio.pt @@ -136,7 +136,7 @@ ${layout.to_euro(total_pv)} ${layout.to_euro(total_pv)} ${layout.to_percent(total_pc_value, 1)} - ${layou.to_euro(total_rdt)total_rdt} + ${layout.to_euro(total_rdt)} 100.0 % diff --git a/caotek_mesavoirs/views/actifs.py b/caotek_mesavoirs/views/portfolio.py similarity index 95% rename from caotek_mesavoirs/views/actifs.py rename to caotek_mesavoirs/views/portfolio.py index 56e2d83..d7d45cc 100644 --- a/caotek_mesavoirs/views/actifs.py +++ b/caotek_mesavoirs/views/portfolio.py @@ -19,7 +19,7 @@ from sqlalchemy.exc import DBAPIError from ..security import groupfinder from ..models.default import * -from ..models.actifs import * +from ..models.portfolio import * from ..models.members import ( get_member_by_email, ) @@ -34,7 +34,7 @@ import time import yfinance as yf import html -@view_config(route_name='portfolio', renderer='../templates/actifs/portfolio.pt', permission='view') +@view_config(route_name='portfolio', renderer='../templates/portfolio/portfolio.pt', permission='view') def portfolio(request): logged_in = request.authenticated_userid member = get_member_by_email(request, logged_in) @@ -125,7 +125,7 @@ def portfolio(request): 'total_rdt': total_rdt } -@view_config(route_name='actif_edit', renderer='../templates/actifs/actif_edit.pt', permission='view') +@view_config(route_name='actif_edit', renderer='../templates/portfolio/actif_edit.pt', permission='view') def actif_edit(request): no_id = request.matchdict['no_id'] url = request.route_url('actif_edit', no_id=no_id) @@ -189,7 +189,7 @@ def actif_edit(request): 'message': message, } -@view_config(route_name='actif2_edit', renderer='../templates/actifs/actif2_edit.pt', permission='view') +@view_config(route_name='actif2_edit', renderer='../templates/portfolio/actif2_edit.pt', permission='view') def actif2_edit(request): no_id = request.matchdict['no_id'] url = request.route_url('actif2_edit', no_id=no_id) @@ -243,7 +243,7 @@ def actif2_edit(request): } -@view_config(route_name='allocation_edit', renderer='../templates/actifs/allocation_edit.pt', permission='view') +@view_config(route_name='allocation_edit', renderer='../templates/portfolio/allocation_edit.pt', permission='view') def allocation_edit(request): no_cat = request.matchdict['no_cat'] url = request.route_url('allocation_edit', no_cat=no_cat) @@ -291,7 +291,7 @@ def allocation_edit(request): 'message': message, } -@view_config(route_name='histo_list', renderer='../templates/actifs/histo_list.pt', permission='manage') +@view_config(route_name='histo_list', renderer='../templates/portfolio/histo_list.pt', permission='manage') def histo_list(request): # lire l historique items = get_histo(request, '0') @@ -308,7 +308,7 @@ def histo_list(request): 'dt_data': json.dumps(liste), } -@view_config(route_name='histo_edit', renderer='../templates/actifs/histo_edit.pt', permission='view') +@view_config(route_name='histo_edit', renderer='../templates/portfolio/histo_edit.pt', permission='view') def histo_edit(request): no_id = request.matchdict['no_id'] url = request.route_url('histo_edit', no_id=no_id)