From 7356d02adad8794eedb1b5683dc1e255fa1f9732 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Thu, 29 Dec 2022 19:54:15 +0100
Subject: [PATCH] Add account column to tables

---
 nummi/main/static/main/css/index.css          |  6 ++++--
 nummi/main/static/main/css/table.css          |  1 +
 nummi/main/templates/main/base.html           |  5 +++++
 nummi/main/templates/main/index.html          | 21 ++++++++++++++++++-
 .../templates/main/tag/transaction_table.html | 11 +++++++++-
 nummi/main/views.py                           |  1 +
 6 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/nummi/main/static/main/css/index.css b/nummi/main/static/main/css/index.css
index 712c4ac..f900910 100644
--- a/nummi/main/static/main/css/index.css
+++ b/nummi/main/static/main/css/index.css
@@ -12,10 +12,12 @@ h1 img {
 	margin-right: var(--gap);
 }
 
-#categories > a {
+#categories > a,
+#accounts > a {
 	display: inline-block;
 	padding: 1em;
 }
-#categories > a > i {
+#categories > a > i,
+#accounts > a > i {
 	margin-right: .5rem;
 }
diff --git a/nummi/main/static/main/css/table.css b/nummi/main/static/main/css/table.css
index edec06e..358ac2b 100644
--- a/nummi/main/static/main/css/table.css
+++ b/nummi/main/static/main/css/table.css
@@ -14,6 +14,7 @@
 .table.col1-1-1 {grid-template-columns: min-content auto min-content}
 .table.col1-5 {grid-template-columns: min-content repeat(5, auto)}
 .table.col1-6 {grid-template-columns: min-content repeat(6, auto)}
+.table.col1-7 {grid-template-columns: min-content repeat(7, auto)}
 
 .table > div {
 	display: contents;
diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html
index afa55f6..0af4e63 100644
--- a/nummi/main/templates/main/base.html
+++ b/nummi/main/templates/main/base.html
@@ -33,6 +33,11 @@
                         <img src="{% static 'main/svg/logo.svg' %}" alt="" />
                         <h1>Nummi</h1>
                     </a>
+                    <a href="{% url 'account' %}"
+                       class="{% if request.resolver_match.url_name == 'account' %}cur{% endif %}"
+                       accesskey="n">
+                        {% translate "Account" %}
+                    </a>
                     <a href="{% url 'transaction' %}"
                        class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}"
                        accesskey="n">
diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html
index d7c9053..c4e5c84 100644
--- a/nummi/main/templates/main/index.html
+++ b/nummi/main/templates/main/index.html
@@ -12,6 +12,16 @@
           type="text/css"/>
 {% endblock %}
 {% block body %}
+    {% if accounts %}
+        <h2>{% translate "Accounts" %}</h2>
+        {% spaceless %}
+            <div id="accounts">
+                {% for acc in accounts %}
+                    <a href="{% url 'account' acc.id %}"><i class="fa fa-{{ acc.icon }}"></i>{{ acc }}</a>
+                {% endfor %}
+            </div>
+        {% endspaceless %}
+    {% endif %}
     {% if transactions %}
         <h2>
             {% translate "Transactions" %}
@@ -33,10 +43,11 @@
     {% endif %}
     {% if snapshots %}
         <h2>{% translate "Snapshots" %}</h2>
-        <div id="snapshots" class="table col1-5">
+        <div id="snapshots" 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="account center">{% translate "Account" %}</strong>
                 <strong class="value center">{% translate "Value" %}</strong>
                 <strong class="diff center">{% translate "Difference" %}</strong>
                 <strong class="diff center">{% translate "Transactions" %}</strong>
@@ -54,6 +65,14 @@
                     <span class="date num center">
                         <a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a>
                     </span>
+                    <span class="account text center">
+                        {% if trans.account %}
+                            <i class="fa fa-{{ trans.account.icon }}"></i>
+                            <a href="{% url 'account' trans.account.id %}">{{ trans.account }}</a>
+                        {% else %}
+                            –
+                        {% endif %}
+                    </span>
                     <span class="value num right">{{ snap.value|value }}</span>
                     <span class="diff num right">{{ snap.diff|pmvalue }}</span>
                     {% with sum=snap.sum %}
diff --git a/nummi/main/templates/main/tag/transaction_table.html b/nummi/main/templates/main/tag/transaction_table.html
index b1a1263..aae4664 100644
--- a/nummi/main/templates/main/tag/transaction_table.html
+++ b/nummi/main/templates/main/tag/transaction_table.html
@@ -1,6 +1,6 @@
 {% load main_extras %}
 {% load i18n %}
-<div id="transactions" class="table col1-6">
+<div id="transactions" class="table col1-7">
     <div class="header">
         <strong class="attach center"><i class="fa fa-paperclip"></i></strong>
         <strong class="date center">{% translate "Date" %}</strong>
@@ -8,6 +8,7 @@
         <strong class="value center">{% translate "Value" %}</strong>
         <strong class="trader center">{% translate "Trader" %}</strong>
         <strong class="category center">{% translate "Category" %}</strong>
+        <strong class="account center">{% translate "Account" %}</strong>
         <strong class="description">{% translate "Description" %}</strong>
     </div>
     {% for trans in transactions %}
@@ -33,6 +34,14 @@
                     –
                 {% endif %}
             </span>
+            <span class="account text center">
+                {% if trans.account %}
+                    <i class="fa fa-{{ trans.account.icon }}"></i>
+                    <a href="{% url 'account' trans.account.id %}">{{ trans.account }}</a>
+                {% else %}
+                    –
+                {% endif %}
+            </span>
             <span class="description text">{{ trans.description }}</span>
         </div>
     {% endfor %}
diff --git a/nummi/main/views.py b/nummi/main/views.py
index 495a9d6..9347e4e 100644
--- a/nummi/main/views.py
+++ b/nummi/main/views.py
@@ -37,6 +37,7 @@ class IndexView(LoginRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         return super().get_context_data(**kwargs) | {
+            "accounts": Account.objects.filter(user=self.request.user),
             "transactions": Transaction.objects.filter(user=self.request.user)[:10],
             "categories": Category.objects.filter(user=self.request.user),
             "snapshots": Snapshot.objects.filter(user=self.request.user),