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

Intervention check

Browse Source 
* adds functionality for check button
* adds highlighting of important data on detail view for intervention
* adds deleting logic to BaseObject model and BaseResource model
* adds RunCheckForm
* adds check_validity() method to Intervention class
* fixes wrong success msg for adding documents
* adds/updates translations
This commit is contained in:
mipel
2021-08-04 15:19:06 +02:00
parent 6d75fdb7a7
commit c8ede788e0
12 changed files with 239 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intervention/templates/intervention/detail/includes/controls.html
View File

@@ -16,11 +16,9 @@
{% fa5_icon 'share-alt' %}
</button>
{% if is_zb_member %}
<a href="{% url 'home' %}" class="mr-2">
<button class="btn btn-default" title="{% trans 'Run check' %}">
{% fa5_icon 'star' %}
</button>
</a>
<button class="btn btn-default btn-modal mr-2" title="{% trans 'Run check' %}" data-form-url="{% url 'intervention:run-check' intervention.id %}">
{% fa5_icon 'star' %}
</button>
{% endif %}
{% if is_ets_member %}
<a href="{% url 'home' %}" class="mr-2">

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

@@ -20,15 +20,15 @@
<div class="col-sm-12 col-md-12 col-lg-6">
<div class="table-container">
<table class="table table-hover">
<tr>
<tr {% if not intervention.title %}class="alert alert-danger"{% endif %}>
<th class="w-25" scope="row">{% trans 'Title' %}</th>
<td class="align-middle">{{intervention.title}}</td>
<td class="align-middle">{{intervention.title|default_if_none:""}}</td>
</tr>
<tr>
<tr {% if not intervention.legal.process_type %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Process type' %}</th>
<td class="align-middle">{{intervention.legal.process_type|default_if_none:""}}</td>
</tr>
<tr>
<tr {% if not intervention.legal.law %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Law' %}</th>
<td class="align-middle">{{intervention.legal.law|default_if_none:""}}</td>
</tr>
@@ -36,7 +36,7 @@
<th scope="row">{% trans 'Registration office' %}</th>
<td class="align-middle">{{intervention.responsible.registration_office|default_if_none:""}}</td>
</tr>
<tr>
<tr {% if not intervention.responsible.registration_file_number %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Registration office file number' %}</th>
<td class="align-middle">{{intervention.responsible.registration_file_number|default_if_none:""}}</td>
</tr>
@@ -44,11 +44,11 @@
<th scope="row">{% trans 'Conservation office' %}</th>
<td class="align-middle">{{intervention.responsible.conservation_office|default_if_none:""}}</td>
</tr>
<tr>
<tr{% if not intervention.responsible.conservation_file_number %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Conversation office file number' %}</th>
<td class="align-middle">{{intervention.responsible.conservation_file_number|default_if_none:""}}</td>
</tr>
<tr>
<tr {% if not intervention.responsible.handler %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Intervention handler' %}</th>
<td class="align-middle">{{intervention.responsible.handler|default_if_none:""}}</td>
</tr>
@@ -80,11 +80,11 @@
{% endif %}
</td>
</tr>
<tr>
<tr {% if not intervention.legal.registration_date %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Registration date' %}</th>
<td class="align-middle">{{intervention.legal.registration_date|default_if_none:""}}</td>
</tr>
<tr>
<tr {% if not intervention.legal.binding_date %}class="alert alert-danger"{% endif %}>
<th scope="row">{% trans 'Binding on' %}</th>
<td class="align-middle">{{intervention.legal.binding_date|default_if_none:""}}</td>
</tr>