diff --git a/ihatemoney/templates/history.html b/ihatemoney/templates/history.html index 9cf66a77..d9f2b4d2 100644 --- a/ihatemoney/templates/history.html +++ b/ihatemoney/templates/history.html @@ -98,23 +98,7 @@ {% block sidebar %}
- - - - - - - - {% set balance = g.project.balance %} - {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %} - - - - - {% endfor %} -
{{ _("Who?") }}{{ _("Balance") }}
{{ member.name }} - {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} -
+ {{ balance_table(show_weight=False, show_header=True) }}
{% endblock %} diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html index 7ae3bd67..1f4235bb 100644 --- a/ihatemoney/templates/list_bills.html +++ b/ihatemoney/templates/list_bills.html @@ -45,31 +45,7 @@
- - {% set balance = g.project.balance %} - {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %} - - - {% if member.activated %} - - {% else %} - - {% endif %} - - - {% endfor %} -
{{ member.name }} - (x{{ member.weight|minimal_round(1) }}) - -
-
-
-
-
-
-
- {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} -
+ {{ balance_table(member_edit=True) }}
diff --git a/ihatemoney/templates/settle_bills.html b/ihatemoney/templates/settle_bills.html index 30f64d03..a9b0dbc2 100644 --- a/ihatemoney/templates/settle_bills.html +++ b/ihatemoney/templates/settle_bills.html @@ -2,17 +2,7 @@ {% block sidebar %}
- - {% set balance = g.project.balance %} - {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %} - - - - - {% endfor %} -
{{ member.name }} - {% if balance[member.id]|round(2) > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} -
+ {{ balance_table(show_weight=False) }}
{% endblock %} diff --git a/ihatemoney/templates/sidebar_table_layout.html b/ihatemoney/templates/sidebar_table_layout.html index 9d588a31..d616e684 100644 --- a/ihatemoney/templates/sidebar_table_layout.html +++ b/ihatemoney/templates/sidebar_table_layout.html @@ -1,5 +1,49 @@ {% extends "layout.html" %} +{% macro balance_table(show_weight = True, show_header = False, member_edit = False) %} + + {%- set balance = g.project.balance %} + {%- if show_header %} + + + + + + + {%- endif %} + {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %} + + + {%- if member_edit %} + {%- if member.activated %} + + {%- else %} + + {%- endif %} + {%- endif %} + + + {%- endfor %} +
{{ _("Who?") }}{{ _("Balance") }}
{{ member.name }} + {%- if show_weight -%} + (x{{ member.weight|minimal_round(1) }}) + {%- endif -%} + +
+ +
+
+ +
+
+
+ +
+
+ {% if balance[member.id] | round(2) > 0 %}+{% endif %}{{ balance[member.id]|currencyformat_nc(g.project.default_currency) }} +
+{% endmacro %} + {% block body %}