Getrennte Fristen für Studiennachweis und Zahlung implementieren
- Neue Felder: studiennachweis_faelligkeitsdatum (semesterbasiert) und zahlung_faelligkeitsdatum (vierteljährlich im Voraus) - Studiennachweis-Fristen: Q1/Q2 → 15. März, Q3/Q4 → 15. September - Zahlungsfälligkeiten: Q1 → 15. Dez (Vorjahr), Q2 → 15. Mär, Q3 → 15. Jun, Q4 → 15. Sep - Auto-Freigabe: Q1 freigeben → Q2 Studiennachweis auto-freigegeben, Q3 → Q4 - Unterstützungserstellung: Verhindert Duplikate durch präzise Suche nach zahlung_faelligkeitsdatum - Quartalserstellung: Modal-Formular funktioniert korrekt - UI: Beide Fristen in Tabelle angezeigt, separate Überfälligkeits-Indikatoren - Migration: Neue Felder hinzugefügt und bestehende Datensätze befüllt
This commit is contained in:
84
app/stiftung/migrations/0042_add_separate_deadlines.py
Normal file
84
app/stiftung/migrations/0042_add_separate_deadlines.py
Normal file
@@ -0,0 +1,84 @@
|
||||
# Generated migration for separate study proof and payment deadlines
|
||||
|
||||
from django.db import migrations, models
|
||||
from datetime import date
|
||||
|
||||
|
||||
def calculate_study_proof_deadline(jahr, quartal):
|
||||
"""Calculate semester-based study proof deadline"""
|
||||
# Q1, Q2 → March 15 (same year)
|
||||
# Q3, Q4 → September 15 (same year)
|
||||
if quartal in [1, 2]:
|
||||
return date(jahr, 3, 15)
|
||||
else: # Q3, Q4
|
||||
return date(jahr, 9, 15)
|
||||
|
||||
|
||||
def calculate_payment_due_date(jahr, quartal):
|
||||
"""Calculate quarterly payment due date (paid in advance)"""
|
||||
# Q1 → December 15 (previous year)
|
||||
# Q2 → March 15 (same year)
|
||||
# Q3 → June 15 (same year)
|
||||
# Q4 → September 15 (same year)
|
||||
if quartal == 1:
|
||||
return date(jahr - 1, 12, 15)
|
||||
elif quartal == 2:
|
||||
return date(jahr, 3, 15)
|
||||
elif quartal == 3:
|
||||
return date(jahr, 6, 15)
|
||||
else: # Q4
|
||||
return date(jahr, 9, 15)
|
||||
|
||||
|
||||
def populate_deadlines(apps, schema_editor):
|
||||
"""Populate new deadline fields for existing records"""
|
||||
VierteljahresNachweis = apps.get_model('stiftung', 'VierteljahresNachweis')
|
||||
|
||||
for nachweis in VierteljahresNachweis.objects.all():
|
||||
# Calculate and set study proof deadline
|
||||
if not nachweis.studiennachweis_faelligkeitsdatum:
|
||||
nachweis.studiennachweis_faelligkeitsdatum = calculate_study_proof_deadline(
|
||||
nachweis.jahr, nachweis.quartal
|
||||
)
|
||||
|
||||
# Calculate and set payment due date
|
||||
if not nachweis.zahlung_faelligkeitsdatum:
|
||||
nachweis.zahlung_faelligkeitsdatum = calculate_payment_due_date(
|
||||
nachweis.jahr, nachweis.quartal
|
||||
)
|
||||
|
||||
nachweis.save(update_fields=['studiennachweis_faelligkeitsdatum', 'zahlung_faelligkeitsdatum'])
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('stiftung', '0041_alter_geschichteseite_inhalt'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
# Add new fields
|
||||
migrations.AddField(
|
||||
model_name='vierteljahresnachweis',
|
||||
name='studiennachweis_faelligkeitsdatum',
|
||||
field=models.DateField(
|
||||
blank=True,
|
||||
help_text='Semesterbasierte Frist: Q1/Q2 → 15. März, Q3/Q4 → 15. September',
|
||||
null=True,
|
||||
verbose_name='Studiennachweis Fälligkeitsdatum'
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='vierteljahresnachweis',
|
||||
name='zahlung_faelligkeitsdatum',
|
||||
field=models.DateField(
|
||||
blank=True,
|
||||
help_text='Vierteljährliche Zahlungsfälligkeit im Voraus: Q1→15. Dez (Vorjahr), Q2→15. Mär, Q3→15. Jun, Q4→15. Sep',
|
||||
null=True,
|
||||
verbose_name='Zahlungsfälligkeit'
|
||||
),
|
||||
),
|
||||
# Populate existing records
|
||||
migrations.RunPython(populate_deadlines, migrations.RunPython.noop),
|
||||
]
|
||||
|
||||
@@ -2665,7 +2665,23 @@ class VierteljahresNachweis(models.Model):
|
||||
faelligkeitsdatum = models.DateField(
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name="Fälligkeitsdatum"
|
||||
verbose_name="Fälligkeitsdatum",
|
||||
help_text="Veraltet - wird durch studiennachweis_faelligkeitsdatum und zahlung_faelligkeitsdatum ersetzt"
|
||||
)
|
||||
|
||||
# Separate deadlines for study proof (semester-based) and payment (quarterly)
|
||||
studiennachweis_faelligkeitsdatum = models.DateField(
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name="Studiennachweis Fälligkeitsdatum",
|
||||
help_text="Semesterbasierte Frist: Q1/Q2 → 15. März, Q3/Q4 → 15. September"
|
||||
)
|
||||
|
||||
zahlung_faelligkeitsdatum = models.DateField(
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name="Zahlungsfälligkeit",
|
||||
help_text="Vierteljährliche Zahlungsfälligkeit im Voraus: Q1→15. Dez (Vorjahr), Q2→15. Mär, Q3→15. Jun, Q4→15. Sep"
|
||||
)
|
||||
|
||||
class Meta:
|
||||
@@ -2746,18 +2762,67 @@ class VierteljahresNachweis(models.Model):
|
||||
|
||||
return int((completed_requirements / total_requirements) * 100) if total_requirements > 0 else 0
|
||||
|
||||
def get_study_proof_deadline(self):
|
||||
"""Calculate semester-based study proof deadline"""
|
||||
from datetime import date
|
||||
# Q1, Q2 → March 15 (same year)
|
||||
# Q3, Q4 → September 15 (same year)
|
||||
if self.quartal in [1, 2]:
|
||||
return date(self.jahr, 3, 15)
|
||||
else: # Q3, Q4
|
||||
return date(self.jahr, 9, 15)
|
||||
|
||||
def get_payment_due_date(self):
|
||||
"""Calculate quarterly payment due date (paid in advance)"""
|
||||
from datetime import date
|
||||
# Q1 → December 15 (previous year)
|
||||
# Q2 → March 15 (same year)
|
||||
# Q3 → June 15 (same year)
|
||||
# Q4 → September 15 (same year)
|
||||
if self.quartal == 1:
|
||||
return date(self.jahr - 1, 12, 15)
|
||||
elif self.quartal == 2:
|
||||
return date(self.jahr, 3, 15)
|
||||
elif self.quartal == 3:
|
||||
return date(self.jahr, 6, 15)
|
||||
else: # Q4
|
||||
return date(self.jahr, 9, 15)
|
||||
|
||||
def is_study_proof_overdue(self):
|
||||
"""Check if study proof deadline has passed"""
|
||||
if not self.studiennachweis_faelligkeitsdatum:
|
||||
return False
|
||||
from django.utils import timezone
|
||||
return timezone.now().date() > self.studiennachweis_faelligkeitsdatum and not self.studiennachweis_eingereicht
|
||||
|
||||
def is_payment_overdue(self):
|
||||
"""Check if payment due date has passed"""
|
||||
if not self.zahlung_faelligkeitsdatum:
|
||||
return False
|
||||
from django.utils import timezone
|
||||
# Payment is overdue if due date passed and no payment exists or payment is not completed
|
||||
payment = self.get_related_support_payment()
|
||||
if payment and payment.status in ['bezahlt', 'in_bearbeitung']:
|
||||
return False
|
||||
return timezone.now().date() > self.zahlung_faelligkeitsdatum
|
||||
|
||||
def is_overdue(self):
|
||||
"""Check if either deadline has passed"""
|
||||
return self.is_study_proof_overdue() or self.is_payment_overdue()
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
"""Override save to auto-update status and timestamps"""
|
||||
# Auto-set deadline if not provided (semester-based deadlines)
|
||||
# Set study proof deadline (semester-based) if not provided
|
||||
if not self.studiennachweis_faelligkeitsdatum:
|
||||
self.studiennachweis_faelligkeitsdatum = self.get_study_proof_deadline()
|
||||
|
||||
# Set payment due date (quarterly, advance) if not provided
|
||||
if not self.zahlung_faelligkeitsdatum:
|
||||
self.zahlung_faelligkeitsdatum = self.get_payment_due_date()
|
||||
|
||||
# Backward compatibility: set faelligkeitsdatum from study proof deadline if not set
|
||||
if not self.faelligkeitsdatum:
|
||||
from datetime import date
|
||||
quarter_deadlines = {
|
||||
1: date(self.jahr, 3, 15), # Q1 deadline: March 15 (Spring semester)
|
||||
2: date(self.jahr, 3, 15), # Q2 deadline: March 15 (Spring semester, same as Q1)
|
||||
3: date(self.jahr, 9, 15), # Q3 deadline: September 15 (Fall semester)
|
||||
4: date(self.jahr, 9, 15), # Q4 deadline: September 15 (Fall semester, same as Q3)
|
||||
}
|
||||
self.faelligkeitsdatum = quarter_deadlines.get(self.quartal)
|
||||
self.faelligkeitsdatum = self.studiennachweis_faelligkeitsdatum
|
||||
|
||||
# Auto-update status based on completion
|
||||
if self.is_complete():
|
||||
@@ -2773,18 +2838,71 @@ class VierteljahresNachweis(models.Model):
|
||||
|
||||
def get_related_support_payment(self):
|
||||
"""Get the related support payment for this quarterly confirmation"""
|
||||
from datetime import datetime
|
||||
from datetime import date, timedelta
|
||||
from django.db.models import Q
|
||||
|
||||
quarter_start = datetime(self.jahr, (self.quartal - 1) * 3 + 1, 1).date()
|
||||
quarter_end = datetime(self.jahr, self.quartal * 3, 1).date()
|
||||
# Use payment due date from quarterly confirmation for accurate search
|
||||
# This is more accurate than using quarter date range, especially for Q1 (Dec 15 prev year)
|
||||
payment_due_date = self.zahlung_faelligkeitsdatum
|
||||
if not payment_due_date:
|
||||
# Fallback: calculate if not set
|
||||
if self.quartal == 1:
|
||||
payment_due_date = date(self.jahr - 1, 12, 15)
|
||||
elif self.quartal == 2:
|
||||
payment_due_date = date(self.jahr, 3, 15)
|
||||
elif self.quartal == 3:
|
||||
payment_due_date = date(self.jahr, 6, 15)
|
||||
else: # Q4
|
||||
payment_due_date = date(self.jahr, 9, 15)
|
||||
|
||||
# Search for existing payment - match by payment due date and description
|
||||
# Use a date range around the due date (±30 days) to catch any variations
|
||||
date_start = payment_due_date - timedelta(days=30)
|
||||
date_end = payment_due_date + timedelta(days=30)
|
||||
|
||||
return DestinataerUnterstuetzung.objects.filter(
|
||||
destinataer=self.destinataer,
|
||||
faellig_am__gte=quarter_start,
|
||||
faellig_am__lt=quarter_end,
|
||||
beschreibung__contains=f"Q{self.quartal}/{self.jahr}"
|
||||
faellig_am__gte=date_start,
|
||||
faellig_am__lte=date_end
|
||||
).filter(
|
||||
Q(beschreibung__contains=f"Q{self.quartal}/{self.jahr}") |
|
||||
Q(beschreibung__contains=f"Vierteljährliche Unterstützung Q{self.quartal}/{self.jahr}")
|
||||
).first()
|
||||
|
||||
def auto_approve_next_quarter(self):
|
||||
"""Auto-approve the next quarter when Q1 or Q3 is approved (semester-based logic)"""
|
||||
if self.quartal in [1, 3] and self.status == "geprueft":
|
||||
next_quarter = self.quartal + 1
|
||||
try:
|
||||
next_nachweis = VierteljahresNachweis.objects.get(
|
||||
destinataer=self.destinataer,
|
||||
jahr=self.jahr,
|
||||
quartal=next_quarter
|
||||
)
|
||||
|
||||
if next_nachweis.status in ["offen", "teilweise"]:
|
||||
# Copy study proof confirmations from current quarter (semester-based)
|
||||
next_nachweis.studiennachweis_eingereicht = self.studiennachweis_eingereicht
|
||||
next_nachweis.studiennachweis_datei = self.studiennachweis_datei
|
||||
next_nachweis.studiennachweis_bemerkung = self.studiennachweis_bemerkung
|
||||
|
||||
# Set study proof deadline for next quarter (same semester)
|
||||
next_nachweis.studiennachweis_faelligkeitsdatum = next_nachweis.get_study_proof_deadline()
|
||||
|
||||
# Set auto-approved status
|
||||
next_nachweis.status = "auto_geprueft"
|
||||
next_nachweis.geprueft_am = timezone.now()
|
||||
next_nachweis.geprueft_von = self.geprueft_von
|
||||
next_nachweis.save(update_fields=[
|
||||
'studiennachweis_eingereicht', 'studiennachweis_datei', 'studiennachweis_bemerkung',
|
||||
'studiennachweis_faelligkeitsdatum', 'status', 'geprueft_am', 'geprueft_von'
|
||||
])
|
||||
|
||||
return next_nachweis
|
||||
except VierteljahresNachweis.DoesNotExist:
|
||||
pass
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def get_or_create_for_period(cls, destinataer, jahr, quartal):
|
||||
"""Get or create a quarterly confirmation for a specific period"""
|
||||
|
||||
@@ -7422,21 +7422,33 @@ def create_quarterly_support_payment(nachweis):
|
||||
if not destinataer.iban:
|
||||
return None
|
||||
|
||||
# Calculate quarter date range for more robust search
|
||||
quarter_start = datetime(nachweis.jahr, (nachweis.quartal - 1) * 3 + 1, 1).date()
|
||||
if nachweis.quartal == 4: # Q4 special case
|
||||
quarter_end = datetime(nachweis.jahr + 1, 1, 1).date()
|
||||
else:
|
||||
quarter_end = datetime(nachweis.jahr, nachweis.quartal * 3 + 1, 1).date()
|
||||
# Search for existing payment using payment due date from quarterly confirmation
|
||||
# This is more accurate than using quarter date range, especially for Q1 (Dec 15 prev year)
|
||||
payment_due_date = nachweis.zahlung_faelligkeitsdatum
|
||||
if not payment_due_date:
|
||||
# Fallback: calculate if not set
|
||||
if nachweis.quartal == 1:
|
||||
payment_due_date = date(nachweis.jahr - 1, 12, 15)
|
||||
elif nachweis.quartal == 2:
|
||||
payment_due_date = date(nachweis.jahr, 3, 15)
|
||||
elif nachweis.quartal == 3:
|
||||
payment_due_date = date(nachweis.jahr, 6, 15)
|
||||
else: # Q4
|
||||
payment_due_date = date(nachweis.jahr, 9, 15)
|
||||
|
||||
# Search for existing payment - match by payment due date and description
|
||||
# Use a date range around the due date (±30 days) to catch any variations
|
||||
from datetime import timedelta
|
||||
date_start = payment_due_date - timedelta(days=30)
|
||||
date_end = payment_due_date + timedelta(days=30)
|
||||
|
||||
# Search for existing payment - use broader criteria to catch all possibilities
|
||||
existing_payment = DestinataerUnterstuetzung.objects.filter(
|
||||
destinataer=destinataer,
|
||||
faellig_am__gte=quarter_start,
|
||||
faellig_am__lt=quarter_end
|
||||
faellig_am__gte=date_start,
|
||||
faellig_am__lte=date_end
|
||||
).filter(
|
||||
Q(beschreibung__contains=f"Q{nachweis.quartal}/{nachweis.jahr}") |
|
||||
Q(beschreibung__contains=f"Vierteljährliche Unterstützung")
|
||||
Q(beschreibung__contains=f"Vierteljährliche Unterstützung Q{nachweis.quartal}/{nachweis.jahr}")
|
||||
).first()
|
||||
|
||||
if existing_payment:
|
||||
@@ -7457,17 +7469,19 @@ def create_quarterly_support_payment(nachweis):
|
||||
if not default_konto:
|
||||
return None
|
||||
|
||||
# Calculate payment due date (advance payments 3 months before quarter)
|
||||
# Q1: December 15 (previous year), Q2: March 15, Q3: June 15, Q4: September 15
|
||||
|
||||
if nachweis.quartal == 1: # Q1 payment due December 15 of previous year
|
||||
payment_due_date = date(nachweis.jahr - 1, 12, 15)
|
||||
elif nachweis.quartal == 2: # Q2 payment due March 15
|
||||
payment_due_date = date(nachweis.jahr, 3, 15)
|
||||
elif nachweis.quartal == 3: # Q3 payment due June 15
|
||||
payment_due_date = date(nachweis.jahr, 6, 15)
|
||||
else: # Q4 payment due September 15
|
||||
payment_due_date = date(nachweis.jahr, 9, 15)
|
||||
# Use payment due date from quarterly confirmation (already calculated by model)
|
||||
# This ensures consistency with zahlung_faelligkeitsdatum
|
||||
payment_due_date = nachweis.zahlung_faelligkeitsdatum
|
||||
if not payment_due_date:
|
||||
# Fallback: calculate if not set (should not happen, but safety check)
|
||||
if nachweis.quartal == 1: # Q1 payment due December 15 of previous year
|
||||
payment_due_date = date(nachweis.jahr - 1, 12, 15)
|
||||
elif nachweis.quartal == 2: # Q2 payment due March 15
|
||||
payment_due_date = date(nachweis.jahr, 3, 15)
|
||||
elif nachweis.quartal == 3: # Q3 payment due June 15
|
||||
payment_due_date = date(nachweis.jahr, 6, 15)
|
||||
else: # Q4 payment due September 15
|
||||
payment_due_date = date(nachweis.jahr, 9, 15)
|
||||
|
||||
# Create the support payment
|
||||
payment = DestinataerUnterstuetzung.objects.create(
|
||||
@@ -7490,9 +7504,14 @@ def create_quarterly_support_payment(nachweis):
|
||||
@login_required
|
||||
def quarterly_confirmation_create(request, destinataer_id):
|
||||
"""Create a new quarterly confirmation for a destinataer"""
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.info(f"quarterly_confirmation_create called: method={request.method}, destinataer_id={destinataer_id}")
|
||||
|
||||
destinataer = get_object_or_404(Destinataer, pk=destinataer_id)
|
||||
|
||||
if request.method == "POST":
|
||||
logger.info(f"POST data: {request.POST}")
|
||||
jahr = request.POST.get('jahr')
|
||||
quartal = request.POST.get('quartal')
|
||||
|
||||
@@ -7515,26 +7534,41 @@ def quarterly_confirmation_create(request, destinataer_id):
|
||||
)
|
||||
else:
|
||||
# Create new quarterly confirmation
|
||||
nachweis = VierteljahresNachweis.objects.create(
|
||||
destinataer=destinataer,
|
||||
jahr=jahr,
|
||||
quartal=quartal,
|
||||
studiennachweis_erforderlich=True, # Always required now
|
||||
)
|
||||
|
||||
# Set deadline (15th of second month of quarter)
|
||||
deadline_months = {1: 5, 2: 8, 3: 11, 4: 2} # Q1->May, Q2->Aug, Q3->Nov, Q4->Feb(next year)
|
||||
deadline_month = deadline_months[quartal]
|
||||
deadline_year = jahr if quartal != 4 else jahr + 1
|
||||
|
||||
from datetime import date
|
||||
nachweis.faelligkeitsdatum = date(deadline_year, deadline_month, 15)
|
||||
nachweis.save()
|
||||
|
||||
messages.success(
|
||||
request,
|
||||
f"Quartal {jahr} Q{quartal} wurde erfolgreich für {destinataer.get_full_name()} erstellt."
|
||||
)
|
||||
try:
|
||||
nachweis = VierteljahresNachweis.objects.create(
|
||||
destinataer=destinataer,
|
||||
jahr=jahr,
|
||||
quartal=quartal,
|
||||
studiennachweis_erforderlich=True, # Always required now
|
||||
)
|
||||
# Deadlines are automatically set by the model's save() method
|
||||
# studiennachweis_faelligkeitsdatum: semester-based (Q1/Q2→Mar 15, Q3/Q4→Sep 15)
|
||||
# zahlung_faelligkeitsdatum: quarterly advance (Q1→Dec 15 prev year, Q2→Mar 15, Q3→Jun 15, Q4→Sep 15)
|
||||
|
||||
# Refresh from database to ensure deadlines are set
|
||||
nachweis.refresh_from_db()
|
||||
|
||||
studiennachweis_str = nachweis.studiennachweis_faelligkeitsdatum.strftime('%d.%m.%Y') if nachweis.studiennachweis_faelligkeitsdatum else "Nicht gesetzt"
|
||||
zahlung_str = nachweis.zahlung_faelligkeitsdatum.strftime('%d.%m.%Y') if nachweis.zahlung_faelligkeitsdatum else "Nicht gesetzt"
|
||||
|
||||
messages.success(
|
||||
request,
|
||||
f"Quartal {jahr} Q{quartal} wurde erfolgreich für {destinataer.get_full_name()} erstellt. "
|
||||
f"Studiennachweis fällig: {studiennachweis_str}, "
|
||||
f"Zahlung fällig: {zahlung_str}."
|
||||
)
|
||||
except Exception as e:
|
||||
from django.db import IntegrityError
|
||||
if isinstance(e, IntegrityError):
|
||||
messages.error(
|
||||
request,
|
||||
f"Quartal {jahr} Q{quartal} existiert bereits für {destinataer.get_full_name()}."
|
||||
)
|
||||
else:
|
||||
messages.error(
|
||||
request,
|
||||
f"Fehler beim Erstellen des Quartals: {str(e)}"
|
||||
)
|
||||
|
||||
except (ValueError, TypeError):
|
||||
messages.error(request, "Ungültige Jahr- oder Quartalswerte.")
|
||||
@@ -7655,41 +7689,35 @@ def quarterly_confirmation_approve(request, pk):
|
||||
)
|
||||
|
||||
# Handle support payment - create if missing, update if exists
|
||||
if not related_payment:
|
||||
# Create new support payment
|
||||
related_payment = create_quarterly_support_payment(nachweis)
|
||||
if related_payment:
|
||||
related_payment.status = 'in_bearbeitung'
|
||||
related_payment.aktualisiert_am = timezone.now()
|
||||
related_payment.save()
|
||||
|
||||
# Check if payment already exists before calling create_quarterly_support_payment()
|
||||
payment_existed_before = related_payment is not None
|
||||
|
||||
# Use create_quarterly_support_payment() which handles both cases (find existing or create new)
|
||||
related_payment = create_quarterly_support_payment(nachweis)
|
||||
if related_payment:
|
||||
# Update status to 'in_bearbeitung' for both new and existing payments
|
||||
old_status = related_payment.status
|
||||
related_payment.status = 'in_bearbeitung'
|
||||
related_payment.aktualisiert_am = timezone.now()
|
||||
related_payment.save()
|
||||
|
||||
if payment_existed_before:
|
||||
messages.success(
|
||||
request,
|
||||
f"Vierteljahresnachweis freigegeben und bestehende Unterstützung für {nachweis.destinataer.get_full_name()} "
|
||||
f"({nachweis.jahr} Q{nachweis.quartal}) wurde von '{old_status}' auf 'in Bearbeitung' aktualisiert."
|
||||
)
|
||||
else:
|
||||
messages.success(
|
||||
request,
|
||||
f"Vierteljahresnachweis freigegeben und neue Unterstützung über {related_payment.betrag}€ für {nachweis.destinataer.get_full_name()} "
|
||||
f"({nachweis.jahr} Q{nachweis.quartal}) wurde erstellt."
|
||||
)
|
||||
else:
|
||||
messages.warning(
|
||||
request,
|
||||
f"Vierteljahresnachweis freigegeben, aber Unterstützung konnte nicht erstellt werden. "
|
||||
f"Bitte prüfen Sie die Einstellungen für {nachweis.destinataer.get_full_name()}."
|
||||
)
|
||||
elif related_payment.status == 'geplant':
|
||||
# Update existing payment
|
||||
related_payment.status = 'in_bearbeitung'
|
||||
related_payment.aktualisiert_am = timezone.now()
|
||||
related_payment.save()
|
||||
|
||||
messages.success(
|
||||
request,
|
||||
f"Vierteljahresnachweis und zugehörige Unterstützung für {nachweis.destinataer.get_full_name()} "
|
||||
f"({nachweis.jahr} Q{nachweis.quartal}) wurden freigegeben."
|
||||
)
|
||||
else:
|
||||
messages.success(
|
||||
messages.warning(
|
||||
request,
|
||||
f"Vierteljahresnachweis für {nachweis.destinataer.get_full_name()} "
|
||||
f"({nachweis.jahr} Q{nachweis.quartal}) wurde freigegeben."
|
||||
f"Vierteljahresnachweis freigegeben, aber Unterstützung konnte nicht erstellt werden. "
|
||||
f"Bitte prüfen Sie die Einstellungen für {nachweis.destinataer.get_full_name()}."
|
||||
)
|
||||
else:
|
||||
messages.error(
|
||||
|
||||
@@ -466,7 +466,7 @@
|
||||
<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>
|
||||
<small class="text-light me-3">Studiennachweis: 15. März / 15. September | Zahlung: vierteljährlich im Voraus</small>
|
||||
<button type="button" class="btn btn-sm btn-light"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#addQuarterModal"
|
||||
@@ -478,32 +478,76 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if quarterly_confirmations %}
|
||||
<style>
|
||||
.quarterly-table {
|
||||
font-size: 0.9rem;
|
||||
table-layout: auto;
|
||||
}
|
||||
.quarterly-table th {
|
||||
white-space: nowrap;
|
||||
font-size: 0.85rem;
|
||||
padding: 0.6rem 0.5rem;
|
||||
}
|
||||
.quarterly-table td {
|
||||
padding: 0.6rem 0.5rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.quarterly-table .col-zeitraum {
|
||||
width: 85px;
|
||||
}
|
||||
.quarterly-table .col-status {
|
||||
width: 100px;
|
||||
}
|
||||
.quarterly-table .col-fortschritt {
|
||||
width: 70px;
|
||||
}
|
||||
.quarterly-table .col-fristen {
|
||||
width: 120px;
|
||||
}
|
||||
.quarterly-table .col-check {
|
||||
width: 40px;
|
||||
text-align: center;
|
||||
padding: 0.6rem 0.3rem;
|
||||
}
|
||||
.quarterly-table .col-aktionen {
|
||||
width: 110px;
|
||||
}
|
||||
.quarterly-table .progress {
|
||||
height: 18px;
|
||||
font-size: 0.75rem;
|
||||
margin: 0;
|
||||
}
|
||||
.quarterly-table .badge {
|
||||
font-size: 0.75rem;
|
||||
padding: 0.3em 0.5em;
|
||||
}
|
||||
</style>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover">
|
||||
<table class="table table-hover table-sm quarterly-table">
|
||||
<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>
|
||||
<th class="col-zeitraum">Zeitraum</th>
|
||||
<th class="col-status">Status</th>
|
||||
<th class="col-fortschritt">Fortschritt</th>
|
||||
<th class="col-fristen">Fristen</th>
|
||||
<th class="col-check" title="Studiennachweis"><i class="fas fa-graduation-cap"></i></th>
|
||||
<th class="col-check" title="Einkommen"><i class="fas fa-euro-sign"></i></th>
|
||||
<th class="col-check" title="Vermögen"><i class="fas fa-piggy-bank"></i></th>
|
||||
<th class="col-aktionen">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>
|
||||
<td class="col-zeitraum">
|
||||
<strong>{{ nachweis.jahr }} Q{{ nachweis.quartal }}</strong>
|
||||
{% if nachweis.is_overdue %}
|
||||
<br><small class="text-danger"><i class="fas fa-exclamation-triangle"></i> Überfällig</small>
|
||||
<br><small class="text-danger"><i class="fas fa-exclamation-triangle"></i></small>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<td class="col-status">
|
||||
{% if nachweis.status == 'offen' %}
|
||||
<span class="badge bg-secondary">Ausstehend</span>
|
||||
<span class="badge bg-secondary">Offen</span>
|
||||
{% elif nachweis.status == 'teilweise' %}
|
||||
<span class="badge bg-warning">Teilweise</span>
|
||||
{% elif nachweis.status == 'eingereicht' %}
|
||||
@@ -511,8 +555,8 @@
|
||||
{% elif nachweis.status == 'geprueft' %}
|
||||
<span class="badge bg-success">Freigegeben</span>
|
||||
{% elif nachweis.status == 'auto_geprueft' %}
|
||||
<span class="badge bg-success">
|
||||
<i class="fas fa-magic me-1"></i>Auto-Freigabe
|
||||
<span class="badge bg-success" title="Auto-Freigabe">
|
||||
<i class="fas fa-magic"></i> Auto
|
||||
</span>
|
||||
{% elif nachweis.status == 'nachbesserung' %}
|
||||
<span class="badge bg-warning">Nachbesserung</span>
|
||||
@@ -520,9 +564,9 @@
|
||||
<span class="badge bg-danger">Abgelehnt</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<td class="col-fortschritt">
|
||||
{% with completion=nachweis.get_completion_percentage %}
|
||||
<div class="progress" style="height: 20px;">
|
||||
<div class="progress" title="{{ completion }}%">
|
||||
<div class="progress-bar
|
||||
{% if completion == 100 %}bg-success
|
||||
{% elif completion >= 70 %}bg-info
|
||||
@@ -539,14 +583,33 @@
|
||||
</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 class="col-fristen">
|
||||
<div class="small" style="line-height: 1.4;">
|
||||
{% if nachweis.studiennachweis_faelligkeitsdatum %}
|
||||
<div class="mb-1">
|
||||
<i class="fas fa-graduation-cap text-primary" title="Studiennachweis"></i>
|
||||
<span class="{% if nachweis.is_study_proof_overdue %}text-danger fw-bold{% endif %}">
|
||||
{{ nachweis.studiennachweis_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_study_proof_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if nachweis.zahlung_faelligkeitsdatum %}
|
||||
<div>
|
||||
<i class="fas fa-euro-sign text-success" title="Zahlung"></i>
|
||||
<span class="{% if nachweis.is_payment_overdue %}text-danger fw-bold{% endif %}">
|
||||
{{ nachweis.zahlung_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_payment_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="col-check">
|
||||
{% if nachweis.studiennachweis_eingereicht %}
|
||||
{% if nachweis.studiennachweis_datei %}
|
||||
<a href="{{ nachweis.studiennachweis_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
@@ -555,13 +618,13 @@
|
||||
{% elif nachweis.studiennachweis_bemerkung %}
|
||||
<i class="fas fa-comment text-info" title="Bemerkung vorhanden"></i>
|
||||
{% else %}
|
||||
<i class="fas fa-check text-success"></i>
|
||||
<i class="fas fa-check text-success" title="Vorhanden"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
<i class="fas fa-times text-muted" title="Nicht vorhanden"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="col-check">
|
||||
{% if nachweis.einkommenssituation_bestaetigt %}
|
||||
{% if nachweis.einkommenssituation_datei %}
|
||||
<a href="{{ nachweis.einkommenssituation_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
@@ -570,13 +633,13 @@
|
||||
{% 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>
|
||||
<i class="fas fa-check text-success" title="Vorhanden"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
<i class="fas fa-times text-muted" title="Nicht vorhanden"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<td class="col-check">
|
||||
{% if nachweis.vermogenssituation_bestaetigt %}
|
||||
{% if nachweis.vermogenssituation_datei %}
|
||||
<a href="{{ nachweis.vermogenssituation_datei.url }}" target="_blank" class="text-success" title="Datei ansehen">
|
||||
@@ -585,38 +648,38 @@
|
||||
{% 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>
|
||||
<i class="fas fa-check text-success" title="Vorhanden"></i>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<i class="fas fa-times text-muted"></i>
|
||||
<i class="fas fa-times text-muted" title="Nicht vorhanden"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<div class="btn-group" role="group" aria-label="Aktionen">
|
||||
<td class="col-aktionen">
|
||||
<div class="btn-group btn-group-sm" role="group" aria-label="Aktionen">
|
||||
<a href="{% url 'stiftung:quarterly_confirmation_edit' nachweis.id %}"
|
||||
class="btn btn-sm btn-outline-primary"
|
||||
class="btn btn-outline-primary btn-sm"
|
||||
title="Bearbeiten">
|
||||
<i class="fas fa-edit"></i>
|
||||
</a>
|
||||
{% if user.is_staff %}
|
||||
{% if nachweis.status == 'eingereicht' %}
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-outline-success"
|
||||
class="btn btn-outline-success btn-sm"
|
||||
onclick="approveQuarterly('{{ nachweis.id }}')"
|
||||
title="Freigeben">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
{% elif nachweis.status == 'geprueft' %}
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-outline-success"
|
||||
class="btn btn-outline-success btn-sm"
|
||||
onclick="approveQuarterly('{{ nachweis.id }}')"
|
||||
title="Erneut freigeben / Unterstützung synchronisieren">
|
||||
title="Erneut freigeben">
|
||||
<i class="fas fa-sync"></i>
|
||||
</button>
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-outline-warning"
|
||||
class="btn btn-outline-warning btn-sm"
|
||||
onclick="resetQuarterly('{{ nachweis.id }}')"
|
||||
title="Status zurücksetzen">
|
||||
title="Zurücksetzen">
|
||||
<i class="fas fa-undo"></i>
|
||||
</button>
|
||||
{% endif %}
|
||||
@@ -630,58 +693,6 @@
|
||||
</div>
|
||||
|
||||
|
||||
<!-- 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">
|
||||
@@ -715,6 +726,59 @@
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!-- Add Quarter Modal (außerhalb des edit-form) -->
|
||||
<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 %}" id="addQuarterForm">
|
||||
{% 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>
|
||||
|
||||
<!-- Förderungen -->
|
||||
{% if foerderungen %}
|
||||
<div class="card shadow mb-4">
|
||||
@@ -1268,5 +1332,25 @@ function resetQuarterly(nachweisId) {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Handle add quarter form submission using event delegation
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Use event delegation to catch form submission
|
||||
document.addEventListener('submit', function(e) {
|
||||
const form = e.target;
|
||||
if (form && form.id === 'addQuarterForm') {
|
||||
console.log('Add quarter form submitted');
|
||||
console.log('Form action:', form.action);
|
||||
|
||||
// Form will submit normally, page will reload after redirect
|
||||
// Modal will be closed automatically when page reloads
|
||||
const submitBtn = form.querySelector('button[type="submit"]');
|
||||
if (submitBtn) {
|
||||
submitBtn.disabled = true;
|
||||
submitBtn.innerHTML = '<i class="fas fa-spinner fa-spin me-2"></i>Wird erstellt...';
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -155,8 +155,15 @@
|
||||
{% endif %}">
|
||||
{{ nachweis.get_status_display }}
|
||||
</span>
|
||||
{% if nachweis.faelligkeitsdatum %}
|
||||
<br><small class="opacity-75">Fällig: {{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</small>
|
||||
{% if nachweis.studiennachweis_faelligkeitsdatum or nachweis.zahlung_faelligkeitsdatum %}
|
||||
<br><small class="opacity-75">
|
||||
{% if nachweis.studiennachweis_faelligkeitsdatum %}
|
||||
Studiennachweis: {{ nachweis.studiennachweis_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
{% endif %}
|
||||
{% if nachweis.zahlung_faelligkeitsdatum %}
|
||||
| Zahlung: {{ nachweis.zahlung_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
{% endif %}
|
||||
</small>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -175,8 +182,25 @@
|
||||
</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>
|
||||
{% if nachweis.studiennachweis_faelligkeitsdatum %}
|
||||
<p class="mb-1"><strong>Studiennachweis fällig:</strong>
|
||||
<span class="{% if nachweis.is_study_proof_overdue %}text-danger{% endif %}">
|
||||
{{ nachweis.studiennachweis_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_study_proof_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if nachweis.zahlung_faelligkeitsdatum %}
|
||||
<p class="mb-0"><strong>Zahlung fällig:</strong>
|
||||
<span class="{% if nachweis.is_payment_overdue %}text-danger{% endif %}">
|
||||
{{ nachweis.zahlung_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_payment_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -420,8 +444,25 @@
|
||||
</span>
|
||||
</p>
|
||||
|
||||
{% if nachweis.faelligkeitsdatum %}
|
||||
<p class="mb-2"><strong>Fälligkeit:</strong> {{ nachweis.faelligkeitsdatum|date:"d.m.Y" }}</p>
|
||||
{% if nachweis.studiennachweis_faelligkeitsdatum %}
|
||||
<p class="mb-1"><strong>Studiennachweis fällig:</strong>
|
||||
<span class="{% if nachweis.is_study_proof_overdue %}text-danger{% endif %}">
|
||||
{{ nachweis.studiennachweis_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_study_proof_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if nachweis.zahlung_faelligkeitsdatum %}
|
||||
<p class="mb-2"><strong>Zahlung fällig:</strong>
|
||||
<span class="{% if nachweis.is_payment_overdue %}text-danger{% endif %}">
|
||||
{{ nachweis.zahlung_faelligkeitsdatum|date:"d.m.Y" }}
|
||||
</span>
|
||||
{% if nachweis.is_payment_overdue %}
|
||||
<i class="fas fa-exclamation-triangle text-danger" title="Überfällig"></i>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
{% if nachweis.eingereicht_am %}
|
||||
|
||||
Reference in New Issue
Block a user