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:
2025-09-23 23:52:44 +02:00
parent 0184982f8c
commit 126f68ec68
9 changed files with 2177 additions and 56 deletions

View File

@@ -25,6 +25,71 @@
--orange-dark: #e8590c;
}
/* Global Typography - More Compact */
html {
font-size: 14px; /* Reduced from default 16px */
}
body {
font-size: 0.875rem; /* 12.25px */
line-height: 1.4;
font-weight: 400;
}
.h1, .h2, .h3, .h4, .h5, .h6,
h1, h2, h3, h4, h5, h6 {
font-weight: 600;
line-height: 1.3;
margin-bottom: 0.75rem;
}
.h1, h1 { font-size: 2rem; }
.h2, h2 { font-size: 1.65rem; }
.h3, h3 { font-size: 1.4rem; }
.h4, h4 { font-size: 1.15rem; }
.h5, h5 { font-size: 1rem; }
.h6, h6 { font-size: 0.875rem; }
/* Compact spacing */
.container, .container-fluid, .container-lg {
padding-left: 0.75rem;
padding-right: 0.75rem;
}
.row {
margin-left: -0.5rem;
margin-right: -0.5rem;
}
.col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6,
.col-7, .col-8, .col-9, .col-10, .col-11, .col-12,
.col-auto, .col-sm, .col-sm-auto, .col-md, .col-md-auto,
.col-lg, .col-lg-auto, .col-xl, .col-xl-auto {
padding-left: 0.5rem;
padding-right: 0.5rem;
}
/* Compact margins */
.mb-1 { margin-bottom: 0.25rem !important; }
.mb-2 { margin-bottom: 0.4rem !important; }
.mb-3 { margin-bottom: 0.75rem !important; }
.mb-4 { margin-bottom: 1rem !important; }
.mb-5 { margin-bottom: 1.5rem !important; }
.mt-1 { margin-top: 0.25rem !important; }
.mt-2 { margin-top: 0.4rem !important; }
.mt-3 { margin-top: 0.75rem !important; }
.mt-4 { margin-top: 1rem !important; }
.mt-5 { margin-top: 1.5rem !important; }
.py-1 { padding-top: 0.25rem !important; padding-bottom: 0.25rem !important; }
.py-2 { padding-top: 0.4rem !important; padding-bottom: 0.4rem !important; }
.py-3 { padding-top: 0.75rem !important; padding-bottom: 0.75rem !important; }
.px-1 { padding-left: 0.25rem !important; padding-right: 0.25rem !important; }
.px-2 { padding-left: 0.4rem !important; padding-right: 0.4rem !important; }
.px-3 { padding-left: 0.75rem !important; padding-right: 0.75rem !important; }
.border-left-primary {
border-left: 0.25rem solid var(--racing-green) !important;
}
@@ -47,7 +112,27 @@
background-image: linear-gradient(180deg, var(--racing-green-light) 10%, var(--racing-green-dark) 100%);
}
/* Navigation styling */
/* Navigation styling - More Compact */
.navbar {
padding: 0.375rem 0;
}
.navbar-brand {
font-weight: 700;
font-size: 1.1rem;
color: white !important;
padding: 0.375rem 0;
}
.navbar-nav .nav-link,
.navbar-nav .nav-link.dropdown-toggle {
padding: 0.375rem 0.5rem !important;
display: inline-flex !important;
align-items: center !important;
white-space: nowrap !important;
font-size: 0.8rem;
}
.navbar-dark .navbar-nav .nav-link {
color: rgba(255, 255, 255, 0.9);
}
@@ -56,31 +141,46 @@
color: var(--orange-light);
}
/* Ensure all nav links have consistent alignment */
.navbar-nav .nav-link,
.navbar-nav .nav-link.dropdown-toggle {
padding: 0.5rem 0.75rem !important;
display: inline-flex !important;
align-items: center !important;
white-space: nowrap !important;
/* Dropdown menus - More Compact */
.dropdown-menu {
border: 1px solid #dee2e6;
box-shadow: 0 0.25rem 0.5rem rgba(0, 66, 37, 0.15);
font-size: 0.8rem;
}
.navbar-brand {
font-weight: 700;
font-size: 1.5rem;
color: white !important;
.dropdown-item {
padding: 0.375rem 0.75rem;
font-size: 0.8rem;
}
/* Cards and content */
.dropdown-item:hover {
background-color: rgba(0, 66, 37, 0.1);
color: var(--racing-green-dark);
}
.dropdown-header {
font-size: 0.75rem;
padding: 0.25rem 0.75rem;
}
/* Cards and content - More Compact */
.card {
border: 1px solid #e9ecef;
box-shadow: 0 0.15rem 1.75rem 0 rgba(0, 66, 37, 0.1);
box-shadow: 0 0.125rem 1rem 0 rgba(0, 66, 37, 0.08);
margin-bottom: 0.75rem;
}
.card-body {
padding: 0.75rem;
}
.card-header {
background-color: var(--grey-light);
border-bottom: 1px solid #dee2e6;
color: var(--racing-green-dark);
padding: 0.5rem 0.75rem;
font-size: 0.875rem;
font-weight: 600;
}
.card-header.bg-primary {
@@ -103,7 +203,107 @@
color: white;
}
/* Buttons */
.card-title {
font-size: 0.9rem;
font-weight: 600;
margin-bottom: 0;
}
/* Tables - More Compact */
.table {
font-size: 0.8rem;
margin-bottom: 0.75rem;
}
.table th {
border-top: none;
font-weight: 600;
color: var(--racing-green-dark);
background-color: var(--grey-light);
padding: 0.5rem;
font-size: 0.75rem;
text-transform: uppercase;
letter-spacing: 0.025em;
}
.table td {
padding: 0.5rem;
border-top: 1px solid #dee2e6;
}
.table-sm th,
.table-sm td {
padding: 0.375rem;
}
.table-light {
background-color: var(--grey-light);
}
/* Buttons - More Compact */
.btn {
font-size: 0.8rem;
padding: 0.375rem 0.75rem;
border-radius: 0.25rem;
font-weight: 500;
line-height: 1.3;
}
.btn-sm {
font-size: 0.75rem;
padding: 0.25rem 0.5rem;
border-radius: 0.2rem;
}
.btn-lg {
font-size: 0.9rem;
padding: 0.5rem 1rem;
border-radius: 0.3rem;
}
/* Form Controls - More Compact */
.form-control, .form-select {
font-size: 0.8rem;
padding: 0.375rem 0.5rem;
line-height: 1.3;
}
.form-control-sm, .form-select-sm {
font-size: 0.75rem;
padding: 0.25rem 0.375rem;
}
.form-label {
font-size: 0.8rem;
font-weight: 500;
margin-bottom: 0.25rem;
}
.form-text {
font-size: 0.7rem;
margin-top: 0.15rem;
}
.form-check-label {
font-size: 0.8rem;
}
/* Badges - More Compact */
.badge {
font-size: 0.7rem;
padding: 0.25em 0.5em;
font-weight: 500;
}
/* Progress bars */
.progress {
height: 1rem;
font-size: 0.65rem;
}
.progress-bar {
line-height: 1rem;
}
.btn-primary {
background-color: var(--racing-green);
border-color: var(--racing-green);
@@ -156,14 +356,70 @@
border-color: var(--grey-medium);
}
/* Table styling */
.table th {
border-top: none;
font-weight: 600;
color: var(--racing-green-dark);
background-color: var(--grey-light);
/* Alerts - More Compact */
.alert {
padding: 0.5rem 0.75rem;
margin-bottom: 0.75rem;
font-size: 0.8rem;
}
.alert-success {
background-color: rgba(0, 104, 55, 0.1);
border-color: var(--racing-green-light);
color: var(--racing-green-dark);
}
.alert-warning {
background-color: rgba(253, 126, 20, 0.1);
border-color: var(--orange-accent);
color: var(--orange-dark);
}
/* Responsive adjustments for very compact design */
@media (max-width: 768px) {
html {
font-size: 13px;
}
body {
font-size: 0.8rem;
}
.navbar-brand {
font-size: 1rem;
}
.navbar-nav .nav-link {
font-size: 0.75rem;
padding: 0.25rem 0.375rem !important;
}
.card-body {
padding: 0.5rem;
}
.btn {
font-size: 0.75rem;
padding: 0.25rem 0.5rem;
}
.table {
font-size: 0.75rem;
}
.table th,
.table td {
padding: 0.375rem;
}
}
@media (min-width: 1400px) {
.container-lg {
max-width: 1400px;
}
}
/* Table styling */
.table-light {
background-color: var(--grey-light);
}
@@ -190,6 +446,8 @@
.pagination .page-link {
color: var(--racing-green);
border-color: #dee2e6;
font-size: 0.8rem;
padding: 0.375rem 0.5rem;
}
.pagination .page-item.active .page-link {
@@ -214,42 +472,20 @@
/* Form controls */
.form-control:focus {
border-color: var(--racing-green-light);
box-shadow: 0 0 0 0.2rem rgba(0, 66, 37, 0.25);
box-shadow: 0 0 0 0.15rem rgba(0, 66, 37, 0.25);
}
.form-select:focus {
border-color: var(--racing-green-light);
box-shadow: 0 0 0 0.2rem rgba(0, 66, 37, 0.25);
}
/* Alerts */
.alert-success {
background-color: rgba(0, 104, 55, 0.1);
border-color: var(--racing-green-light);
color: var(--racing-green-dark);
}
.alert-warning {
background-color: rgba(253, 126, 20, 0.1);
border-color: var(--orange-accent);
color: var(--orange-dark);
box-shadow: 0 0 0 0.15rem rgba(0, 66, 37, 0.25);
}
/* Footer */
.sticky-footer {
background-color: var(--grey-light) !important;
border-top: 1px solid #dee2e6;
}
/* Dropdown menus */
.dropdown-menu {
border: 1px solid #dee2e6;
box-shadow: 0 0.5rem 1rem rgba(0, 66, 37, 0.15);
}
.dropdown-item:hover {
background-color: rgba(0, 66, 37, 0.1);
color: var(--racing-green-dark);
padding: 0.75rem 0;
font-size: 0.8rem;
}
/* Custom accent colors for specific elements */
@@ -416,12 +652,12 @@
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
<!-- Main Content -->
<div id="content" style="padding-top: 80px;">
<div id="content" style="padding-top: 60px;">
<!-- Messages -->
{% if messages %}
<div class="container-lg mx-auto mt-3" style="max-width: 1200px;">
<div class="container-lg mx-auto mt-2" style="max-width: 1400px;">
{% for message in messages %}
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert">
<div class="alert alert-{% if message.tags == 'error' %}danger{% else %}{{ message.tags }}{% endif %} alert-dismissible fade show" role="alert" style="padding: 0.5rem 0.75rem; font-size: 0.8rem;">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
@@ -430,7 +666,7 @@
{% endif %}
<!-- Page Content -->
<div class="container-lg mx-auto" style="max-width: 1200px; padding: 20px;">
<div class="container-lg mx-auto" style="max-width: 1400px; padding: 15px;">
{% block content %}
{% endblock %}
</div>

View File

@@ -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 %}

View File

@@ -0,0 +1,519 @@
{% extends 'base.html' %}
{% load static %}
{% block title %}{{ title }} - Stiftungsverwaltung{% endblock %}
{% block extra_css %}
<style>
/* Override font sizes for better readability */
body {
font-size: 0.875rem;
line-height: 1.4;
}
.h1, .h2, .h3, .h4, .h5, .h6,
h1, h2, h3, h4, h5, h6 {
font-weight: 600;
line-height: 1.3;
}
.h3, h3 {
font-size: 1.5rem;
}
.h5, h5 {
font-size: 1.1rem;
}
.h6, h6 {
font-size: 1rem;
}
/* Better card spacing */
.card {
margin-bottom: 1rem;
}
.card-body {
padding: 1rem;
}
.card-header {
padding: 0.75rem 1rem;
}
/* Form improvements */
.form-label {
font-weight: 500;
font-size: 0.875rem;
margin-bottom: 0.375rem;
}
.form-control, .form-select {
font-size: 0.875rem;
padding: 0.5rem 0.75rem;
}
.form-text {
font-size: 0.8rem;
}
/* Button improvements */
.btn {
font-size: 0.875rem;
padding: 0.5rem 1rem;
border-radius: 0.375rem;
}
.btn-sm {
font-size: 0.8rem;
padding: 0.375rem 0.75rem;
}
/* Progress bar styling */
.progress {
height: 1.25rem;
font-size: 0.75rem;
}
/* Badge sizing */
.badge {
font-size: 0.75rem;
padding: 0.35em 0.65em;
}
/* Table improvements */
.table {
font-size: 0.875rem;
}
.table th {
font-size: 0.8rem;
font-weight: 600;
padding: 0.75rem;
}
.table td {
padding: 0.75rem;
}
/* Responsive adjustments */
@media (max-width: 768px) {
body {
font-size: 0.8rem;
}
.h3, h3 {
font-size: 1.3rem;
}
.btn {
font-size: 0.8rem;
padding: 0.375rem 0.75rem;
}
.card-body {
padding: 0.75rem;
}
}
</style>
{% endblock %}
{% block content %}
<div class="container-fluid">
<div class="row">
<div class="col-12">
<!-- Header -->
<div class="d-flex justify-content-between align-items-center mb-3">
<h1 class="h3 mb-0">
<i class="fas fa-calendar-check text-primary me-2"></i>
Vierteljahresnachweis bearbeiten
</h1>
<a href="{% url 'stiftung:destinataer_detail' pk=destinataer.pk %}" class="btn btn-outline-secondary btn-sm">
<i class="fas fa-arrow-left me-1"></i>Zurück
</a>
</div>
<!-- Quarter Info Card -->
<div class="card shadow mb-3">
<div class="card-header bg-primary text-white">
<div class="row align-items-center">
<div class="col-md-8">
<h5 class="card-title mb-0">
<i class="fas fa-user me-2"></i>{{ destinataer.get_full_name }}
</h5>
<small class="opacity-75">{{ nachweis.jahr }} {{ nachweis.get_quarter_display }}</small>
</div>
<div class="col-md-4 text-end">
<span class="badge
{% if nachweis.status == 'offen' %}bg-secondary
{% elif nachweis.status == 'teilweise' %}bg-warning
{% elif nachweis.status == 'eingereicht' %}bg-info
{% elif nachweis.status == 'geprueft' %}bg-success
{% elif nachweis.status == 'nachbesserung' %}bg-warning
{% elif nachweis.status == 'abgelehnt' %}bg-danger
{% endif %}">
{{ nachweis.get_status_display }}
</span>
{% if nachweis.faelligkeitsdatum %}
<br><small class="opacity-75">Fällig: {{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</small>
{% endif %}
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-md-6">
<p class="mb-2"><strong>Destinatär:</strong> {{ destinataer.get_full_name }}</p>
<p class="mb-2"><strong>E-Mail:</strong>
{% if destinataer.email %}
<a href="mailto:{{ destinataer.email }}">{{ destinataer.email }}</a>
{% else %}
<em class="text-muted">Nicht angegeben</em>
{% endif %}
</p>
</div>
<div class="col-md-6">
<p class="mb-2"><strong>Zeitraum:</strong> {{ nachweis.jahr }} {{ nachweis.get_quarter_display }}</p>
{% if nachweis.faelligkeitsdatum %}
<p class="mb-0"><strong>Fälligkeitsdatum:</strong> {{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</p>
{% endif %}
</div>
</div>
</div>
</div>
<!-- Edit Form -->
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="row">
<div class="col-lg-8">
<!-- Study Proof Section -->
<div class="card shadow mb-3">
<div class="card-header bg-primary text-white">
<h6 class="card-title mb-0">
<i class="fas fa-graduation-cap me-2"></i>Studiennachweis
</h6>
</div>
<div class="card-body">
<div class="form-check mb-3">
{{ form.studiennachweis_eingereicht }}
<label class="form-check-label" for="{{ form.studiennachweis_eingereicht.id_for_label }}">
{{ form.studiennachweis_eingereicht.label }}
</label>
</div>
<div class="mb-3">
<label for="{{ form.studiennachweis_datei.id_for_label }}" class="form-label">{{ form.studiennachweis_datei.label }}</label>
{{ form.studiennachweis_datei }}
{% if nachweis.studiennachweis_datei %}
<div class="mt-2">
<small class="text-muted">Aktuelle Datei:
<a href="{{ nachweis.studiennachweis_datei.url }}" target="_blank" class="text-decoration-none">
<i class="fas fa-file-pdf text-danger"></i> {{ nachweis.studiennachweis_datei.name }}
</a>
</small>
</div>
{% endif %}
{% if form.studiennachweis_datei.help_text %}
<small class="form-text text-muted">{{ form.studiennachweis_datei.help_text }}</small>
{% endif %}
</div>
<div class="mb-0">
<label for="{{ form.studiennachweis_bemerkung.id_for_label }}" class="form-label">{{ form.studiennachweis_bemerkung.label }}</label>
{{ form.studiennachweis_bemerkung }}
{% if form.studiennachweis_bemerkung.help_text %}
<small class="form-text text-muted">{{ form.studiennachweis_bemerkung.help_text }}</small>
{% endif %}
</div>
</div>
</div>
<!-- Income Situation Section -->
<div class="card shadow mb-3">
<div class="card-header bg-success text-white">
<h6 class="card-title mb-0">
<i class="fas fa-euro-sign me-2"></i>Einkommenssituation
</h6>
</div>
<div class="card-body">
<div class="form-check mb-3">
{{ form.einkommenssituation_bestaetigt }}
<label class="form-check-label" for="{{ form.einkommenssituation_bestaetigt.id_for_label }}">
{{ form.einkommenssituation_bestaetigt.label }}
</label>
</div>
<div class="mb-3">
<label for="{{ form.einkommenssituation_text.id_for_label }}" class="form-label">{{ form.einkommenssituation_text.label }}</label>
{{ form.einkommenssituation_text }}
{% if form.einkommenssituation_text.help_text %}
<small class="form-text text-muted">{{ form.einkommenssituation_text.help_text }}</small>
{% endif %}
</div>
<div class="mb-0">
<label for="{{ form.einkommenssituation_datei.id_for_label }}" class="form-label">{{ form.einkommenssituation_datei.label }}</label>
{{ form.einkommenssituation_datei }}
{% if nachweis.einkommenssituation_datei %}
<div class="mt-2">
<small class="text-muted">Aktuelle Datei:
<a href="{{ nachweis.einkommenssituation_datei.url }}" target="_blank" class="text-decoration-none">
<i class="fas fa-file-pdf text-danger"></i> {{ nachweis.einkommenssituation_datei.name }}
</a>
</small>
</div>
{% endif %}
{% if form.einkommenssituation_datei.help_text %}
<small class="form-text text-muted">{{ form.einkommenssituation_datei.help_text }}</small>
{% endif %}
</div>
</div>
</div>
<!-- Asset Situation Section -->
<div class="card shadow mb-4">
<div class="card-header bg-warning text-dark">
<h5 class="card-title mb-0">
<i class="fas fa-piggy-bank me-2"></i>Vermögenssituation
</h5>
</div>
<div class="card-body">
<div class="form-check mb-3">
{{ form.vermogenssituation_bestaetigt }}
<label class="form-check-label" for="{{ form.vermogenssituation_bestaetigt.id_for_label }}">
{{ form.vermogenssituation_bestaetigt.label }}
</label>
</div>
<div class="mb-3">
<label for="{{ form.vermogenssituation_text.id_for_label }}" class="form-label">{{ form.vermogenssituation_text.label }}</label>
{{ form.vermogenssituation_text }}
{% if form.vermogenssituation_text.help_text %}
<small class="form-text text-muted">{{ form.vermogenssituation_text.help_text }}</small>
{% endif %}
</div>
<div class="mb-3">
<label for="{{ form.vermogenssituation_datei.id_for_label }}" class="form-label">{{ form.vermogenssituation_datei.label }}</label>
{{ form.vermogenssituation_datei }}
{% if nachweis.vermogenssituation_datei %}
<div class="mt-2">
<small class="text-muted">Aktuelle Datei:
<a href="{{ nachweis.vermogenssituation_datei.url }}" target="_blank" class="text-decoration-none">
<i class="fas fa-file-pdf text-danger"></i> {{ nachweis.vermogenssituation_datei.name }}
</a>
</small>
</div>
{% endif %}
{% if form.vermogenssituation_datei.help_text %}
<small class="form-text text-muted">{{ form.vermogenssituation_datei.help_text }}</small>
{% endif %}
</div>
</div>
</div>
<!-- Additional Documents Section -->
<div class="card shadow mb-4">
<div class="card-header bg-info text-white">
<h5 class="card-title mb-0">
<i class="fas fa-file-alt me-2"></i>Weitere Dokumente (optional)
</h5>
</div>
<div class="card-body">
<div class="mb-3">
<label for="{{ form.weitere_dokumente.id_for_label }}" class="form-label">{{ form.weitere_dokumente.label }}</label>
{{ form.weitere_dokumente }}
{% if nachweis.weitere_dokumente %}
<div class="mt-2">
<small class="text-muted">Aktuelle Datei:
<a href="{{ nachweis.weitere_dokumente.url }}" target="_blank" class="text-decoration-none">
<i class="fas fa-file-pdf text-danger"></i> {{ nachweis.weitere_dokumente.name }}
</a>
</small>
</div>
{% endif %}
{% if form.weitere_dokumente.help_text %}
<small class="form-text text-muted">{{ form.weitere_dokumente.help_text }}</small>
{% endif %}
</div>
<div class="mb-3">
<label for="{{ form.weitere_dokumente_beschreibung.id_for_label }}" class="form-label">{{ form.weitere_dokumente_beschreibung.label }}</label>
{{ form.weitere_dokumente_beschreibung }}
{% if form.weitere_dokumente_beschreibung.help_text %}
<small class="form-text text-muted">{{ form.weitere_dokumente_beschreibung.help_text }}</small>
{% endif %}
</div>
</div>
</div>
<!-- Internal Notes (Staff Only) -->
{% if user.is_staff %}
<div class="card shadow mb-4">
<div class="card-header bg-secondary text-white">
<h5 class="card-title mb-0">
<i class="fas fa-user-shield me-2"></i>Interne Notizen (nur für Verwaltung)
</h5>
</div>
<div class="card-body">
<div class="mb-3">
<label for="{{ form.interne_notizen.id_for_label }}" class="form-label">{{ form.interne_notizen.label }}</label>
{{ form.interne_notizen }}
{% if form.interne_notizen.help_text %}
<small class="form-text text-muted">{{ form.interne_notizen.help_text }}</small>
{% endif %}
</div>
</div>
</div>
{% endif %}
<!-- Form Actions -->
<div class="card shadow">
<div class="card-body bg-light">
<div class="row">
<div class="col-6">
<a href="{% url 'stiftung:destinataer_detail' pk=destinataer.pk %}" class="btn btn-secondary w-100">
<i class="fas fa-times me-2"></i>Abbrechen
</a>
</div>
<div class="col-6">
<button type="submit" class="btn btn-primary w-100">
<i class="fas fa-save me-2"></i>Speichern
</button>
</div>
</div>
<div class="row mt-3">
<div class="col-12">
<small class="text-muted">
<i class="fas fa-info-circle me-1"></i>
Ihre Änderungen werden gespeichert und der Status wird automatisch aktualisiert.
</small>
</div>
</div>
</div>
</div>
</div>
<!-- Sidebar -->
<div class="col-lg-4">
<!-- Status Card -->
<div class="card shadow mb-3">
<div class="card-header bg-light">
<h6 class="card-title mb-0">
<i class="fas fa-info-circle me-2"></i>Status & Informationen
</h6>
</div>
<div class="card-body">
<p class="mb-2"><strong>Status:</strong>
<span class="badge
{% if nachweis.status == 'offen' %}bg-secondary
{% elif nachweis.status == 'teilweise' %}bg-warning
{% elif nachweis.status == 'eingereicht' %}bg-info
{% elif nachweis.status == 'geprueft' %}bg-success
{% elif nachweis.status == 'nachbesserung' %}bg-warning
{% elif nachweis.status == 'abgelehnt' %}bg-danger
{% endif %}">
{{ nachweis.get_status_display }}
</span>
</p>
{% if nachweis.faelligkeitsdatum %}
<p class="mb-2"><strong>Fälligkeit:</strong> {{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</p>
{% endif %}
{% if nachweis.eingereicht_am %}
<p class="mb-2"><strong>Eingereicht:</strong> {{ nachweis.eingereicht_am|date:"d.m.Y H:i" }}</p>
{% endif %}
{% if nachweis.geprueft_am %}
<p class="mb-2"><strong>Geprüft:</strong> {{ nachweis.geprueft_am|date:"d.m.Y H:i" }}</p>
{% endif %}
{% if nachweis.geprueft_von %}
<p class="mb-2"><strong>Geprüft von:</strong> {{ nachweis.geprueft_von.get_full_name|default:nachweis.geprueft_von.username }}</p>
{% endif %}
<p class="mb-1"><strong>Erstellt:</strong> {{ nachweis.erstellt_am|date:"d.m.Y H:i" }}</p>
<p class="mb-0"><strong>Aktualisiert:</strong> {{ nachweis.aktualisiert_am|date:"d.m.Y H:i" }}</p>
</div>
</div>
<!-- Requirements Checklist -->
<div class="card shadow mb-3">
<div class="card-header bg-primary text-white">
<h6 class="card-title mb-0">
<i class="fas fa-list-check me-2"></i>Anforderungen
</h6>
</div>
<div class="card-body">
<ul class="list-unstyled mb-0">
<li class="mb-2">
{% if nachweis.studiennachweis_eingereicht %}
<i class="fas fa-check-circle text-success me-2"></i>
{% else %}
<i class="fas fa-circle text-muted me-2"></i>
{% endif %}
Studiennachweis
</li>
<li class="mb-2">
{% if nachweis.einkommenssituation_bestaetigt %}
<i class="fas fa-check-circle text-success me-2"></i>
{% else %}
<i class="fas fa-circle text-muted me-2"></i>
{% endif %}
Einkommenssituation
</li>
<li class="mb-0">
{% if nachweis.vermogenssituation_bestaetigt %}
<i class="fas fa-check-circle text-success me-2"></i>
{% else %}
<i class="fas fa-circle text-muted me-2"></i>
{% endif %}
Vermögenssituation
</li>
</ul>
</div>
</div>
<!-- Help Card -->
<div class="card shadow">
<div class="card-header bg-info text-white">
<h6 class="card-title mb-0">
<i class="fas fa-question-circle me-2"></i>Hilfe
</h6>
</div>
<div class="card-body">
<small>
<strong>Einkommenssituation:</strong><br>
Sie können entweder einen kurzen Text eingeben oder eine Datei hochladen.<br><br>
<strong>Unterstützte Dateiformate:</strong><br>
PDF, DOC, DOCX, JPG, PNG<br><br>
<strong>Fragen?</strong><br>
Wenden Sie sich an die Stiftungsverwaltung.
</small>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
{% endblock %}
{% block javascript %}
<script>
// Auto-save functionality could be added here
document.addEventListener('DOMContentLoaded', function() {
// Add any JavaScript functionality here
console.log('Quarterly confirmation edit page loaded');
});
</script>
{% endblock %}