diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | budget/templates/add_bill.html | 4 | ||||
| -rw-r--r-- | budget/templates/home.html | 4 | ||||
| -rw-r--r-- | budget/templates/list_bills.html | 10 | ||||
| -rw-r--r-- | budget/utils.py | 2 | ||||
| -rw-r--r-- | budget/web.py | 1 |
6 files changed, 18 insertions, 6 deletions
@@ -1,2 +1,3 @@ * Find a way to make the couple (name, project) unique. -* use a psql backend rather than sqlite +* Use a psql backend rather than sqlite +* If the members list of a project is empty, propose the user to define the members diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html index 9b13b2e..8dec74c 100644 --- a/budget/templates/add_bill.html +++ b/budget/templates/add_bill.html @@ -1,5 +1,9 @@ {% extends "layout.html" %} +{% block top_menu %} +<a href="{{ url_for('list_bills', project_id=project.id) }}">Back to the list</a> +{% endblock %} + {% block content %} <h2>Let's add a bill</h2> diff --git a/budget/templates/home.html b/budget/templates/home.html index 5fcdf90..6fd955a 100644 --- a/budget/templates/home.html +++ b/budget/templates/home.html @@ -3,7 +3,7 @@ {% block content %} <h2>Welcome on the budget manager</h2> -<form action="{{ url_for('authenticate') }}" method="post" accept-charset="utf-8"> +<form action="{{ url_for('authenticate') }}" method="post" accept-charset="utf-8" style="float:left; width: 50%;"> <h3>Log to an existing project...</h3> {{ auth_form.hidden_tag() }} @@ -13,7 +13,7 @@ <p>{{ auth_form.submit }}</p> </form> -<form action="{{ url_for('create_project') }}" method="post" class="container span-24 add-bill"> +<form action="{{ url_for('create_project') }}" method="post" class="container span-24 add-bill" style="float:right; width: 50%;"> <h3>...or create a new project</h3> {{ project_form.hidden_tag() }} diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index 145f4f4..6d4807b 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -1,4 +1,12 @@ {% extends "layout.html" %} + +{% block top_menu %} +<ul> + <li><a href="{{ url_for('add_bill', project_id=project.id) }}">Add a bill</a></li> + <li><a href="{{ url_for('add_member', project_id=project.id) }}">Add a member</a></li> +</ul> +{% endblock %} + {% block content %} <div id="leftmenu" class="span-6"> <ul> @@ -7,7 +15,7 @@ {% endfor %} </ul> {% set form=member_form %} - {% include "member_form.html" %} + {#% include "member_form.html" %#} </div> <div id="content" class="span-18 last"> {% if bills.count() > 0 %} diff --git a/budget/utils.py b/budget/utils.py index f3f0458..a5f1474 100644 --- a/budget/utils.py +++ b/budget/utils.py @@ -7,7 +7,7 @@ from forms import BillForm def get_billform_for(project_id): """Return an instance of BillForm configured for a particular project.""" form = BillForm() - payers = [(m.id, m.name) for m in Project.query.get("blah").members] + payers = [(m.id, m.name) for m in Project.query.get(project_id).members] form.payed_for.choices = form.payer.choices = payers return form diff --git a/budget/web.py b/budget/web.py index 2147359..f8ede3c 100644 --- a/budget/web.py +++ b/budget/web.py @@ -100,7 +100,6 @@ def add_member(project): @app.route("/<string:project_id>/add", methods=["GET", "POST"]) @requires_auth def add_bill(project): - # FIXME: make it work. form = get_billform_for(project.id) if request.method == 'POST': if form.validate(): |