${self.title()}

@@ -16,21 +15,44 @@ % endfor

${h.link_to('Dashboard', h.url_for(controller='status', - action='index', - id=None))}
${h.link_to('Expense', h.url_for(controller='spend', - action='index', - id=None))}
${h.link_to('Transfer', h.url_for(controller='transfer', - action='index', - id=None))}
${h.link_to('History', h.url_for(controller='history', - action='index', - id=None))}

+ + + + + + + + +

+ % if c.title: + ${c.title} + % else: + BlueChips + % endif +

+ +

+ Dashboard + +

+ +

+ Expense + +

+ +

+ Transfer + +

+ +

+ History + +

${next.body()} @@ -44,50 +66,62 @@ % endif +<%def name="formatUser(user)"> + % if user.username == request.environ['REMOTE_USER']: + ${user.name} + % else: + ${user.name} + % endif + + <%def name="listExpenditures(es)"> - +

- - - - - + + + + + % for e in es: - - - - - - - + + + + + + + % endfor -

Date	Spender	Description	Amount		Date	Spender	Description	Amount
${e.date}	${e.spender.name}	${e.description}	${e.amount}	${h.link_to('Edit', h.url_for(controller='spend', - action='edit', - id=e.id))}
${e.date}	${formatUser(e.spender)}	${e.description}	${e.amount}	${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))}

+ <%def name="listTransfers(ts)"> - +

- - - - - - + + + + + + % for t in ts: - - - - - - - - + + + + + + + + % endfor -

Date	From	To	Description	Amount		Date	From	To	Description	Amount
${t.date}	${t.debtor.name}	${t.creditor.name}	${t.description}	${t.amount}	${h.link_to('Edit', h.url_for(controller='transfer', - action='edit', - id=t.id))}
${t.date}	${formatUser(t.debtor)}	${formatUser(t.creditor)}	${t.description}	${t.amount}	${h.link_to('Edit', h.url_for(controller='transfer', action='edit', id=t.id))}

+ + + +<%def name="expenditureIcon()"> +←→ + + +<%def name="transferIcon()"> +$→$ diff --git a/bluechips/templates/spend/split.mako b/bluechips/templates/spend/split.mako index 41568e5..8dba9cc 100644 --- a/bluechips/templates/spend/split.mako +++ b/bluechips/templates/spend/split.mako @@ -23,29 +23,36 @@ ${c.expenditure.spender.name} on ${c.expenditure.date}, described as ${h.form('', method='post')}

- ${user.name} - ${h.text(name, value=percent, class_="textfield required", id=name)} - % if name in c.errors: - ${c.errors[name]} - % endif -
- ${h.submit(None, 'Submit', class_="submitbutton")} -

Settling Transfers

-% if len(c.settle) == 0: -

No need! The books are balanced!

-% else: -

To balance the books, the following transfers need to be made:

+ % if len(c.settle) == 0: +

No need! The books are balanced!

+ % else: +

To balance the books, the following transfers need to be made:

+ ${user.name} +	+ ${h.text(name, value=percent, class_="textfield required", id=name)} + % if name in c.errors: + ${c.errors[name]} + % endif +
	+ ${h.submit(None, 'Submit', class_="submitbutton")} +

From	To	Amount
${transfer[0].username}	${transfer[1].username}	${transfer[2]}

Totals

- +

- - + + - - + + - - + + - - + + - - + + -

Total	${c.total}	Total	${c.total}
Past year	${c.year_total}	Past year	${c.year_total}
Year to date	${c.this_year_total}	Year to date	${c.this_year_total}
Month to date	${c.this_month_total}	Month to date	${c.this_month_total}
Last month	${c.last_month_total}	Last month	${c.last_month_total}

+ +

Add a new transaction

${h.link_to('Expenditure for the group', h.url_for(controller='spend', action='index'))}
${h.link_to('Transfer between two people', h.url_for(controller='transfer', action='index'))}

Your History

-${h.link_to('See all history', h.url_for(controller='history', - action='index'))} + ${h.link_to('See all history', h.url_for(controller='history', action='index'))} -

Expenditures

-${self.listExpenditures(c.expenditures)} + ${self.listExpenditures(c.expenditures)} -

Transfers

-${self.listTransfers(c.transfers)} + ${self.listTransfers(c.transfers)} +

diff --git a/bluechips/widgets/spend.py b/bluechips/widgets/spend.py index 0f8bb78..50ce3c5 100644 --- a/bluechips/widgets/spend.py +++ b/bluechips/widgets/spend.py @@ -5,7 +5,7 @@ from tw.forms import validators from bluechips.widgets import * -class NewSpendForm(forms.ListForm): +class NewSpendForm(forms.TableForm): class fields(WidgetsList): spender = UserSelect() amount = AmountField() diff --git a/bluechips/widgets/transfer.py b/bluechips/widgets/transfer.py index 69886ad..85f300d 100644 --- a/bluechips/widgets/transfer.py +++ b/bluechips/widgets/transfer.py @@ -5,7 +5,7 @@ from tw.forms import validators from bluechips.widgets import * -class NewTransferForm(forms.ListForm): +class NewTransferForm(forms.TableForm): class fields(WidgetsList): debtor = UserSelect() creditor = UserSelect()