diff --git a/templates/admin/fees.html b/templates/admin/fees.html index 44c435f..60807a7 100755 --- a/templates/admin/fees.html +++ b/templates/admin/fees.html @@ -245,6 +245,7 @@ } .month-cell.paid { background: var(--success); color: white; } + .month-cell.paid-premium { background: #0d9488; color: white; } .month-cell.partial { background: #60a5fa; color: white; } .month-cell.pending { background: var(--warning); color: white; } .month-cell.overdue { background: var(--error); color: white; } @@ -481,12 +482,15 @@ {% for m in range(1, 13) %} {% set fee = cf.months.get(m) %} + {% set expected = cf.expected_fees.get(m, 200) %} + {% set underpaid = fee and fee.amount and fee.amount|int < expected %} + {% set is_premium = fee and fee.status == 'paid' and expected >= 300 and fee.amount|int >= 300 %} {% if fee %} - - {{ m }}{% if fee.status == 'partial' %}{{ fee.amount_paid|int }}{% endif %} + + {{ m }}{% if fee.status == 'partial' %}{{ fee.amount_paid|int }}{% endif %}{% if underpaid %}!{% endif %} {% else %} - - + - {% endif %} {% endfor %} diff --git a/templates/board/fees_readonly.html b/templates/board/fees_readonly.html index 22778de..971b5c8 100644 --- a/templates/board/fees_readonly.html +++ b/templates/board/fees_readonly.html @@ -125,6 +125,7 @@ } .month-cell.paid { background: var(--success); color: white; } + .month-cell.paid-premium { background: #0d9488; color: white; } .month-cell.partial { background: #60a5fa; color: white; } .month-cell.pending { background: var(--warning); color: white; } .month-cell.overdue { background: var(--error); color: white; } @@ -241,6 +242,8 @@ IIIIIIIVVVI VIIVIIIIXXXIXII Zaległ.
z lat poprz. + Przyp. + Wezwanie @@ -308,12 +311,15 @@ {% for m in range(1, 13) %} {% set fee = cf.months.get(m) %} + {% set expected = cf.expected_fees.get(m, 200) %} + {% set underpaid = fee and fee.amount and fee.amount|int < expected %} + {% set is_premium = fee and fee.status == 'paid' and expected >= 300 and fee.amount|int >= 300 %} {% if fee %} - - {{ m }}{% if fee.status == 'partial' %}{{ fee.amount_paid|int }}{% endif %} + + {{ m }}{% if fee.status == 'partial' %}{{ fee.amount_paid|int }}{% endif %}{% if underpaid %}!{% endif %} {% else %} - - + - {% endif %} {% endfor %}