From 79305f8a8f09a8fce10bc3a11584d6e4ed451f18 Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Mon, 23 Mar 2020 17:28:32 +1100
Subject: [PATCH] Tweak account transactions with commodities to remove
 redundancy, and show amount details on hover

---
 ledger_pyreport/__init__.py                   |  4 ++--
 .../jinja2/transactions_commodity.html        | 24 +++++++++----------
 ledger_pyreport/model.py                      |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ledger_pyreport/__init__.py b/ledger_pyreport/__init__.py
index 1077540..5d04126 100644
--- a/ledger_pyreport/__init__.py
+++ b/ledger_pyreport/__init__.py
@@ -189,8 +189,8 @@ def transactions_commodity():
 	account = l.get_account(account)
 	transactions = [t for t in l.transactions if t.date <= date and t.date >= pstart and any(p.account == account for p in t.postings)]
 	
-	opening_balance = accounting.trial_balance(l, pstart, pstart).get_balance(account)
-	closing_balance = accounting.trial_balance(l, date, pstart).get_balance(account)
+	opening_balance = accounting.trial_balance(l, pstart, pstart).get_balance(account).clean()
+	closing_balance = accounting.trial_balance(l, date, pstart).get_balance(account).clean()
 	
 	def matching_posting(transaction, amount):
 		return next((p for p in transaction.postings if p.account == account and p.amount.currency == amount.currency), None)
diff --git a/ledger_pyreport/jinja2/transactions_commodity.html b/ledger_pyreport/jinja2/transactions_commodity.html
index eb8c5fd..4e6074a 100644
--- a/ledger_pyreport/jinja2/transactions_commodity.html
+++ b/ledger_pyreport/jinja2/transactions_commodity.html
@@ -31,7 +31,7 @@
 			<th>Description</th>
 			<th class="h1" style="width: 1em;"></th>
 			<th class="h1" style="text-align: right; width: 5em;">Amount</th>
-			<th class="h1" style="width: 4em;"></th>
+			{#<th class="h1" style="width: 4em;"></th>#}
 			<th class="h1" style="text-align: right; width: 5em;">Balance</th>
 			<th class="h1" style="width: 4em;"></th>
 			<th class="h1" style="width: 1em;"></th>
@@ -43,11 +43,11 @@
 			<tr class="total">
 				<td>{% if loop.first %}<a href="{{ prevlink }}">{{ pstart.strftime('%Y-%m-%d') }}</a>{% endif %}</td>
 				<td>{% if loop.first %}<a href="{{ prevlink }}">Opening Balance</a>{% endif %}</td>
-				<td style="text-align: right;"></td>
 				<td></td>
+				{#<td></td>#}
 				<td></td>
-				<td style="text-align: right;"><a href="{{ prevlink }}">{{ amount|abs|bc }}</a></td>
-				<td><a href="{{ prevlink }}">{% if amount.currency.price %}{{ '{' + amount.currency.price|bc + '}' }}{% endif %}</a></td>
+				<td style="text-align: right;"><a href="{{ prevlink }}"><span title="{{ amount.tostr(False) }}">{{ amount|abs|bc }}</span></a></td>
+				<td>{% if amount.currency.price %}<span title="{{ amount.tostr(False) }}">{{ '{' + amount.currency.price|bc + '}' }}</span>{% endif %}</td>
 				<td>{% if amount >= 0 %}Dr{% else %}Cr{% endif %}</td>
 			</tr>
 		{% endfor %}
@@ -64,13 +64,13 @@
 					<td>{% if loop.first %}{{ transaction.description }}{% endif %}</td>
 					{% if posting %}
 						<td>{% if posting.amount >= 0 %}Dr{% else %}Cr{% endif %}</td>
-						<td style="text-align: right;">{{ posting.amount|abs|bc }}</td>
-						<td>{% if posting.amount.currency.price %}{{ '{' + posting.amount.currency.price|bc + '}' }}{% endif %}</td>
+						<td style="text-align: right;"><span title="{{ posting.amount.tostr(False) }}">{{ posting.amount|abs|bc }}</span></td>
+						{#<td>{% if posting.amount.currency.price %}{{ '{' + posting.amount.currency.price|bc + '}' }}{% endif %}</td>#}
 					{% else %}
-						<td colspan="3"></td>
+						<td colspan="2"></td>
 					{% endif %}
-					<td style="text-align: right;">{{ amount|abs|bc }}</td>
-					<td>{% if amount.currency.price %}{{ '{' + amount.currency.price|bc + '}' }}{% endif %}</td>
+					<td style="text-align: right;"><span title="{{ amount.tostr(False) }}">{{ amount|abs|bc }}</span></td>
+					<td>{% if amount.currency.price %}<span title="{{ amount.tostr(False) }}">{{ '{' + amount.currency.price|bc + '}' }}</span>{% endif %}</td>
 					<td>{% if amount >= 0 %}Dr{% else %}Cr{% endif %}</td>
 				</tr>
 			{% endfor %}
@@ -81,11 +81,11 @@
 			<tr class="total explicit-rules" style="{% if loop.first %}border-top: 1pt solid black;{% endif %}{% if loop.last %}border-bottom: 1pt solid black;{% endif %}">
 				<td>{% if loop.first %}{{ date.strftime('%Y-%m-%d') }}{% endif %}</td>
 				<td>{% if loop.first %}Closing Balance{% endif %}</td>
-				<td style="text-align: right;"></td>
 				<td></td>
+				{#<td></td>#}
 				<td></td>
-				<td style="text-align: right;">{{ amount|abs|bc }}</td>
-				<td>{% if amount.currency.price %}{{ '{' + amount.currency.price|bc + '}' }}{% endif %}</td>
+				<td style="text-align: right;"><span title="{{ amount.tostr(False) }}">{{ amount|abs|bc }}</span></td>
+				<td>{% if amount.currency.price %}<span title="{{ amount.tostr(False) }}">{{ '{' + amount.currency.price|bc + '}' }}</span>{% endif %}</td>
 				<td>{% if amount >= 0 %}Dr{% else %}Cr{% endif %}</td>
 			</tr>
 		{% endfor %}
diff --git a/ledger_pyreport/model.py b/ledger_pyreport/model.py
index e6aad20..10104cd 100644
--- a/ledger_pyreport/model.py
+++ b/ledger_pyreport/model.py
@@ -150,10 +150,10 @@ class Amount:
 		if self.currency.is_prefix:
 			amount_str = ('{}{:.2f}' if round else '{}{}').format(self.currency.name, self.amount)
 		else:
-			amount_str = ('{:.2f} {}' if round else '{:.2f} {}').format(self.amount, self.currency.name)
+			amount_str = ('{:.2f} {}' if round else '{} {}').format(self.amount, self.currency.name)
 		
 		if self.currency.price:
-			return '{} {{{}}}'.format(amount_str, self.currency.price)
+			return '{} {{{}}}'.format(amount_str, self.currency.price.tostr(round))
 		return amount_str
 	
 	def __repr__(self):