IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

#38 User requests

Browse Source 
* implements 1) "Add titles to public reports, next to identifiers"
This commit is contained in:
mpeltriaux 2021-11-15 11:05:39 +01:00
parent 61b92c1409
commit a0df7f4fe1
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compensation/templates/compensation/report/compensation/report.html
View File

@ -16,7 +16,7 @@
<th scope="row">{% trans 'compensates intervention' %}</th> <th scope="row">{% trans 'compensates intervention' %}</th>
<td class="align-middle"> <td class="align-middle">
<a href="{% url 'intervention:report' obj.intervention.id %}"> <a href="{% url 'intervention:report' obj.intervention.id %}">
{{obj.intervention.identifier}} {{obj.intervention.identifier}} - {{obj.intervention.title}}
</a> </a>
</td> </td>
</tr> </tr>

2
compensation/templates/compensation/report/eco_account/report.html
View File

@ -29,7 +29,7 @@
<td class="align-middle"> <td class="align-middle">
{% for deduction in deductions %} {% for deduction in deductions %}
<a href="{% url 'intervention:report' deduction.intervention__id %}"> <a href="{% url 'intervention:report' deduction.intervention__id %}">
{{deduction.intervention__identifier}} {{deduction.intervention__identifier}} - {{deduction.intervention__title}}
</a> </a>
<br> <br>
{% empty %} {% empty %}

2
compensation/views/eco_account_views.py
View File

@ -570,7 +570,7 @@ def report_view(request:HttpRequest, id: str):
deductions = acc.deductions.all()\ deductions = acc.deductions.all()\
.distinct("intervention")\ .distinct("intervention")\
.select_related("intervention")\ .select_related("intervention")\
.values_list("intervention__id", "intervention__identifier", named=True) .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
context = { context = {
"obj": acc, "obj": acc,

4
intervention/templates/intervention/report/report.html
View File

@ -50,7 +50,7 @@
<td class="align-middle"> <td class="align-middle">
{% for comp in obj.compensations.all %} {% for comp in obj.compensations.all %}
<a href="{% url 'compensation:report' comp.id %}"> <a href="{% url 'compensation:report' comp.id %}">
{{comp.identifier}} {{comp.identifier}} - {{comp.title}}
</a> </a>
<br> <br>
{% empty %} {% empty %}
@ -63,7 +63,7 @@
<td class="align-middle"> <td class="align-middle">
{% for deduction in deductions %} {% for deduction in deductions %}
<a href="{% url 'compensation:acc-report' deduction.account.id %}"> <a href="{% url 'compensation:acc-report' deduction.account.id %}">
{{deduction.account.identifier}} {{deduction.account.identifier}} - {{deduction.account.title}}
</a> </a>
<br> <br>
{% endfor %} {% endfor %}