Sulley
/
ComptaClub
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

remove useless template, adapt a view and minor improvements

This commit is contained in:
Gregory Trullemans 2022-04-28 21:22:42 +02:00
parent ea76f2055c
commit 049651709f
3 changed files with 8 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/comptabilite/views.py
View File

@ -391,7 +391,8 @@ def transaction_details(request, transaction_id):
"""
transaction = Transaction.objects.get(pk=transaction_id)
context = {"event": transaction.event, "transaction": transaction}
return render(request, "event/transaction_details.html", context)
# changed template
return render(request, "comptability/transactions/details.html", context)
@require_http_methods(["GET", "POST"])

12
src/templates/comptability/transactions/details.html
View File

@ -52,18 +52,18 @@
<td><p class="text-muted">Simulée ?</p></td>
<td><p class="text-{% if transaction.is_simulated %}danger{% else %}primary{% endif %}">{% if transaction.is_simulated %}Oui{% else %}Non{% endif %}</p></td>
</tr>
{% if transaction.event %}
<tr class="alert alert-danger">
<td><p class="text-muted">Evènement</p></td>
<td><p class="text-primary">{{ transaction.event }} (du {{ transaction.event.date_begin }} au {{ transaction.event.date_end }})</p></td>
</tr>
{% endif %}
{% if transaction.to_markdown %}
<tr>
<td><p class="text-muted">Notes</p></td>
<td><p class="text-primary">{{ transaction.to_markdown | safe }}</p></td>
</tr>
{% endif %}
{% if transaction.event %}
<tr>
<td><p class="text-muted">Evènement</p></td>
<td><p class="text-primary">{{ transaction.event }}</p></td>
</tr>
{% endif %}
</table>
</div>
</div>

67
src/templates/event/transaction_details.html
View File

@ -1,67 +0,0 @@
{% extends "base.html" %}
{% block page_title %}{{ event }}{% endblock %}
{% block content %}
<div id="page" class=" sidebar_right">
<div class="container">
<div id="frame2">
<div id="content">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<h1>{{ event }} <small>(du {{ event.date_begin }} au {{ event.date_end }})</small></h1>
</div>
<br />
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="well well-small">
<table class="table-condensed">
<tr>
<td class="col-xs-6 col-sm-4 col-md-4 col-lg-4"><p class="text-muted">Date</p></td>
<td class="col-xs-6 col-sm-8 col-md-8 col-lg-8"><p class="text-primary">{{ transaction.registrationDate | date:'l j F Y' }}</p></td>
</tr>
<tr>
<td><p class="text-muted">Description</p></td>
<td><p class="text-primary">{{ transaction }}</p></td>
</tr>
{% if transaction.counterpart %}
<tr>
<td><p class="text-muted">Contre partie</p></td>
<td><p class="text-primary">{{ transaction.counterpart }}</p></td>
</tr>
{% endif %}
{% if transaction.account_number %}
<tr>
<td><p class="text-muted">N° de compte</p></td>
<td><p class="text-primary">{{ transaction.account_number }}</p></td>
</tr>
{% endif %}
<tr>
<td><p class="text-muted">Montant</p></td>
<td><p class="text-primary">{{ transaction.totalAmount }}€ ({% if transaction.bxAmount %}{{ transaction.bxAmount }}€ en cash{% endif %}{% if transaction.bxAmount and transaction.bkAmount %} et {% endif %}{% if transaction.bkAmount %}{{ transaction.bkAmount }}€ par virement/transfert{% endif %})</p></td>
</tr>
<tr>
<td><p class="text-muted">Effectuée ?</p></td>
<td><p class="text-{% if transaction.is_done %}primary{% else %}danger{% endif %}">{% if transaction.is_done %}Oui{% else %}Non{% endif %}</p></td>
</tr>
<tr>
<td><p class="text-muted">Simulée ?</p></td>
<td><p class="text-{% if transaction.is_simulated %}danger{% else %}primary{% endif %}">{% if transaction.is_simulated %}Oui{% else %}Non{% endif %}</p></td>
</tr>
{% if transaction.to_markdown %}
<tr>
<td><p class="text-muted">Notes</p></td>
<td><p class="text-primary">{{ transaction.to_markdown | safe }}</p></td>
</tr>
{% endif %}
</table>
<a href="{% url 'transaction_update' transaction.id %}">Mettre à jour</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}