Merge b6cfeecf69 into 05742347c3

UI/navigation changes to in "Edit this participant" (#1323 )
* Update forms.html Added navigation element in 'Edit Participants' window * Update forms.html Updated button on form for editing participants--"Save" for edits instead of "Add."
2025-05-16 09:21:48 +02:00 · 2025-01-05 15:49:25 +01:00 · 2025-01-05 15:49:20 +01:00 · 2025-01-05 13:01:16 +01:00 · 2025-01-05 13:00:54 +01:00 · 2024-12-23 20:27:47 +00:00
3 changed files with 5 additions and 4 deletions
--- a/ihatemoney/templates/forms.html
+++ b/ihatemoney/templates/forms.html
@ -236,7 +236,8 @@
    {{ input(form.weight) }}
    </fieldset>
    <div class="actions">
-        {{ form.submit(class="btn btn-primary") }}
+        <button class="btn btn-secondary input-group-addon" type="submit">{{ _("Save") }}</button>
+        <a href="{{ url_for(".list_bills") }}" class="btn btn-outline-secondary"> {{_("Cancel") }} </a>
    </div>
 {% endmacro %}

--- a/ihatemoney/templates/sidebar_table_layout.html
+++ b/ihatemoney/templates/sidebar_table_layout.html
@ -11,7 +11,7 @@
        </tr>
      </thead>
    {%- endif %}
-    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %}
+    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2)|abs > 0.01 %}
      <tr id="bal-member-{{ member.id }}" action="{% if member.activated %}delete{% else %}reactivate{% endif %}">
        <td class="balance-name">{{ member.name }}
          {%- if show_weight -%}
@ -61,4 +61,4 @@
 {% endblock %}

 {# It must be set outside of the block definition #}
-{% set messages_shown = True %}
+{% set messages_shown = True %}
--- a/pyproject.toml
+++ b/pyproject.toml
@ -44,7 +44,7 @@ dependencies = [
    "python-dateutil",
    "qrcode>=7.1,<9",
    "requests>=2.25,<3",
-    "SQLAlchemy>=1.3.0,<1.5",
+    "SQLAlchemy>=1.3.0,<2.1",
    "SQLAlchemy-Continuum>=1.3.12,<2", # New 1.4 changes API, see #728
    "Werkzeug>=2,<3",
    "WTForms>=2.3.3,<3.3",]
Author	SHA1	Message	Date
dependabot[bot]	ff85f65113	Merge `b6cfeecf69` into `05742347c3`	2025-01-05 15:49:25 +01:00
singeltary	05742347c3	UI/navigation changes to in "Edit this participant" (#1323 ) Some checks are pending CI / lint (push) Waiting to run Details CI / test (mariadb, minimal, 3.11) (push) Blocked by required conditions Details CI / test (mariadb, normal, 3.11) (push) Blocked by required conditions Details CI / test (mariadb, normal, 3.9) (push) Blocked by required conditions Details CI / test (postgresql, minimal, 3.11) (push) Blocked by required conditions Details CI / test (postgresql, normal, 3.11) (push) Blocked by required conditions Details CI / test (postgresql, normal, 3.9) (push) Blocked by required conditions Details CI / test (sqlite, minimal, 3.10) (push) Blocked by required conditions Details CI / test (sqlite, minimal, 3.11) (push) Blocked by required conditions Details CI / test (sqlite, minimal, 3.12) (push) Blocked by required conditions Details CI / test (sqlite, minimal, 3.9) (push) Blocked by required conditions Details CI / test (sqlite, normal, 3.10) (push) Blocked by required conditions Details CI / test (sqlite, normal, 3.11) (push) Blocked by required conditions Details CI / test (sqlite, normal, 3.12) (push) Blocked by required conditions Details CI / test (sqlite, normal, 3.9) (push) Blocked by required conditions Details CI / docs (push) Waiting to run Details Docker build / test (push) Waiting to run Details Docker build / build_upload (push) Blocked by required conditions Details * Update forms.html Added navigation element in 'Edit Participants' window * Update forms.html Updated button on form for editing participants--"Save" for edits instead of "Add."	2025-01-05 15:49:20 +01:00
Alexis Métaireau	bd689f931a	Merge branch 'fix-1336'	2025-01-05 13:01:16 +01:00
Alexis Métaireau	67938eabbc	Do not display deactivated users when their balance is really small Cases has been reported of rounding issues making deactivated users reapparing. This is due to the fact we're using floats (see #528 for details) Fixes #1336	2025-01-05 13:00:54 +01:00
dependabot[bot]	b6cfeecf69	Update sqlalchemy requirement from <1.5,>=1.3.0 to >=1.3.0,<2.1 --- updated-dependencies: - dependency-name: sqlalchemy dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-23 20:27:47 +00:00