améliorer la page d'accueil

This commit is contained in:
2017-07-24 23:06:15 +02:00
parent 3d883b3afd
commit c24efa00d9
10 changed files with 228 additions and 100 deletions

View File

@@ -11,7 +11,17 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="col-xs-2 control-label">Symbole</label>
<label class="control-label col-xs-2" for="categorie">Catégorie</label>
<div class="col-xs-3">
<select class="form-control" id="categorie" name="categorie">
<div tal:repeat="item categories_list">
<option value="${item.categorie}" tal:attributes="selected actif.categorie==item.categorie and 'selected' or None">${item.categorie}</option>
</div>
</select>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">Identifiant</label>
<div class="col-xs-3">
<input class="form-control" type="text" name="symbole"
value="${actif.symbole}" placeholder="15 caractères maximum"
@@ -23,35 +33,39 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="categorie">Catégorie</label>
<label class="col-xs-2 control-label">Libellé</label>
<div class="col-xs-3">
<select class="form-control" id="categorie" name="categorie">
<div tal:repeat="item categories_list">
<option value="${item.categorie}" tal:attributes="selected actif.categorie==item.categorie and 'selected' or None">${item.categorie}</option>
</div>
</select>
<input class="form-control" type="text" name="libelle"
value="${actif.libelle}" placeholder="45 caractères maximum"
data-fv-notempty="true"
data-fv-notempty-message="Le libelle est obligatoire"
data-fv-stringlength="true"
data-fv-stringlength-max="45"
data-fv-stringlength-message="45 caractères maximum" />
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="nombre">Nombre</label>
<div class="col-xs-2">
<input class="form-control" type="text" id="nombre" name="nombre" value="${actif.nombre}"
data-fv-digits="true"
data-fv-digits-message="Le nombre doit être composé que de chiffres" />
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="pru">PRU</label>
<label class="control-label col-xs-2" for="pru">Total investi</label>
<div class="col-xs-2">
<div class="input-group">
<div class="input-group-addon">€</div>
<div class="input-group-addon">K€</div>
<input class="form-control" type="text" id="pru" name="pru" value="${actif.pru}"
data-fv-numeric="true"
data-fv-numeric-message="Le nombre doit être composé de chiffres et/ou de ." />
data-fv-numeric-message="Le montant doit être composé de chiffres et/ou de ." />
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="cours">Total valeur</label>
<div class="col-xs-2">
<div class="input-group">
<div class="input-group-addon">K€</div>
<input class="form-control" type="text" id="cours" name="cours" value="${actif.cours}"
data-fv-numeric="true"
data-fv-numeric-message="Le montant doit être composé de chiffres et/ou de ." />
</div>
</div>
</div>
<br />
<div class="form-group">
<div class="col-xs-offset-2 col-xs-10">
<div class="form-group">

View File

@@ -10,6 +10,16 @@
data-fv-icon-invalid="glyphicon glyphicon-remove"
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="control-label col-xs-2" for="categorie">Catégorie</label>
<div class="col-xs-3">
<select class="form-control" id="categorie" name="categorie">
<div tal:repeat="item categories_list">
<option value="${item.categorie}" tal:attributes="selected actif.categorie==item.categorie and 'selected' or None">${item.categorie}</option>
</div>
</select>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">Symbole</label>
<div class="col-xs-3">

View File

@@ -1,7 +1,8 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<div tal:condition="message" tal:content="message" class="alert alert-danger" />
<div tal:condition="message" tal:content="message" class="alert alert-info" />
<form id="actif_list-form" action="${url}" method="post">
<div class="form-group">
<div class="form-group">
@@ -19,25 +20,37 @@
<th>Catégorie</th>
<th>Symbole</th>
<th>Libellé</th>
<th>Nombre</th>
<th>Cours</th>
<th>PRU</th>
<th>Valeur</th>
<th>Plus-Value</th>
<th class="text-right">Nombre</th>
<th class="text-right">PRU</th>
<th class="text-right">Cours</th>
<th class="text-right">Valeur</th>
<th class="text-right">+/- Valeur</th>
<th class="text-right">% de +/-</th>
<th class="text-right">% PF</th>
</tr>
</thead>
<tbody>
<tr tal:repeat="ligne items">
<td class="${ligne.bg}">${ligne.categorie}</td>
<td>${ligne.symbole}</td>
<td tal:condition="ligne.categorie[:6]=='Action'"><a href="actif_edit/${ligne.no_id}">${ligne.libelle}</a></td>
<td tal:condition="ligne.categorie[:6]<>'Action'"><a href="actif2_edit/${ligne.no_id}">${ligne.libelle}</a></td>
<td tal:condition="ligne.type=='ACTION'"><a href="actif_edit/${ligne.no_id}">${ligne.libelle}</a></td>
<td tal:condition="ligne.type<>'ACTION'"><a href="actif2_edit/${ligne.no_id}">${ligne.libelle}</a></td>
<td class="text-right">${ligne.nombre}</td>
<td class="text-right">${ligne.cours}</td>
<td class="text-right">${layout.to_euro(ligne.pru)}</td>
<td class="text-right">${ligne.cours}</td>
<td class="text-right">${layout.to_euro(ligne.valeur)}</td>
<td tal:condition="ligne.plus_value>=0" class="text-right" style="color: green;">${layout.to_euro(ligne.plus_value)}</td>
<td tal:condition="ligne.plus_value <0" class="text-right" style="color: red;">${layout.to_euro(ligne.plus_value)}</td>
<td tal:condition="ligne.pc_plusvalue>=0" class="text-right" style="color: green;">${layout.to_percent(ligne.pc_plusvalue)}</td>
<td tal:condition="ligne.pc_plusvalue <0" class="text-right" style="color: red;">${layout.to_percent(ligne.pc_plusvalue)}</td>
<td class="text-right">${ligne.pc_allocation} %</td>
</tr>
<tr>
<td class="text-right" colspan="6"><b>Total</b></td>
<td class="text-right"><b>${layout.to_euro(total_valeur)}</b></td>
<td class="text-right"><b>${layout.to_euro(total_pv)}</b></td>
<td class="text-right"><b>${layout.to_percent(total_pc_value)}</b></td>
<td class="text-right"><b>100.0 %</b></td>
</tr>
</tbody>
</table>

View File

@@ -11,7 +11,7 @@
data-fv-icon-validating="glyphicon glyphicon-refresh">
<div class="form-group">
<label class="col-xs-2 control-label">Categorie</label>
<label class="col-xs-2 control-label">Libellé</label>
<div class="col-xs-3">
<input class="form-control" type="text" name="categorie"
value="${categorie.categorie}" placeholder="15 caractères maximum"
@@ -22,6 +22,16 @@
data-fv-stringlength-message="15 caractères maximum" />
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">Type</label>
<div class="col-xs-2">
<select class="form-control" id="type" name="type">
<div tal:repeat="item types_list">
<option value="${item}" tal:attributes="selected categorie.type==item and 'selected' or None">${item}</option>
</div>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="pc_cible">Pourcentage cible</label>
<div class="col-xs-2">

View File

@@ -3,33 +3,78 @@
<div tal:condition="message" tal:content="message" class="alert alert-danger" />
<p>
<a href="categorie_edit/0" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-plus"></span> Nouvelle categorie</a>
</p>
<div class="col-md-6">
<table id="categories_list" class="table table-striped table-bordered">
<thead>
<tr>
<th>Categorie</th>
<th class="text-right">% cible</th>
<th class="text-right">% atteint</th>
<th class="text-right">Valeur</th>
</tr>
</thead>
<tbody>
<tr tal:repeat="item items">
<td class="${item.bg}"><a href="categorie_edit/${item.no_cat}">${item.categorie}</a></td>
<td class="text-right">${layout.to_percent(item.pc_cible)}</td>
<td class="text-right">${layout.to_percent(item.pc_atteint)}</td>
<td class="text-right">${layout.to_euro(item.valeur)}</td>
</tr>
</tbody>
</table>
<div class="row">
<p>"<i>Investment success depends on asset allocation, diversification, and risk management, not on complexity.</i>" Tweddell and Pierce</p>
<div class="col-md-6">
<table id="categories_list" class="table table-condensed table-bordered">
<thead>
<tr>
<th>Catégorie</th>
<th class="text-right">% cible</th>
<th class="text-right">% actuel</th>
<th class="text-right">Ecart</th>
<th class="text-right">Valeur</th>
</tr>
</thead>
<tbody>
<tr tal:repeat="item items">
<td class="${item.bg}"><a href="categorie_edit/${item.no_cat}">${item.categorie}</a></td>
<td class="text-right">${item.pc_cible} %</td>
<td class="text-right">${layout.to_percent(item.pc_atteint)}</td>
<td class="text-right">${layout.to_percent(item.pc_atteint - item.pc_cible)}</td>
<td class="text-right">${layout.to_euro(item.valeur)}</td>
</tr>
</tbody>
</table>
</div>
<p>
<a href="categorie_edit/0" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-plus"></span> Nouvelle catégorie</a>
</p>
</div>
<div class="row">
<h3>+ diversification + bas coût</h3>
<p>"<i>Diversification is not determined by the number of securities held.</i>"
<a hhref="http://www.etf.com/sections/index-investor-corner">Larry Swedroe</a></p>
<div class="col-md-8">
<table id="actifs_list" class="table table-condensed table-bordered">
<thead>
<tr>
<th>Catégorie</th>
<th>Libellé</th>
<th class="text-right">Valeur</th>
<th class="text-right">+/- Valeur</th>
<th class="text-right">% de +/-</th>
<th class="text-right">% PF</th>
</tr>
</thead>
<tbody>
<tr tal:repeat="ligne actifs">
<td class="${ligne.bg}">${ligne.categorie}</td>
<td>${ligne.libelle}</td>
<td class="text-right">${layout.to_euro(ligne.valeur)}</td>
<td tal:condition="ligne.plus_value>=0" class="text-right" style="color: green;">${layout.to_euro(ligne.plus_value)}</td>
<td tal:condition="ligne.plus_value <0" class="text-right" style="color: red;">${layout.to_euro(ligne.plus_value)}</td>
<td tal:condition="ligne.pc_plusvalue>=0" class="text-right" style="color: green;">${layout.to_percent(ligne.pc_plusvalue)}</td>
<td tal:condition="ligne.pc_plusvalue <0" class="text-right" style="color: red;">${layout.to_percent(ligne.pc_plusvalue)}</td>
<td class="text-right">${ligne.pc_allocation} %</td>
</tr>
<tr>
<td colspan="2"></td>
<td class="text-right">${layout.to_euro(total_valeur)}</td>
<td class="text-right">${layout.to_euro(total_pv)}</td>
<td class="text-right">${layout.to_percent(total_pc_value)}</td>
<td class="text-right">100 %</td>
</tr>
</tbody>
</table>
</div>
<br />
<br />
<br />
</div>
<br />
<br />
</div><!-- content -->
</metal:block>

View File

@@ -54,8 +54,8 @@
</div>
<div class="collapse navbar-collapse" id="myNavbar" tal:condition="not layout.isAnonymous()">
<ul class="nav navbar-nav navbar-right">
<li><a href="${request.application_url}/">ALLOCATION</a></li>
<li><a href="${request.application_url}/actifs_list">ACTIFS</a></li>
<li><a href="${request.application_url}/allocations">ALLOCATION</a></li>
<li><a href="${request.application_url}/doc_list">DOCS</a></li>
${panel('dropdown_menu_panel')}
</ul>