feat: Implement quarterly confirmation system with automatic support payments
- Add VierteljahresNachweis model for quarterly document tracking - Remove studiennachweis_erforderlich field (now always required) - Fix modal edit view to include studiennachweis section - Implement automatic DestinataerUnterstuetzung creation when requirements met - Set payment due dates to exact quarter end dates (Mar 31, Jun 30, Sep 30, Dec 31) - Add quarterly confirmation CRUD views with modal and full-screen editing - Update templates with comprehensive quarterly management interface - Include proper validation, status tracking, and progress indicators
This commit is contained in:
@@ -448,6 +448,359 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Quarterly Confirmations -->
|
||||
{% if destinataer.studiennachweis_erforderlich %}
|
||||
<div class="card shadow mb-4">
|
||||
<div class="card-header bg-primary text-white">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<h5 class="card-title mb-0">
|
||||
<i class="fas fa-calendar-check me-2"></i>Vierteljährliche Nachweise
|
||||
</h5>
|
||||
<div>
|
||||
<small class="text-light me-3">Frist: jeweils 15. des zweiten Quartalsmonats</small>
|
||||
<button type="button" class="btn btn-sm btn-light"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#addQuarterModal"
|
||||
title="Neues Quartal hinzufügen">
|
||||
<i class="fas fa-plus me-1"></i>Quartal hinzufügen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if quarterly_confirmations %}
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Zeitraum</th>
|
||||
<th>Status</th>
|
||||
<th>Fortschritt</th>
|
||||
<th>Fälligkeit</th>
|
||||
<th>Studiennachweis</th>
|
||||
<th>Einkommen</th>
|
||||
<th>Vermögen</th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for nachweis in quarterly_confirmations %}
|
||||
<tr {% if nachweis.is_overdue %}class="table-warning"{% endif %}>
|
||||
<td>
|
||||
<strong>{{ nachweis.jahr }} {{ nachweis.get_quarter_display|truncatechars:3 }}</strong>
|
||||
{% if nachweis.is_overdue %}
|
||||
<br><small class="text-danger"><i class="fas fa-exclamation-triangle"></i> Überfällig</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if nachweis.status == 'offen' %}
|
||||
<span class="badge bg-secondary">Ausstehend</span>
|
||||
{% elif nachweis.status == 'teilweise' %}
|
||||
<span class="badge bg-warning">Teilweise</span>
|
||||
{% elif nachweis.status == 'eingereicht' %}
|
||||
<span class="badge bg-info">Eingereicht</span>
|
||||
{% elif nachweis.status == 'geprueft' %}
|
||||
<span class="badge bg-success">Freigegeben</span>
|
||||
{% elif nachweis.status == 'nachbesserung' %}
|
||||
<span class="badge bg-warning">Nachbesserung</span>
|
||||
{% elif nachweis.status == 'abgelehnt' %}
|
||||
<span class="badge bg-danger">Abgelehnt</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% with completion=nachweis.get_completion_percentage %}
|
||||
<div class="progress" style="height: 20px;">
|
||||
<div class="progress-bar
|
||||
{% if completion == 100 %}bg-success
|
||||
{% elif completion >= 70 %}bg-info
|
||||
{% elif completion >= 30 %}bg-warning
|
||||
{% else %}bg-danger
|
||||
{% endif %}"
|
||||
role="progressbar"
|
||||
style="width: {{ completion }}%"
|
||||
aria-valuenow="{{ completion }}"
|
||||
aria-valuemin="0"
|
||||
aria-valuemax="100">
|
||||
{{ completion }}%
|
||||
</div>
|
||||
</div>
|
||||
{% endwith %}
|
||||
</td>
|
||||
<td>
|
||||
{% if nachweis.faelligkeitsdatum %}
|
||||
<small>{{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</small>
|
||||
{% else %}
|
||||
<small class="text-muted">Nicht festgelegt</small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
{% if nachweis.studiennachweis_eingereicht %}
|
||||
{% if nachweis.studiennachweis_datei %}
|
||||
<a href="{{ nachweis.studiennachweis_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
<i class="fas fa-file-pdf"></i>
|
||||
</a>
|
||||
{% elif nachweis.studiennachweis_bemerkung %}
|
||||
<i class="fas fa-comment text-info" title="Bemerkung vorhanden"></i>
|
||||
{% else %}
|
||||
<i class="fas fa-check text-success"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
{% if nachweis.einkommenssituation_bestaetigt %}
|
||||
{% if nachweis.einkommenssituation_datei %}
|
||||
<a href="{{ nachweis.einkommenssituation_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
<i class="fas fa-file-pdf"></i>
|
||||
</a>
|
||||
{% elif nachweis.einkommenssituation_text %}
|
||||
<i class="fas fa-comment text-info" title="{{ nachweis.einkommenssituation_text|truncatechars:50 }}"></i>
|
||||
{% else %}
|
||||
<i class="fas fa-check text-success"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
{% if nachweis.vermogenssituation_bestaetigt %}
|
||||
{% if nachweis.vermogenssituation_datei %}
|
||||
<a href="{{ nachweis.vermogenssituation_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
<i class="fas fa-file-pdf"></i>
|
||||
</a>
|
||||
{% elif nachweis.vermogenssituation_text %}
|
||||
<i class="fas fa-comment text-info" title="{{ nachweis.vermogenssituation_text|truncatechars:50 }}"></i>
|
||||
{% else %}
|
||||
<i class="fas fa-check text-success"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<div class="btn-group" role="group" aria-label="Aktionen">
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-outline-primary"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#quartalModal{{ nachweis.id }}"
|
||||
title="Bearbeiten (Modal)">
|
||||
<i class="fas fa-edit"></i>
|
||||
</button>
|
||||
<a href="{% url 'stiftung:quarterly_confirmation_edit' nachweis.id %}"
|
||||
class="btn btn-sm btn-outline-secondary"
|
||||
title="Bearbeiten (Vollbild)">
|
||||
<i class="fas fa-external-link-alt"></i>
|
||||
</a>
|
||||
{% if nachweis.status == 'eingereicht' and user.is_staff %}
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-outline-success"
|
||||
onclick="approveQuarterly('{{ nachweis.id }}')"
|
||||
title="Freigeben">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Quarterly Confirmation Modals -->
|
||||
{% for nachweis in quarterly_confirmations %}
|
||||
<div class="modal fade" id="quartalModal{{ nachweis.id }}" tabindex="-1" aria-labelledby="quartalModalLabel{{ nachweis.id }}" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="quartalModalLabel{{ nachweis.id }}">
|
||||
<i class="fas fa-calendar-check me-2"></i>
|
||||
Nachweis {{ nachweis.jahr }} {{ nachweis.get_quarter_display }} - {{ destinataer.get_full_name }}
|
||||
</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
|
||||
</div>
|
||||
<form id="quarterlyForm{{ nachweis.id }}" method="post" action="{% url 'stiftung:quarterly_confirmation_update' nachweis.id %}" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<!-- Study Proof Section -->
|
||||
<div class="col-12 mb-4">
|
||||
<h6 class="text-primary border-bottom pb-2">
|
||||
<i class="fas fa-graduation-cap me-2"></i>Studiennachweis
|
||||
</h6>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" class="form-check-input" id="studiennachweis_eingereicht{{ nachweis.id }}" name="studiennachweis_eingereicht" {% if nachweis.studiennachweis_eingereicht %}checked{% endif %}>
|
||||
<label class="form-check-label" for="studiennachweis_eingereicht{{ nachweis.id }}">
|
||||
Studiennachweis eingereicht
|
||||
</label>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="studiennachweis_datei{{ nachweis.id }}" class="form-label">Studiennachweis (Datei)</label>
|
||||
<input type="file" class="form-control" id="studiennachweis_datei{{ nachweis.id }}" name="studiennachweis_datei" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx">
|
||||
{% if nachweis.studiennachweis_datei %}
|
||||
<small class="text-muted">Aktuelle Datei: <a href="{{ nachweis.studiennachweis_datei.url }}" target="_blank">{{ nachweis.studiennachweis_datei.name }}</a></small>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="studiennachweis_bemerkung{{ nachweis.id }}" class="form-label">Bemerkung zum Studiennachweis</label>
|
||||
<textarea class="form-control" id="studiennachweis_bemerkung{{ nachweis.id }}" name="studiennachweis_bemerkung" rows="2">{{ nachweis.studiennachweis_bemerkung|default:"" }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Income Situation Section -->
|
||||
<div class="col-12 mb-4">
|
||||
<h6 class="text-success border-bottom pb-2">
|
||||
<i class="fas fa-euro-sign me-2"></i>Einkommenssituation
|
||||
</h6>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" class="form-check-input" id="einkommenssituation_bestaetigt{{ nachweis.id }}" name="einkommenssituation_bestaetigt" {% if nachweis.einkommenssituation_bestaetigt %}checked{% endif %}>
|
||||
<label class="form-check-label" for="einkommenssituation_bestaetigt{{ nachweis.id }}">
|
||||
Einkommenssituation bestätigt
|
||||
</label>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="einkommenssituation_text{{ nachweis.id }}" class="form-label">Einkommenssituation (Text)</label>
|
||||
<textarea class="form-control" id="einkommenssituation_text{{ nachweis.id }}" name="einkommenssituation_text" rows="3" placeholder='Z.B. "Keine Änderungen seit letzter Meldung"'>{{ nachweis.einkommenssituation_text|default:"" }}</textarea>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="einkommenssituation_datei{{ nachweis.id }}" class="form-label">Einkommenssituation (Datei)</label>
|
||||
<input type="file" class="form-control" id="einkommenssituation_datei{{ nachweis.id }}" name="einkommenssituation_datei" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx">
|
||||
{% if nachweis.einkommenssituation_datei %}
|
||||
<small class="text-muted">Aktuelle Datei: <a href="{{ nachweis.einkommenssituation_datei.url }}" target="_blank">{{ nachweis.einkommenssituation_datei.name }}</a></small>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Asset Situation Section -->
|
||||
<div class="col-12 mb-4">
|
||||
<h6 class="text-warning border-bottom pb-2">
|
||||
<i class="fas fa-piggy-bank me-2"></i>Vermögenssituation
|
||||
</h6>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" class="form-check-input" id="vermogenssituation_bestaetigt{{ nachweis.id }}" name="vermogenssituation_bestaetigt" {% if nachweis.vermogenssituation_bestaetigt %}checked{% endif %}>
|
||||
<label class="form-check-label" for="vermogenssituation_bestaetigt{{ nachweis.id }}">
|
||||
Vermögenssituation bestätigt
|
||||
</label>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="vermogenssituation_text{{ nachweis.id }}" class="form-label">Vermögenssituation (Text)</label>
|
||||
<textarea class="form-control" id="vermogenssituation_text{{ nachweis.id }}" name="vermogenssituation_text" rows="3" placeholder='Z.B. "Keine Änderungen seit letzter Meldung"'>{{ nachweis.vermogenssituation_text|default:"" }}</textarea>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="vermogenssituation_datei{{ nachweis.id }}" class="form-label">Vermögenssituation (Datei)</label>
|
||||
<input type="file" class="form-control" id="vermogenssituation_datei{{ nachweis.id }}" name="vermogenssituation_datei" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx">
|
||||
{% if nachweis.vermogenssituation_datei %}
|
||||
<small class="text-muted">Aktuelle Datei: <a href="{{ nachweis.vermogenssituation_datei.url }}" target="_blank">{{ nachweis.vermogenssituation_datei.name }}</a></small>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Additional Documents Section -->
|
||||
<div class="col-12 mb-4">
|
||||
<h6 class="text-info border-bottom pb-2">
|
||||
<i class="fas fa-file-alt me-2"></i>Weitere Dokumente (optional)
|
||||
</h6>
|
||||
<div class="mb-3">
|
||||
<label for="weitere_dokumente{{ nachweis.id }}" class="form-label">Weitere Dokumente</label>
|
||||
<input type="file" class="form-control" id="weitere_dokumente{{ nachweis.id }}" name="weitere_dokumente" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx">
|
||||
{% if nachweis.weitere_dokumente %}
|
||||
<small class="text-muted">Aktuelle Datei: <a href="{{ nachweis.weitere_dokumente.url }}" target="_blank">{{ nachweis.weitere_dokumente.name }}</a></small>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="weitere_dokumente_beschreibung{{ nachweis.id }}" class="form-label">Beschreibung weitere Dokumente</label>
|
||||
<textarea class="form-control" id="weitere_dokumente_beschreibung{{ nachweis.id }}" name="weitere_dokumente_beschreibung" rows="2">{{ nachweis.weitere_dokumente_beschreibung|default:"" }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Internal Notes (Staff Only) -->
|
||||
{% if user.is_staff %}
|
||||
<div class="col-12 mb-3">
|
||||
<h6 class="text-secondary border-bottom pb-2">
|
||||
<i class="fas fa-user-shield me-2"></i>Interne Notizen (nur für Verwaltung)
|
||||
</h6>
|
||||
<textarea class="form-control" name="interne_notizen" rows="3" placeholder="Interne Notizen zur Bearbeitung">{{ nachweis.interne_notizen|default:"" }}</textarea>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
|
||||
<button type="submit" class="btn btn-primary">
|
||||
<i class="fas fa-save me-2"></i>Speichern
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<!-- Add Quarter Modal -->
|
||||
<div class="modal fade" id="addQuarterModal" tabindex="-1" aria-labelledby="addQuarterModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="addQuarterModalLabel">
|
||||
<i class="fas fa-plus me-2"></i>Neues Quartal hinzufügen
|
||||
</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
|
||||
</div>
|
||||
<form method="post" action="{% url 'stiftung:quarterly_confirmation_create' destinataer.pk %}">
|
||||
{% csrf_token %}
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="mb-3">
|
||||
<label for="jahr" class="form-label">Jahr</label>
|
||||
<select class="form-select" id="jahr" name="jahr" required>
|
||||
{% for year in available_years %}
|
||||
<option value="{{ year }}" {% if year == current_year %}selected{% endif %}>{{ year }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="mb-3">
|
||||
<label for="quartal" class="form-label">Quartal</label>
|
||||
<select class="form-select" id="quartal" name="quartal" required>
|
||||
<option value="1">Q1 (Januar - März)</option>
|
||||
<option value="2">Q2 (April - Juni)</option>
|
||||
<option value="3">Q3 (Juli - September)</option>
|
||||
<option value="4">Q4 (Oktober - Dezember)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-info">
|
||||
<i class="fas fa-info-circle me-2"></i>
|
||||
Das Quartal wird mit dem aktuellen Datum als Stichtag erstellt.
|
||||
Die Fälligkeit wird automatisch auf den 15. des zweiten Quartalsmonats gesetzt.
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
|
||||
<button type="submit" class="btn btn-primary">
|
||||
<i class="fas fa-plus me-2"></i>Quartal erstellen
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
<div class="text-center py-4">
|
||||
<i class="fas fa-calendar-check fa-3x text-muted mb-3"></i>
|
||||
<h5 class="text-muted">Keine vierteljährlichen Nachweise</h5>
|
||||
<p class="text-muted">Nachweise werden automatisch erstellt, wenn Studiennachweise erforderlich sind.</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Notes Section -->
|
||||
<div class="card shadow mb-4">
|
||||
<div class="card-header bg-secondary text-white">
|
||||
@@ -976,5 +1329,29 @@ document.addEventListener('keydown', function(e) {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Quarterly confirmation functions
|
||||
function approveQuarterly(nachweisId) {
|
||||
if (confirm('Möchten Sie diesen Vierteljahresnachweis wirklich freigeben?')) {
|
||||
fetch(`/quarterly-confirmations/${nachweisId}/approve/`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRFToken': document.querySelector('[name=csrfmiddlewaretoken]').value,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
})
|
||||
.then(response => {
|
||||
if (response.ok) {
|
||||
location.reload(); // Reload to show updated status
|
||||
} else {
|
||||
alert('Fehler beim Freigeben des Nachweises.');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert('Fehler beim Freigeben des Nachweises.');
|
||||
});
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user