zmiany ux i kodowe

templates/admin/dodaj_wplate.html

@@ -14,11 +14,26 @@
       <h3 class="card-title mb-0">Dodaj wpłatę: <span class="fw-semibold">{{ zbiorka.nazwa }}</span></h3>
       <div class="d-flex align-items-center gap-2">
         {% if zbiorka.cel %}
-        <span class="badge bg-dark border" style="border-color: var(--border);">Cel: {{ zbiorka.cel|round(2) }}
-          PLN</span>
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Cel: {{ zbiorka.cel|round(2) }} PLN
+        </span>
+        {% endif %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Stan: {{ zbiorka.stan|round(2) }} PLN
+        </span>
+
+        {% if zbiorka.cel and zbiorka.cel > 0 %}
+        {% set delta = zbiorka.cel - zbiorka.stan %}
+        {% if delta > 0 %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Brakuje: {{ delta|round(2) }} PLN
+        </span>
+        {% else %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Nadwyżka: {{ (-delta)|round(2) }} PLN
+        </span>
+        {% endif %}
         {% endif %}
-        <span class="badge bg-dark border" style="border-color: var(--border);">Stan: {{ zbiorka.stan|round(2) }}
-          PLN</span>
       </div>
     </div>
 
@@ -82,5 +97,5 @@
 {% endblock %}
 {% block extra_scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='js/dodaj_wplate.js') }}"></script>
+<script src="{{ url_for('static', filename='js/dodaj_wplate.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}

templates/admin/dodaj_wydatek.html

@@ -13,14 +13,30 @@
         <div
             class="card-header bg-secondary text-white d-flex flex-wrap align-items-center justify-content-between gap-2">
             <h3 class="card-title mb-0">Dodaj wydatek: <span class="fw-semibold">{{ zbiorka.nazwa }}</span></h3>
-            <div class="d-flex align-items-center gap-2">
-                {% if zbiorka.cel %}
-                <span class="badge bg-dark border" style="border-color: var(--border);">Cel: {{ zbiorka.cel|round(2) }}
-                    PLN</span>
+            <div class="d-flex align-items-center flex-wrap gap-2">
+                {% if has_cel %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Cel: {{ zbiorka.cel|round(2) }} PLN
+                </span>
+                {% endif %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Obecnie: {{ zbiorka.stan|round(2) }} PLN
+                </span>
+
+                {% if has_cel %}
+                {% set delta = zbiorka.cel - zbiorka.stan %}
+                {% if delta > 0 %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Brakuje: {{ delta|round(2) }} PLN
+                </span>
+                {% else %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Nadwyżka: {{ (-delta)|round(2) }} PLN
+                </span>
+                {% endif %}
                 {% endif %}
-                <span class="badge bg-dark border" style="border-color: var(--border);">Stan: {{ zbiorka.stan|round(2)
-                    }} PLN</span>
             </div>
+
         </div>
 
         <div class="card-body">
@@ -59,5 +75,5 @@
 
 {% block extra_scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='js/dodaj_wydatek.js') }}"></script>
+<script src="{{ url_for('static', filename='js/dodaj_wydatek.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}

templates/admin/edytuj_stan.html

@@ -20,11 +20,26 @@
       <h3 class="card-title mb-0">Edytuj stan: <span class="fw-semibold">{{ zbiorka.nazwa }}</span></h3>
       <div class="d-flex align-items-center flex-wrap gap-2">
         {% if has_cel %}
-        <span class="badge bg-dark border" style="border-color: var(--border);">Cel: {{ zbiorka.cel|round(2) }}
-          PLN</span>
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Cel: {{ zbiorka.cel|round(2) }} PLN
+        </span>
+        {% endif %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Obecnie: {{ zbiorka.stan|round(2) }} PLN
+        </span>
+
+        {% if has_cel %}
+        {% set delta = zbiorka.cel - zbiorka.stan %}
+        {% if delta > 0 %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Brakuje: {{ delta|round(2) }} PLN
+        </span>
+        {% else %}
+        <span class="badge bg-dark border" style="border-color: var(--border);">
+          Nadwyżka: {{ (-delta)|round(2) }} PLN
+        </span>
+        {% endif %}
         {% endif %}
-        <span class="badge bg-dark border" style="border-color: var(--border);">Obecnie: {{ zbiorka.stan|round(2) }}
-          PLN</span>
       </div>
     </div>
 
@@ -124,5 +139,5 @@
 
 {% block extra_scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='js/edytuj_stan.js') }}"></script>
+<script src="{{ url_for('static', filename='js/edytuj_stan.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}

templates/admin/formularz_zbiorek.html

@@ -37,15 +37,35 @@
                     Cel: {{ zbiorka.cel|round(2) }} PLN
                 </span>
                 {% endif %}
-                {% if zbiorka.ukryj_kwote %}
-                <span class="badge bg-secondary">Kwoty ukryte</span>
-                {% else %}
-                <span class="badge bg-success">Kwoty widoczne</span>
-                {% endif %}
+
+                {% if not zbiorka.ukryj_kwote %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Stan: {{ zbiorka.stan|round(2) }} PLN
+                </span>
+
+                {% if zbiorka.cel %}
+                {% set delta = zbiorka.cel - zbiorka.stan %}
+                {% if delta > 0 %}
+                <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Brakuje: {{ delta|round(2) }} PLN
+                </span>
+                {% elif delta < 0 %} <span class="badge bg-dark border" style="border-color: var(--border);">
+                    Nadwyżka: {{ (-delta)|round(2) }} PLN
+                    </span>
+                    {% endif %}
+                    {% endif %}
+                    {% endif %}
+
+                    {% if zbiorka.ukryj_kwote %}
+                    <span class="badge bg-secondary">Kwoty niepubliczne</span>
+                    {% else %}
+                    <span class="badge bg-success">Kwoty widoczne</span>
+                    {% endif %}
             </div>
             {% else %}
             <small class="opacity-75">Uzupełnij podstawowe dane i dane płatności</small>
             {% endif %}
+
         </div>
 
         <div class="card-body">
@@ -82,10 +102,10 @@
 
                 <!-- SEKCJA: Lista produktów -->
                 <div class="mb-4">
-                    <h6 class="text-muted mb-2">Lista produktów</h6>
+                    <h6 class="text-muted mb-2">Lista produktów / Pozycje / Cele</h6>
                     <p class="text-muted small mb-3">
                         Wypunktuj dokładnie produkty do zakupu — podaj nazwę, opcjonalny link do sklepu i cenę.
-                        Status domyślnie <em>Do kupienia</em>; przełącz na <em>Kupione</em> po realizacji.
+                        Status domyślnie <code>Do kupienia</code>; przełącz na <code>Kupione</code> po realizacji.
                     </p>
 
                     <div class="table-responsive">
@@ -221,7 +241,6 @@
                 <div class="mb-4">
                     <h6 class="text-muted mb-2">Cel i widoczność</h6>
 
-                    {# === BOX: zgodność sumy produktów z celem === #}
                     <div id="celSyncBox" class="alert d-none py-2 px-3 mb-3" role="alert">
                         <div class="d-flex flex-wrap align-items-center justify-content-between gap-2">
                             <div id="celSyncMsg" class="small"></div>
@@ -268,8 +287,8 @@
 {% block extra_scripts %}
 {{ super() }}
 <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
-<script src="{{ url_for('static', filename='js/mde_custom.js') }}"></script>
-<script src="{{ url_for('static', filename='js/formularz_zbiorek.js') }}"></script>
-<script src="{{ url_for('static', filename='js/produkty_formularz.js') }}"></script>
-<script src="{{ url_for('static', filename='js/kwoty_formularz.js') }}"></script>
+<script src="{{ url_for('static', filename='js/mde_custom.js') }}?v={{ APP_VERSION }}"></script>
+<script src="{{ url_for('static', filename='js/formularz_zbiorek.js') }}?v={{ APP_VERSION }}"></script>
+<script src="{{ url_for('static', filename='js/produkty_formularz.js') }}?v={{ APP_VERSION }}"></script>
+<script src="{{ url_for('static', filename='js/kwoty_formularz.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}

templates/admin/transakcje.html

@@ -139,5 +139,5 @@
 
 {% block extra_scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='js/transakcje.js') }}"></script>
+<script src="{{ url_for('static', filename='js/transakcje.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}

templates/admin/ustawienia.html

@@ -162,5 +162,5 @@
 
 {% block extra_scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='js/ustawienia.js') }}"></script>
+<script src="{{ url_for('static', filename='js/ustawienia.js') }}?v={{ APP_VERSION }}"></script>
 {% endblock %}