Merge pull request #96 from aavenel/master

New feature : Settle the bill

3 files changed, 47 insertions, 1 deletions

diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index 8e6d3b2..543bcb3 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -41,7 +41,10 @@
             <h1><a class="brand" href="{{ url_for(".home") }}">#! money?</a></h1>
             {% if g.project %}
             <ul class="nav primary-nav">
+                {% block navbar %}
                 <li class="active"><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+                <li><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
+                {% endblock %}
             </ul>
             {% endif %}
             <ul class="nav pull-right secondary-nav">
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 389e73f..ee97624 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -73,7 +73,7 @@
             <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST">
                 <button type="submit">{{ _("reactivate") }}</button></form></td>
         {% endif %}
-        <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
+        <td class="balance-value {% if balance[member] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
             {% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }}
         </td>
     </tr>
diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html
new file mode 100644
index 0000000..29d9b26
--- /dev/null
+++ b/budget/templates/settle_bills.html
@@ -0,0 +1,43 @@
+{% extends "layout.html" %}
+
+{% block navbar %}
+<li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+<li class="active"><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li>
+{% endblock %}
+
+{% block sidebar %}
+<div id="sidebar" class="sidebar">
+
+    <div id="table_overflow">
+    <table class="balance table">
+    {% set balance = g.project.balance %}
+    {% for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id] != 0 %}
+    <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}>
+        <td class="balance-name">{{ member.name }}</td>
+        <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}">
+            {% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }}
+        </td>
+    </tr>
+    {% endfor %}
+    </table>
+    </div>
+
+</div>
+{% endblock %}
+
+
+{% block content %}
+    <table id="bill_table" class="split_bills table table-striped">
+        <thead><tr><th>{{ _("Who pays?") }}</th><th>{{ _("To whom?") }}</th><th>{{ _("How much?") }}</th></tr></thead>
+    <tbody>
+    {% for bill in bills %}
+    <tr class="{{ loop.cycle("odd", "even") }}" receiver={{bill.receiver.id}}>
+            <td>{{ bill.ower }}</td>
+            <td>{{ bill.receiver }}</td>
+            <td>{{ "%0.2f"|format(bill.amount) }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    </table>
+
+{% endblock %}