RunasSudo
/
ledger-pyreport
1
Fork 0
Code Issues Pull Requests Activity

Show posting comments in transation detail page

This commit is contained in:
RunasSudo 2020-05-08 23:35:04 +10:00
parent 456352c88f
commit 46e226fc0b
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ledger_pyreport/jinja2/transactions.html
View File

@ -67,12 +67,38 @@
{% endif %}
{% for transaction in transactions %}
{% set trn_url = '/transaction?' + {'tid': transaction.id, 'cash': 'on' if cash else ''}|urlencode %}
{% if transaction.has_comment_detail %}
<tr class="trn-first">
<td>{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.date.strftime('%Y-%m-%d') }}{% if transaction.id %}</a>{% endif %}</td>
<td>{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.description }}{% if transaction.id %}</a>{% endif %}</td>
<td></td>
{% if account %}
<td></td>
<td></td>
<td></td>
{% else %}
<td></td>
<td></td>
{% endif %}
</tr>
{% endif %}
{% for posting in transaction.postings if posting.account != account %}
{% set amount = posting.exchange(report_commodity, transaction.date) %}
{% set trn_url = '/transaction?' + {'tid': transaction.id, 'cash': 'on' if cash else ''}|urlencode %}
<tr{% if loop.first and loop.last %} class="trn-first trn-last"{% elif loop.first %} class="trn-first"{% elif loop.last %} class="trn-last"{% endif %}>
<td>{% if loop.first %}{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.date.strftime('%Y-%m-%d') }}{% if transaction.id %}</a>{% endif %}{% endif %}</td>
<td>{% if loop.first %}{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.description }}{% if transaction.id %}</a>{% endif %}{% endif %}</td>
{% set trn_first = not transaction.has_comment_detail and loop.first %}
{% set trn_last = loop.last %}
<tr{% if trn_first and trn_last %} class="trn-first trn-last"{% elif trn_first %} class="trn-first"{% elif trn_last %} class="trn-last"{% endif %}>
<td>{% if trn_first %}{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.date.strftime('%Y-%m-%d') }}{% if transaction.id %}</a>{% endif %}{% endif %}</td>
{% if trn_first %}
<td>{% if transaction.id %}<a href="{{ trn_url }}">{% endif %}{{ transaction.description }}{% if transaction.id %}</a>{% endif %}</td>
{% elif transaction.has_comment_detail and posting.comment %}
<td style="padding-left: 1.5em;">{{ posting.comment }}</td>
{% else %}
<td></td>
{% endif %}
<td><a href="/transactions?{{ {'date_end': date_end.strftime('%Y-%m-%d'), 'date_beg': date_beg.strftime('%Y-%m-%d'), 'account': posting.account.name, 'cash': 'on' if cash else ''}|urlencode }}">{{ (posting.account.name|e).__str__().replace(':', ':<wbr>')|safe }}</a></td>
{% if account %}
{# Reverse Dr/Cr so it's from the "perspective" of this account #}

4
ledger_pyreport/model.py
View File

@ -82,6 +82,10 @@ class Transaction:
for posting in self.postings:
result.append(' {} {}'.format(posting.account.name, posting.amount.tostr(False)))
return '\n'.join(result)
@property
def has_comment_detail(self):
return any(p.comment for p in self.postings)
class Posting:
class State(Enum):