cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Fix urls et type opération 'initial'

Browse source
This commit is contained in:
Aurélien Delobelle 2016-09-05 13:11:02 +02:00
parent 4ff963b5cb
commit 3745485e6c
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kfet/static/kfet/js/history.js
View file

@ -31,6 +31,9 @@ function KHistory(options={}) {
if (ope['type'] == 'purchase') { if (ope['type'] == 'purchase') {
infos1 = ope['article_nb']; infos1 = ope['article_nb'];
infos2 = ope['article__name']; infos2 = ope['article__name'];
} else if (ope['type'] == 'initial') {
infos1 = parsed_amount.toFixed(2)+'€';
infos2 = 'Initial';
} else { } else {
infos1 = parsed_amount.toFixed(2)+'€'; infos1 = parsed_amount.toFixed(2)+'€';
infos2 = (ope['type'] == 'deposit') ? 'Charge' : 'Retrait'; infos2 = (ope['type'] == 'deposit') ? 'Charge' : 'Retrait';

2
kfet/templates/kfet/base_nav.html
View file

@ -51,7 +51,7 @@
</li> </li>
{% endif %} {% endif %}
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a href="/logout?next=/k-fet/" title="Déconnexion"><span class="glyphicon glyphicon-log-out"></span></a></li> <li><a href="{% url 'gestioncof.views.logout' %}?next=/k-fet/" title="Déconnexion"><span class="glyphicon glyphicon-log-out"></span></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

4
kfet/templates/kfet/kpsul.html
View file

@ -192,7 +192,9 @@ $(document).ready(function() {
var buttons = ''; var buttons = '';
if (account_data['id'] != 0) { if (account_data['id'] != 0) {
buttons += '<a href="/k-fet/accounts/'+account_data['trigramme']+'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>'; var url_base = '{% url 'kfet.account.read' 'LIQ' %}';
url_base = url_base.substr(0, url_base.length - 3);
buttons += '<a href="'+ url_base + account_data['trigramme']+'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
} }
if (account_data['id'] == 0) { if (account_data['id'] == 0) {
var trigramme = triInput.val().toUpperCase(); var trigramme = triInput.val().toUpperCase();