From 996f6a9f18f8c16baf5c79f720c0c872e865f0bf Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Wed, 21 Dec 2022 09:38:17 +0100
Subject: [PATCH] Add visibility on invoices Add links to invoices on
 transaction tables Added invoices and has_invoice properties to transactions

---
 nummi/main/models.py                                 |  8 ++++++++
 nummi/main/static/main/css/table.css                 |  1 +
 nummi/main/templates/main/tag/transaction_table.html | 10 +++++++++-
 nummi/main/templates/main/transaction.html           |  2 +-
 nummi/main/views.py                                  |  2 --
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nummi/main/models.py b/nummi/main/models.py
index 664cc09..7238625 100644
--- a/nummi/main/models.py
+++ b/nummi/main/models.py
@@ -59,6 +59,14 @@ class Transaction(models.Model):
     def __str__(self):
         return f"{self.date} – {self.name}"
 
+    @property
+    def invoices(self):
+        return Invoice.objects.filter(transaction=self)
+
+    @property
+    def has_invoice(self):
+        return self.invoices.count() > 0
+
     class Meta:
         ordering = ["-date"]
         verbose_name = _("Transaction")
diff --git a/nummi/main/static/main/css/table.css b/nummi/main/static/main/css/table.css
index e649e9a..bfed8a7 100644
--- a/nummi/main/static/main/css/table.css
+++ b/nummi/main/static/main/css/table.css
@@ -11,6 +11,7 @@
 .table.col4 {grid-template-columns: repeat(4, auto)}
 .table.col5 {grid-template-columns: repeat(5, auto)}
 .table.col6 {grid-template-columns: repeat(6, auto)}
+.table.col1-6 {grid-template-columns: min-content repeat(6, auto)}
 
 .table > div {
 	display: contents;
diff --git a/nummi/main/templates/main/tag/transaction_table.html b/nummi/main/templates/main/tag/transaction_table.html
index d4a0622..b27e993 100644
--- a/nummi/main/templates/main/tag/transaction_table.html
+++ b/nummi/main/templates/main/tag/transaction_table.html
@@ -1,8 +1,9 @@
 {% load main_extras %}
 {% load i18n %}
 
-<div id="transactions" class="table col6">
+<div id="transactions" class="table col1-6">
 	<div class="header">
+		<strong class="attach center"><i class="fa fa-paperclip"></i></strong>
 		<strong class="date center">{% translate "Date" %}</strong>
 		<strong class="name">{% translate "Name" %}</strong>
 		<strong class="value center">{% translate "Value" %}</strong>
@@ -12,6 +13,13 @@
 	</div>
 	{% for trans in transactions %}
 		<div class="transaction {% cycle 'w' 'g' %}">
+			<span class="attach center">
+				{% for invoice in trans.invoices %}
+				<a href="{% url "invoice" invoice.id %}">
+					<i class="fa fa-paperclip"></i>
+				</a>
+				{% endfor %}
+			</span>
 			<span class="date num center">{{ trans.date|date:"Y-m-d" }}</span>
 			<span class="name text"><a href="{% url 'transaction' trans.id %}">{{ trans.name }}</a></span>
 			<span class="value num right">{{ trans.value|pmvalue }}</span>
diff --git a/nummi/main/templates/main/transaction.html b/nummi/main/templates/main/transaction.html
index b9666e8..bae7974 100644
--- a/nummi/main/templates/main/transaction.html
+++ b/nummi/main/templates/main/transaction.html
@@ -22,7 +22,7 @@
 
 <h2>{% translate "Invoices" %}</h2>
 <div id="invoices">
-	{% for inv in invoices %}
+	{% for inv in transaction.invoices %}
 		<div class="invoice">
 			<a href="{% url 'invoice' inv.id %}">{{ inv.name }}</a>
 			<a href="{% url 'del_invoice' transaction.id inv.id %}"
diff --git a/nummi/main/views.py b/nummi/main/views.py
index a98d658..6b7e622 100644
--- a/nummi/main/views.py
+++ b/nummi/main/views.py
@@ -53,7 +53,6 @@ class TransactionListView(LoginRequiredMixin, ListView):
 def transaction(request, uuid=None):
     _form = None
     _inv_form = None
-    _invoices = []
     if request.method == "GET":
         if uuid is None:
             _transaction = Transaction()
@@ -79,7 +78,6 @@ def transaction(request, uuid=None):
         {
             "transaction": _transaction,
             "form": _form or TransactionForm(instance=_transaction),
-            "invoices": _invoices or Invoice.objects.filter(transaction=_transaction),
             "invoice_form": _inv_form
             or InvoiceForm(instance=Invoice(transaction=_transaction)),
         },