reorganize portfolio folder

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}')

caotek_mesavoirs/templates/portfolio/allocation_edit.pt

@@ -12,7 +12,7 @@
 
 			<div class="form-group">
 				<label class="col-xs-2 control-label">Classe</label>
-				<div class="col-xs-2">
+				<div class="col-xs-8">
 					<select class="form-control" id="classe" name="classe">
 						<div tal:repeat="item classes_list">
 							<option value="${item.classe}" tal:attributes="selected allocation.classe==item.classe and 'selected' or None">${item.classe}</option>
@@ -22,7 +22,7 @@
 			</div>
 			<div class="form-group">
 				<label class="control-label col-xs-2" for="pc_cible">Pourcentage cible</label>
-				<div class="col-xs-2">
+				<div class="col-xs-8">
 					<input class="form-control" type="text" id="pc_cible" name="pc_cible" value="${allocation.pc_cible}"
 						data-fv-digits="true"
 						data-fv-digits-message="Le nombre doit être composé que de chiffres" />
@@ -33,7 +33,7 @@
 			<div class="form-group"> 
 				<div class="col-xs-offset-2 col-xs-10">
 					<div class="form-group">					
-						<a class="btn btn-default" href="${request.application_url}/allocation_list">
+						<a class="btn btn-default" href="${request.application_url}/portfolio">
 							<span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
 						<button class="btn btn-primary" type="submit" name="form.submitted">
 							<span class="glyphicon glyphicon-ok"></span> Enregistrer</button>

caotek_mesavoirs/templates/portfolio/portfolio.pt

@@ -136,7 +136,7 @@
 				<td tal:condition="total_pv>=0"  class="text-right" style="color: green;"><b>${layout.to_euro(total_pv)}</b></td>
 				<td tal:condition="total_pv <0"  class="text-right" style="color: red;"><b>${layout.to_euro(total_pv)}</b></td>
 				<td class="text-right"><b>${layout.to_percent(total_pc_value, 1)}</b></td>
-				<td class="text-right"><b>${layou.to_euro(total_rdt)total_rdt}</b></td>
+				<td class="text-right"><b>${layout.to_euro(total_rdt)}</b></td>
 				<td></td>
 				<td class="text-right"><b>100.0 %</b></td>
 			</tr>

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)