From 1b7cc543f003cdda796d944ad9fcf8bb9747329b Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Tue, 18 Apr 2023 10:48:29 +0200
Subject: [PATCH] Update invoice table

---
 nummi/main/static/main/css/table.css          |  6 ++--
 nummi/main/templates/main/plot/category.html  |  2 +-
 nummi/main/templates/main/plot/history.html   |  2 +-
 nummi/main/templates/main/table/invoice.html  | 36 +++++++++++++++++++
 nummi/main/templates/main/table/snapshot.html |  2 +-
 .../templates/main/table/transaction.html     |  2 +-
 .../main/templates/main/transaction_form.html | 19 +---------
 7 files changed, 45 insertions(+), 24 deletions(-)
 create mode 100644 nummi/main/templates/main/table/invoice.html

diff --git a/nummi/main/static/main/css/table.css b/nummi/main/static/main/css/table.css
index 1b27340..c4d9c0f 100644
--- a/nummi/main/static/main/css/table.css
+++ b/nummi/main/static/main/css/table.css
@@ -1,12 +1,14 @@
 table {
 	border-collapse: collapse;
+}
+table.full-width {
 	width: 100%;
 }
 thead {
 	background: var(--bg-01);
 }
-col {width: 8rem}
-col.icon {width: 1ch}
+table.full-width col {width: 8rem}
+table col.icon {width: 1ch}
 tr {
 	border: .1rem solid var(--gray);
 	height: 2rem;
diff --git a/nummi/main/templates/main/plot/category.html b/nummi/main/templates/main/plot/category.html
index 8a15510..3f447b5 100644
--- a/nummi/main/templates/main/plot/category.html
+++ b/nummi/main/templates/main/plot/category.html
@@ -1,7 +1,7 @@
 {% load main_extras %}
 {% load i18n %}
 <div class="plot">
-    <table>
+    <table class="full-width">
         <colgroup>
             <col class="desc">
             <col class="icon">
diff --git a/nummi/main/templates/main/plot/history.html b/nummi/main/templates/main/plot/history.html
index 56da292..73c80d4 100644
--- a/nummi/main/templates/main/plot/history.html
+++ b/nummi/main/templates/main/plot/history.html
@@ -1,7 +1,7 @@
 {% load main_extras %}
 {% load i18n %}
 <div class="plot">
-    <table>
+    <table class="full-width">
         <colgroup>
             <col class="desc">
             <col class="value">
diff --git a/nummi/main/templates/main/table/invoice.html b/nummi/main/templates/main/table/invoice.html
new file mode 100644
index 0000000..482b3c8
--- /dev/null
+++ b/nummi/main/templates/main/table/invoice.html
@@ -0,0 +1,36 @@
+{% load main_extras %}
+{% load i18n %}
+<div id="invoices">
+    <table>
+        <colgroup>
+            <col class="desc" span="3">
+        </colgroup>
+        <thead>
+            <th>{% translate "Name" %}</th>
+            <th>{% translate "File" %}</th>
+            <th>{% translate "Delete" %}</th>
+        </thead>
+        <tbody>
+            {% for invoice in transaction.invoices %}
+                <tr>
+                    <th scope="row" class="l">
+                        <a href="{{ invoice.get_absolute_url }}">{{ invoice.name }}</a>
+                    </th>
+                    <td>
+                        <a href="{{ invoice.file.url }}">{% translate "File" %}</a>
+                    </td>
+                    <td>
+                        <a href="{{ invoice.get_delete_url }}">{% translate "Delete" %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="3">
+                        <a href="{% url "invoice" transaction.pk %}">{% translate "New invoice" %}</a>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+    </div>
diff --git a/nummi/main/templates/main/table/snapshot.html b/nummi/main/templates/main/table/snapshot.html
index de5cd50..c07e6bd 100644
--- a/nummi/main/templates/main/table/snapshot.html
+++ b/nummi/main/templates/main/table/snapshot.html
@@ -1,7 +1,7 @@
 {% load main_extras %}
 {% load i18n %}
 <div id="snapshots">
-    <table>
+    <table class="full-width">
         <colgroup>
             <col class="icon" span="2">
             <col class="date">
diff --git a/nummi/main/templates/main/table/transaction.html b/nummi/main/templates/main/table/transaction.html
index 7d7ac59..0f6a137 100644
--- a/nummi/main/templates/main/table/transaction.html
+++ b/nummi/main/templates/main/table/transaction.html
@@ -1,7 +1,7 @@
 {% load main_extras %}
 {% load i18n %}
 <div id="transactions">
-    <table>
+    <table class="full-width">
         <colgroup>
             <col class="icon">
             <col class="date">
diff --git a/nummi/main/templates/main/transaction_form.html b/nummi/main/templates/main/transaction_form.html
index 47a65b6..9fa3cb6 100644
--- a/nummi/main/templates/main/transaction_form.html
+++ b/nummi/main/templates/main/transaction_form.html
@@ -22,23 +22,6 @@
     {% endspaceless %}
     {% if not form.instance.adding %}
         <h2>{% translate "Invoices" %}</h2>
-        <div id="invoices" class="table col1-1-1">
-            <div class="header">
-                <strong class="attach center"><i class="fa fa-file"></i></strong>
-                <strong class="name">{% translate "Name" %}</strong>
-                <strong class="attach right"><i class="fa fa-trash-can"></i></strong>
-            </div>
-            {% for inv in transaction.invoices %}
-                <div class="invoice">
-                    <a href="{{ inv.file.url }}" class="center"><i class="fa-regular fa-file"></i></a>
-                    <a href="{{ inv.get_absolute_url }}">{{ inv.name }}</a>
-                    <a href="{{ inv.get_delete_url }}" class="right">{% translate "Delete" %}</a>
-                </div>
-            {% endfor %}
-            <div class="invoice new">
-                <span class="center"><i class="fa fa-file-circle-plus"></i></span>
-                <a href="{% url "invoice" transaction.pk %}">{% translate "New invoice" %}</a>
-            </div>
-        </div>
+        {% include "main/table/invoice.html" %}
     {% endif %}
 {% endblock %}