améliorer update_portefeuille

This commit is contained in:
2017-08-02 17:55:39 +02:00
parent 91e82c4831
commit 99dcd49d6e
6 changed files with 25 additions and 39 deletions

View File

@@ -66,28 +66,6 @@
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="pru">PRU</label>
<div class="col-xs-2">
<div class="input-group">
<div class="input-group-addon">€</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 ." />
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="ter">TER</label>
<div class="col-xs-2">
<div class="input-group">
<div class="input-group-addon">%</div>
<input class="form-control" type="text" id="ter" name="ter" value="${actif.ter}"
data-fv-numeric="true"
data-fv-numeric-message="Le nombre doit être composé de chiffres et/ou de ." />
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-2" for="pc_rdt">% Rendement</label>
<div class="col-xs-2">

View File

@@ -39,6 +39,13 @@
<div id="donutchart" style="width: 100%; height: 500px;"></div>
</div>
</div>
<div class="row">
<p><b>Notes :</b></p>
<ul>
<li>Mon allocation est inspirée de celle du <b>Dr. Bernstein's No Brainer</b> qui a, à mon avis,
le mérite d'être le plus simple à implémenter parmi les <a href="http://www.marketwatch.com/lazyportfolio" target="_blank">8 Lazy portfolios</a> suivi par Market Watch</li>
</ul>
</div>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript">

View File

@@ -5,7 +5,7 @@
<a href="${request.application_url}/" class="btn btn-default" role="button">
<span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
<a href="histo_edit/0" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-plus"></span> Ajout/retrait de cash</a>
<span class="glyphicon glyphicon-plus"></span> Maj valeur part</a>
</p>
<table id="histo_list" class="table table-striped table-bordered">

View File

@@ -81,10 +81,10 @@
<th class="text-right">Valeur</th>
<th class="text-right">+/- Valeur</th>
<th class="text-right">% de +/-</th>
<th class="text-right">% PF</th>
<th class="text-right">TER</th>
<th class="text-right">Rdt brut</th>
<th class="text-right">% Rdt</th>
<th class="text-right">% PF</th>
<th class="text-right">TER</th>
</tr>
</thead>
<tbody>
@@ -96,20 +96,20 @@
<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,1)}</td>
<td tal:condition="ligne.pc_plusvalue <0" class="text-right" style="color: red;">${layout.to_percent(ligne.pc_plusvalue,1)}</td>
<td class="text-right">${ligne.pc_allocation} %</td>
<td class="text-right">${layout.to_percent(ligne.ter,2)}</td>
<td class="text-right">${u'%.0f €' % (ligne.rendement)}</td>
<td class="text-right">${layout.to_percent(ligne.pc_rdt,1)}</td>
<td class="text-right">${ligne.pc_allocation} %</td>
<td class="text-right">${layout.to_percent(ligne.ter,2)}</td>
</tr>
<tr>
<td class="text-right" colspan="2"><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, 1)}</b></td>
<td class="text-right"><b>${total_rdt} €</b></td>
<td></td>
<td class="text-right"><b>100.0 %</b></td>
<td></td>
<td></td>
<td class="text-right"><b>${total_rdt} €</b></td>
</tr>
</tbody>
</table>