From 1fa0cff180d668a8d93d24413fe7832cdbd3e826 Mon Sep 17 00:00:00 2001
From: "A.Avenel" <avenel.alexandre@gmail.com>
Date: Sun, 7 Apr 2013 20:25:25 +0200
Subject: use "member.id" instead of "member"

---
 budget/templates/settle_bills.html | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 budget/templates/settle_bills.html

(limited to 'budget/templates/settle_bills.html')

diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html
new file mode 100644
index 0000000..309642a
--- /dev/null
+++ b/budget/templates/settle_bills.html
@@ -0,0 +1,46 @@
+{% extends "layout.html" %}
+
+{% block js %}
+    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
+{% endblock %}
+{% block navbar %}
+    <li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
+    <li class="active"><a href="{{ url_for(".settle_bills") }}">{{ _("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") }}" owers={{bill.owers|join(',','id')}} payer={{bill.payer.id}}>
+            <td>{{ bill.ower }}</td>
+            <td>{{ bill.payer }}</td>
+            <td>{{ "%0.2f"|format(bill.amount) }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    </table>
+
+{% endblock %}
-- 
cgit v1.1


From 0d7c82b12267ed3a9ece1ca72a71cea077e9cc0f Mon Sep 17 00:00:00 2001
From: "A.Avenel" <avenel.alexandre@gmail.com>
Date: Sun, 7 Apr 2013 22:14:32 +0200
Subject: More code cleanup for "settle bills"

---
 budget/templates/settle_bills.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'budget/templates/settle_bills.html')

diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html
index 309642a..e2041f5 100644
--- a/budget/templates/settle_bills.html
+++ b/budget/templates/settle_bills.html
@@ -34,9 +34,9 @@
         <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") }}" owers={{bill.owers|join(',','id')}} payer={{bill.payer.id}}>
+    <tr class="{{ loop.cycle("odd", "even") }}" receiver={{bill.receiver.id}}>
             <td>{{ bill.ower }}</td>
-            <td>{{ bill.payer }}</td>
+            <td>{{ bill.receiver }}</td>
             <td>{{ "%0.2f"|format(bill.amount) }}</td>
     </tr>
     {% endfor %}
-- 
cgit v1.1


From a0e94f3c116879301a2bef32fac30c232c18e386 Mon Sep 17 00:00:00 2001
From: "A.Avenel" <avenel.alexandre@gmail.com>
Date: Sun, 7 Apr 2013 23:01:32 +0200
Subject: bugfix : "Settle" link was not active on navbar.

---
 budget/templates/settle_bills.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'budget/templates/settle_bills.html')

diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html
index e2041f5..29d9b26 100644
--- a/budget/templates/settle_bills.html
+++ b/budget/templates/settle_bills.html
@@ -1,11 +1,8 @@
 {% extends "layout.html" %}
 
-{% block js %}
-    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
-{% endblock %}
 {% block navbar %}
-    <li><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li>
-    <li class="active"><a href="{{ url_for(".settle_bills") }}">{{ _("Settle") }}</a></li>
+<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 %}
-- 
cgit v1.1