gru/zbiorki_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rezerwa bez progressu

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-12-11 15:24:55 +01:00
parent 29ca46a5ef
commit 5db700f3b0
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/index.html
View File

@@ -20,21 +20,22 @@ zbiórki{% endif %}{% endblock %}
href="{{ url_for('zbiorki_zrealizowane') }}">Zrealizowane</a> href="{{ url_for('zbiorki_zrealizowane') }}">Zrealizowane</a>
</li> </li>
</ul> </ul>
</div> </div>
{% if zbiorki and zbiorki|length > 0 %} {% if zbiorki and zbiorki|length > 0 %}
<div class="row g-4 pb-5"> <div class="row g-4 pb-5">
{% for z in zbiorki %} {% for z in zbiorki %}
{% set progress = (z.stan / z.cel * 100) if z.cel > 0 else 0 %} {% set progress = (z.stan / z.cel * 100) if z.cel > 0 else 0 %}
{% set progress_clamped = 100 if progress > 100 else (0 if progress < 0 else progress) %} <div {% set progress_clamped = 100 if progress > 100 else (0 if progress < 0 else progress) %}
class="col-sm-12 col-md-6 col-lg-4"> <div class="col-sm-12 col-md-6 col-lg-4">
<div class="card h-100 position-relative"> <div class="card h-100 position-relative">
<div class="card-body d-flex flex-column"> <div class="card-body d-flex flex-column">
<div class="d-flex align-items-start justify-content-between gap-2 mb-2"> <div class="d-flex align-items-start justify-content-between gap-2 mb-2">
<h5 class="card-title mb-0">{{ z.nazwa }}</h5> <h5 class="card-title mb-0">{{ z.nazwa }}</h5>
{% if is_completed_view or progress_clamped >= 100 %} {% if z.typ_zbiorki == 'rezerwa' %}
<span class="badge bg-info">Rezerwa</span>
{% elif is_completed_view or progress_clamped >= 100 %}
<span class="badge rounded-pill" style="background: var(--accent); color:#111;">Zrealizowana</span> <span class="badge rounded-pill" style="background: var(--accent); color:#111;">Zrealizowana</span>
{% endif %} {% endif %}
</div> </div>
@@ -42,7 +43,7 @@ zbiórki{% endif %}{% endblock %}
<div class="mb-2 d-flex flex-wrap gap-2 justify-content-center"> <div class="mb-2 d-flex flex-wrap gap-2 justify-content-center">
{% if not z.ukryj_kwote %} {% if not z.ukryj_kwote %}
{% if z.cel > 0 %} {% if z.cel > 0 and z.typ_zbiorki != 'rezerwa' %}
<span class="badge bg-dark border" style="border-color: var(--border);"> <span class="badge bg-dark border" style="border-color: var(--border);">
Cel: {{ z.cel|round(2) }} PLN Cel: {{ z.cel|round(2) }} PLN
</span> </span>
@@ -51,14 +52,14 @@ zbiórki{% endif %}{% endblock %}
Stan: {{ z.stan|round(2) }} PLN Stan: {{ z.stan|round(2) }} PLN
</span> </span>
{% if z.cel > 0 %} {% if z.cel > 0 and z.typ_zbiorki != 'rezerwa' %}
{% set delta = z.cel - z.stan %} {% set delta = z.cel - z.stan %}
{% if delta > 0 %} {% if delta > 0 %}
<span class="badge bg-dark border border-warning"> <span class="badge bg-dark border border-warning">
Brakuje: {{ delta|round(2) }} PLN Brakuje: {{ delta|round(2) }} PLN
</span> </span>
{% elif delta < 0 %} <span class="badge bg-dark border" style="border-color: var(--border);"> {% elif delta < 0 %}
<span class="badge bg-dark border" style="border-color: var(--border);">
Nadwyżka: {{ (-delta)|round(2) }} PLN Nadwyżka: {{ (-delta)|round(2) }} PLN
</span> </span>
{% endif %} {% endif %}
@@ -68,6 +69,8 @@ zbiórki{% endif %}{% endblock %}
{% endif %} {% endif %}
</div> </div>
{# Progress bar TYLKO dla standardowych zbiórek (nie dla rezerwowych) #}
{% if z.typ_zbiorki != 'rezerwa' %}
<div class="mb-1"> <div class="mb-1">
<div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"
aria-valuenow="{{ progress_clamped|round(2) if not z.ukryj_kwote else '' }}" aria-valuenow="{{ progress_clamped|round(2) if not z.ukryj_kwote else '' }}"
@@ -81,9 +84,9 @@ zbiórki{% endif %}{% endblock %}
<small class="text-muted d-block text-center">Postęp ukryty</small> <small class="text-muted d-block text-center">Postęp ukryty</small>
{% endif %} {% endif %}
</div> </div>
{% endif %}
<div class="mt-auto pt-2"> <div class="mt-auto pt-2">
{# TO POWODUJE ZE BLOK JEST KLIKALNY #} {# TO POWODUJE ZE BLOK JEST KLIKALNY #}
<!-- <a href="{{ url_for('zbiorka', zbiorka_id=z.id) }}" class="stretched-link"></a> --> <!-- <a href="{{ url_for('zbiorka', zbiorka_id=z.id) }}" class="stretched-link"></a> -->
@@ -96,8 +99,8 @@ zbiórki{% endif %}{% endblock %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<div class="card"> <div class="card">