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

#38 User requests

Browse Source 
* implements 2) "Multiple revocations for interventions"
This commit is contained in:
mpeltriaux
2021-11-15 12:18:22 +01:00
parent a0df7f4fe1
commit faffd454b9
8 changed files with 227 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
intervention/templates/intervention/detail/includes/revocation.html
View File

@@ -4,8 +4,8 @@
<div class="row">
<div class="col-sm-6">
<h5>
<span class="badge badge-light">{% if obj.legal.revocation %}1{% else %}0{% endif %}</span>
{% trans 'Revocation' %}
<span class="badge badge-light">{{obj.legal.revocations.count}}</span>
{% trans 'Revocations' %}
</h5>
</div>
<div class="col-sm-6">
@@ -44,30 +44,28 @@
</tr>
</thead>
<tbody>
{% if obj.legal.revocation %}
{% with obj.legal.revocation as rev %}
<tr>
<td class="align-middle">
{{ rev.date }}
</td>
<td class="align-middle">
{% if rev.document %}
<a href="{% url 'intervention:get-doc-revocation' rev.document.id %}">
{% trans 'Revocation' %}
</a>
{% endif %}
</td>
<td class="align-middle">{{ rev.comment }}</td>
<td>
{% if is_default_member and has_access %}
<button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
{% fa5_icon 'trash' %}
</button>
{% endif %}
</td>
</tr>
{% endwith %}
{% endif %}
{% for rev in obj.legal.revocations.all %}
<tr>
<td class="align-middle">
{{ rev.date }}
</td>
<td class="align-middle">
{% if rev.document %}
<a href="{% url 'intervention:get-doc-revocation' rev.document.id %}">
{% trans 'Revocation' %}
</a>
{% endif %}
</td>
<td class="align-middle">{{ rev.comment }}</td>
<td>
{% if is_default_member and has_access %}
<button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
{% fa5_icon 'trash' %}
</button>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>

6
intervention/templates/intervention/detail/view.html
View File

@@ -99,9 +99,9 @@
<th scope="row">{% trans 'Binding on' %}</th>
<td class="align-middle">{{obj.legal.binding_date|default_if_none:""}}</td>
</tr>
<tr {% if obj.legal.revocation %}class="alert alert-danger" title="{% trans 'Exists' %}" {% endif %}>
<th scope="row">{% trans 'Revocation' %}</th>
<td class="align-middle">{{obj.legal.revocation.date|naturalday|default_if_none:""}}</td>
<tr {% if obj.legal.revocations.all %}class="alert alert-danger" title="{% trans 'Exists' %}" {% endif %}>
<th scope="row">{% trans 'Revocations' %}</th>
<td class="align-middle">{{obj.legal.revocations.count}}</td>
</tr>
<tr>
<th scope="row">{% trans 'Last modified' %}</th>