Fix entrypoint script path and update permissions for execution

Close #44

.forgejo/workflows/build.yaml

@@ -0,0 +1,29 @@
+name: Build and push Docker image
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: code.edgarpierre.fr
+          username: ${{ vars.DOCKER_PUSH_USERNAME }}
+          password: ${{ secrets.DOCKER_PUSH_PASSWORD }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            code.edgarpierre.fr/${{ github.repository }}:${{ github.ref_name }}
+            code.edgarpierre.fr/${{ github.repository }}:latest

.pre-commit-config.yaml

@@ -1,4 +1,10 @@
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: no-commit-to-branch
+        args: ["--branch", "main"]
   - repo: https://github.com/PyCQA/isort
     rev: 5.12.0
     hooks:
@@ -17,7 +23,7 @@ repos:
     rev: v1.23.3
     hooks:
       - id: djlint-django
-        args: ["--reformat"]
+        args: ["--reformat", "--lint", "--quiet"]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.0.0-alpha.6"
     hooks:

.prettierrc.toml

@@ -0,0 +1 @@
+endOfLine = "auto"

.python-version

@@ -0,0 +1 @@
+3.12

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Python Debugger: Django",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}\\nummi\\manage.py",
+            "args": [
+                "runserver"
+            ],
+            "env": {
+                "NUMMI_CONFIG": "${workspaceFolder}\\env\\config.toml"
+            },
+            "django": true
+        }
+    ]
+}

Dockerfile

@@ -0,0 +1,17 @@
+FROM ghcr.io/astral-sh/uv:debian-slim
+
+ADD . /app
+WORKDIR /app
+
+RUN useradd -m -r nummi && \
+	chown -R nummi /app
+
+USER nummi
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+ENV NUMMI_CONFIG=/nummi/config.toml
+
+RUN uv sync --locked
+
+CMD ["/app/entrypoint.sh"]

compose.yaml

@@ -0,0 +1,23 @@
+services:
+  nummi:
+    image: code.edgarpierre.fr/edpibu/nummi
+    container_name: nummi
+    restart: unless-stopped
+    ports:
+      - 33001:8000
+    volumes:
+      - /docker/nummi/config:/nummi
+      - /docker/nummi/static:/app/static
+      - /docker/nummi/media:/app/media
+    depends_on:
+      - postgres
+  
+  postgres:
+    image: postgres:17-alpine
+    container_name: nummi_postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: nummi
+      POSTGRES_PASSWORD:
+    volumes:
+      - /docker/nummi/postgres:/var/lib/postgresql/data

entrypoint.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+cd /app/nummi
+uv run manage.py collectstatic --noinput
+uv run manage.py migrate --noinput
+uv run gunicorn --bind :8000 --workers 2 nummi.wsgi:application

nummi/account/forms.py

@@ -1,4 +1,5 @@
-from main.forms import NummiForm
+from django.forms.widgets import Select
+from main.forms import IconInput, NummiForm
 
 from .models import Account
 
@@ -10,4 +11,12 @@ class AccountForm(NummiForm):
             "name",
             "icon",
             "default",
+            "archived",
         ]
+        widgets = {
+            "icon": IconInput(),
+        }
+
+
+class AccountSelect(Select):
+    template_name = "account/forms/widgets/account.html"

nummi/account/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-22 15:16+0200\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-22 15:17+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -17,27 +17,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: .\account\models.py:11 .\account\models.py:37 .\account\models.py:45
+#: .\account\models.py:12 .\account\models.py:45 .\account\models.py:53
+#: .\account\templates\account\account_list.html:9
 msgid "Account"
 msgstr "Compte"
 
-#: .\account\models.py:11
+#: .\account\models.py:12
 msgid "Name"
 msgstr "Nom"
 
-#: .\account\models.py:15
+#: .\account\models.py:16
 msgid "Icon"
 msgstr "Icône"
 
-#: .\account\models.py:17
+#: .\account\models.py:18
 msgid "Default"
 msgstr "Défaut"
 
-#: .\account\models.py:38
+#: .\account\models.py:19
+msgid "Archived"
+msgstr "Archivé"
+
+#: .\account\models.py:46 .\account\templates\account\account_list.html:12
 msgid "Accounts"
 msgstr "Comptes"
 
+#: .\account\templates\account\account_detail.html:15
+msgid "Edit account"
+msgstr "Modifier le compte"
+
+#: .\account\templates\account\account_detail.html:18
+msgid "Statements"
+msgstr "Relevés"
+
+#: .\account\templates\account\account_detail.html:24
+msgid "History"
+msgstr "Historique"
+
 #: .\account\templates\account\account_form.html:5
+#: .\account\templates\account\account_table.html:35
 msgid "Create account"
 msgstr "Créer un compte"
 
@@ -45,14 +63,13 @@ msgstr "Créer un compte"
 msgid "New account"
 msgstr "Nouveau compte"
 
-#: .\account\templates\account\account_form.html:13
-msgid "Statements"
-msgstr "Relevés"
+#: .\account\templates\account\account_table.html:16
+msgid "All accounts"
+msgstr "Tous les comptes"
 
-#: .\account\templates\account\account_form.html:15
-msgid "Transactions"
-msgstr "Transactions"
+#: .\account\templates\account\account_table.html:26
+msgid "Show archived"
+msgstr "Afficher archivés"
 
-#: .\account\templates\account\account_form.html:18
-msgid "History"
-msgstr "Historique"
+#~ msgid "Transactions"
+#~ msgstr "Transactions"

nummi/account/migrations/0003_account_archived.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2 on 2024-12-29 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("account", "0002_alter_account_table"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="account",
+            name="archived",
+            field=models.BooleanField(default=False, verbose_name="Archived"),
+        ),
+    ]

nummi/account/migrations/0004_alter_account_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.7 on 2025-01-04 17:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("account", "0003_account_archived"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="account",
+            options={
+                "ordering": ["-default", "archived", "name"],
+                "verbose_name": "Account",
+                "verbose_name_plural": "Accounts",
+            },
+        ),
+    ]

nummi/account/models.py

@@ -1,12 +1,13 @@
 from uuid import uuid4
 
+from django.apps import apps
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from main.models import UserModel
+from main.models import NummiModel
 
 
-class Account(UserModel):
+class Account(NummiModel):
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     name = models.CharField(max_length=64, default=_("Account"), verbose_name=_("Name"))
     icon = models.SlugField(
@@ -15,6 +16,7 @@ class Account(UserModel):
         verbose_name=_("Icon"),
     )
     default = models.BooleanField(default=False, verbose_name=_("Default"))
+    archived = models.BooleanField(default=False, verbose_name=_("Archived"))
 
     def save(self, *args, **kwargs):
         if self.default:
@@ -32,13 +34,19 @@ class Account(UserModel):
     def get_delete_url(self):
         return reverse("del_account", args=(self.pk,))
 
+    @property
+    def transactions(self):
+        return apps.get_model("transaction", "Transaction").objects.filter(
+            statement__account=self
+        )
+
     class Meta:
-        ordering = ["-default", "name"]
+        ordering = ["-default", "archived", "name"]
         verbose_name = _("Account")
         verbose_name_plural = _("Accounts")
 
 
-class AccountModel(UserModel):
+class AccountModel(NummiModel):
     account = models.ForeignKey(
         Account,
         on_delete=models.CASCADE,

nummi/account/templates/account/account_detail.html

@@ -0,0 +1,27 @@
+{% extends "main/base.html" %}
+{% load main_extras history_extras statement_extras %}
+{% load i18n %}
+{% block title %}
+  {{ account }} – {{ block.super }}
+{% endblock title %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
+{% endblock link %}
+{% block body %}
+  <h2>{{ account.icon|remix }}{{ account }}</h2>
+  <p>
+    <a href="{% url "edit_account" account.pk %}">{{ "edit"|remix }}{% translate "Edit account" %}</a>
+  </p>
+  <section>
+    <h3>{% translate "Statements" %}</h3>
+    {% url "new_statement" account=account.pk as ns_url %}
+    {% url "account_statements" account=account.pk as s_url %}
+    {% statement_table account.statement_set.all statements_url=s_url new_statement_url=ns_url n_max=6 %}
+  </section>
+  <section>
+    <h3>{% translate "History" %}</h3>
+    {% history_plot account.transactions account=account %}
+  </section>
+{% endblock body %}

nummi/account/templates/account/account_form.html

@@ -2,21 +2,9 @@
 {% load main_extras %}
 {% load i18n %}
 {% block title_new %}
-    {% translate "Create account" %}
+  {% translate "Create account" %}
 {% endblock %}
 {% block h2_new %}
-    {% translate "New account" %}
+  {% translate "New account" %}
 {% endblock %}
 {% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
-{% block tables %}
-    {% if not form.instance|adding %}
-        <h3>{% translate "Statements" %}</h3>
-        {% include "statement/statement_table.html" %}
-        <h3>{% translate "Transactions" %}</h3>
-        {% include "transaction/transaction_table.html" %}
-        {% if history.data %}
-            <h3>{% translate "History" %}</h3>
-            {% include "history/plot.html" %}
-        {% endif %}
-    {% endif %}
-{% endblock %}

nummi/account/templates/account/account_list.html

@@ -0,0 +1,16 @@
+{% extends "main/list.html" %}
+{% load i18n main_extras account_extras %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
+{% endblock link %}
+{% block name %}
+  {% translate "Account" %}
+{% endblock name %}
+{% block h2 %}
+  {% translate "Accounts" %}
+{% endblock h2 %}
+{% block table %}
+  <div class="split">{% account_table accounts %}</div>
+{% endblock table %}

nummi/account/templates/account/account_table.html

@@ -0,0 +1,39 @@
+{% load i18n main_extras %}
+<dl class="accounts">
+  {% for acc in accounts %}
+    <div class="account {% if not search and acc.archived %}archived{% endif %}">
+      <dt>
+        <a href="{{ acc.get_absolute_url }}">{{ acc.icon|remix }}{{ acc }}</a>
+      </dt>
+      <dd class="value">
+        {% if acc.statement_set.first %}{{ acc.statement_set.first.value|value }}{% endif %}
+      </dd>
+    </div>
+  {% endfor %}
+  {% if index %}
+    <div class="more account">
+      <dt>
+        <a href="{% url "accounts" %}">{{ "gallery-view"|remixnl }}{% translate "All accounts" %}</a>
+      </dt>
+      <dd class="value">
+        {{ accounts|balance|value }}
+      </dd>
+    </div>
+  {% elif not search %}
+    <div class="more account">
+      <dt>
+        <label class="wi" for="show-archived-accounts">
+          {{ "archive"|remix }}{% translate "Show archived" %}
+        </label>
+      </dt>
+      <dd>
+        <input type="checkbox" class="show-archived" id="show-archived-accounts" />
+      </dd>
+    </div>
+    <div class="new account">
+      <dt>
+        <a href="{% url "new_account" %}">{{ "add-box"|remix }}{% translate "Create account" %}</a>
+      </dt>
+    </div>
+  {% endif %}
+</dl>

nummi/account/templates/account/forms/widgets/account.html

@@ -0,0 +1,5 @@
+{% load main_extras %}
+<span class="ico-input account-select">
+  {{ "bank"|remix }}
+  {% include "django/forms/widgets/select.html" %}
+</span>

nummi/account/templatetags/account_extras.py

@@ -0,0 +1,10 @@
+from django import template
+
+register = template.Library()
+
+
+@register.inclusion_tag("account/account_table.html")
+def account_table(accounts, **kwargs):
+    return kwargs | {
+        "accounts": accounts,
+    }

nummi/account/urls.py

@@ -1,12 +1,13 @@
 from django.urls import path
 from statement.views import StatementCreateView
-from transaction.views import TransactionMonthView
 
 from . import views
 
 urlpatterns = [
+    path("list", views.AccountListView.as_view(), name="accounts"),
     path("new", views.AccountCreateView.as_view(), name="new_account"),
-    path("<account>", views.AccountUpdateView.as_view(), name="account"),
+    path("<account>", views.AccountDetailView.as_view(), name="account"),
+    path("<account>/edit", views.AccountUpdateView.as_view(), name="edit_account"),
     path(
         "<account>/transactions",
         views.AccountTListView.as_view(),
@@ -27,9 +28,4 @@ urlpatterns = [
         views.AccountDeleteView.as_view(),
         name="del_account",
     ),
-    path(
-        "<account>/history/<int:year>/<int:month>",
-        TransactionMonthView.as_view(),
-        name="transaction_month",
-    ),
 ]

nummi/account/views.py

@@ -1,7 +1,11 @@
 from django.shortcuts import get_object_or_404
-from django.urls import reverse_lazy
-from history.utils import history
-from main.views import NummiCreateView, NummiDeleteView, NummiUpdateView
+from main.views import (
+    NummiCreateView,
+    NummiDeleteView,
+    NummiDetailView,
+    NummiListView,
+    NummiUpdateView,
+)
 from statement.views import StatementListView
 from transaction.views import TransactionListView
 
@@ -19,37 +23,18 @@ class AccountUpdateView(NummiUpdateView):
     form_class = AccountForm
     pk_url_kwarg = "account"
 
-    def get_context_data(self, **kwargs):
-        _max = 8
-        data = super().get_context_data(**kwargs)
-        account = data["form"].instance
-
-        _transactions = account.transaction_set.all()
-        if _transactions.count() > _max:
-            data["transactions_url"] = reverse_lazy(
-                "account_transactions", args=(account.pk,)
-            )
-        _statements = account.statement_set.all()
-        if _statements.count() > _max:
-            data["statements_url"] = reverse_lazy(
-                "account_statements", args=(account.pk,)
-            )
-
-        return data | {
-            "transactions": _transactions[:8],
-            "new_statement_url": reverse_lazy(
-                "new_statement", kwargs={"account": account.pk}
-            ),
-            "statements": _statements[:8],
-            "history": history(account.transaction_set),
-        }
-
 
 class AccountDeleteView(NummiDeleteView):
     model = Account
     pk_url_kwarg = "account"
 
 
+class AccountDetailView(NummiDetailView):
+    model = Account
+    pk_url_kwarg = "account"
+    context_object_name = "account"
+
+
 class AccountMixin:
     def get_queryset(self):
         self.account = get_object_or_404(
@@ -62,6 +47,11 @@ class AccountMixin:
         return super().get_context_data(**kwargs) | {"account": self.account}
 
 
+class AccountListView(NummiListView):
+    model = Account
+    context_object_name = "accounts"
+
+
 class AccountTListView(AccountMixin, TransactionListView):
     pass
 

nummi/category/forms.py

@@ -1,4 +1,5 @@
-from main.forms import NummiForm
+from django.forms.widgets import Select
+from main.forms import IconInput, NummiForm
 
 from .models import Category
 
@@ -11,3 +12,10 @@ class CategoryForm(NummiForm):
             "icon",
             "budget",
         ]
+        widgets = {
+            "icon": IconInput,
+        }
+
+
+class CategorySelect(Select):
+    template_name = "category/forms/widgets/category.html"

nummi/category/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-25 12:05+0100\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-22 15:18+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 3.2.2\n"
 
 #: .\category\models.py:12 .\category\models.py:32
-#: .\category\templates\category\category_plot.html:14
+#: .\category\templates\category\category_plot.html:13
 msgid "Category"
 msgstr "Catégorie"
 
@@ -38,6 +38,22 @@ msgstr "Budget"
 msgid "Categories"
 msgstr "Catégories"
 
+#: .\category\templates\category\category_detail.html:14
+msgid "Edit category"
+msgstr "Modifier la catégorie"
+
+#: .\category\templates\category\category_detail.html:17
+msgid "Transactions"
+msgstr "Transactions"
+
+#: .\category\templates\category\category_detail.html:20
+msgid "View all transactions"
+msgstr "Voir toutes les transactions"
+
+#: .\category\templates\category\category_detail.html:25
+msgid "History"
+msgstr "Historique"
+
 #: .\category\templates\category\category_form.html:5
 msgid "Create category"
 msgstr "Créer une catégorie"
@@ -46,26 +62,22 @@ msgstr "Créer une catégorie"
 msgid "New category"
 msgstr "Nouvelle catégorie"
 
-#: .\category\templates\category\category_form.html:12
-msgid "Transactions"
-msgstr "Transactions"
-
-#: .\category\templates\category\category_form.html:15
-msgid "History"
-msgstr "Historique"
-
-#: .\category\templates\category\category_plot.html:15
+#: .\category\templates\category\category_plot.html:14
 msgid "Expenses"
 msgstr "Dépenses"
 
-#: .\category\templates\category\category_plot.html:16
+#: .\category\templates\category\category_plot.html:15
 msgid "Income"
 msgstr "Revenus"
 
-#: .\category\templates\category\category_plot.html:56
+#: .\category\templates\category\category_plot.html:58
 msgid "No transaction"
 msgstr "Aucune transaction"
 
-#: .\category\templates\category\category_plot.html:64
+#: .\category\templates\category\category_plot.html:66
 msgid "Total"
 msgstr "Total"
+
+#: .\category\templates\category\category_plot.html:89
+msgid "Expected total"
+msgstr "Total attendu"

nummi/category/models.py

@@ -3,10 +3,10 @@ from uuid import uuid4
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from main.models import UserModel
+from main.models import NummiModel
 
 
-class Category(UserModel):
+class Category(NummiModel):
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     name = models.CharField(
         max_length=64, default=_("Category"), verbose_name=_("Name")

nummi/category/templates/category/category_detail.html

@@ -0,0 +1,28 @@
+{% extends "main/base.html" %}
+{% load i18n main_extras history_extras transaction_extras %}
+{% block title %}
+  {{ category }} – {{ block.super }}
+{% endblock title %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
+{% endblock link %}
+{% block body %}
+  <h2>{{ category.icon|remix }}{{ category }}</h2>
+  <p>
+    <a href="{% url "edit_category" category.pk %}">{{ "edit"|remix }}{% translate "Edit category" %}</a>
+  </p>
+  <section>
+    <h3>{% translate "Transactions" %}</h3>
+    {% url_get "transactions" category=category.id as t_url %}
+    <p>
+      <a class="big-link" href="{{ t_url }}">{{ "list-check"|remixnl }}{% translate "View all transactions" %}</a>
+    </p>
+    {% transaction_table category.transaction_set.all n_max=8 transactions_url=t_url %}
+  </section>
+  <section>
+    <h3>{% translate "History" %}</h3>
+    {% history_plot category.transaction_set category=category %}
+  </section>
+{% endblock body %}

nummi/category/templates/category/category_form.html

@@ -2,17 +2,9 @@
 {% load main_extras %}
 {% load i18n %}
 {% block title_new %}
-    {% translate "Create category" %}
+  {% translate "Create category" %}
 {% endblock %}
 {% block h2_new %}
-    {% translate "New category" %}
+  {% translate "New category" %}
 {% endblock %}
 {% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
-{% block tables %}
-    <h3>{% translate "Transactions" %}</h3>
-    {% include "transaction/transaction_table.html" %}
-    {% if history.data %}
-        <h3>{% translate "History" %}</h3>
-        {% include "history/plot.html" %}
-    {% endif %}
-{% endblock %}

nummi/category/templates/category/category_plot.html

@@ -1,87 +1,114 @@
-{% load main_extras %}
+{% load main_extras statement_extras history_extras %}
 {% load i18n %}
 <div class="plot">
-    <table class="full-width">
-        <colgroup>
-            <col class="desc">
-            <col class="icon">
-            <col class="value">
-            <col span="2" class="bar">
-            <col class="value">
-        </colgroup>
-        <thead>
-            <tr>
-                <th scope="col" colspan="2">{% translate "Category" %}</th>
-                <th scope="col" colspan="2">{% translate "Expenses" %}</th>
-                <th scope="col" colspan="2">{% translate "Income" %}</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% spaceless %}
-                {% for cat in categories %}
-                    <tr>
-                        <th scope="row" class="l">
-                            {% if cat.category %}
-                                {% if month %}
-                                    <a href="{% url "transaction_month" cat.category month.year month.month %}">{{ cat.category__name }}</a>
-                                {% else %}
-                                    {{ cat.category__name }}
-                                {% endif %}
-                            {% endif %}
-                        </th>
-                        <td class="c">
-                            {% if cat.category %}{{ cat.category__icon|remix }}{% endif %}
-                        </td>
-                        <td class="value">{{ cat.sum_m|pmrvalue }}</td>
-                        <td class="bar m">
-                            <div style="width: {% widthratio cat.sum_m max -100 %}%"></div>
-                            {% if cat.sum < 0 %}
-                                <div class="tot" style="width:{% widthratio cat.sum max -100 %}%">
-                                    <span>{{ cat.sum|pmrvalue }}</span>
-                                </div>
-                            {% endif %}
-                        </td>
-                        <td class="bar p">
-                            <div style="width: {% widthratio cat.sum_p max 100 %}%"></div>
-                            {% if cat.sum > 0 %}
-                                <div class="tot" style="width:{% widthratio cat.sum max 100 %}%">
-                                    <span>{{ cat.sum|pmrvalue }}</span>
-                                </div>
-                            {% endif %}
-                        </td>
-                        <td class="value">{{ cat.sum_p|pmrvalue }}</td>
-                    </tr>
-                {% empty %}
-                    <tr>
-                        <td class="empty" colspan="6">{% translate "No transaction" %}</td>
-                    </tr>
-                {% endfor %}
-            {% endspaceless %}
-        </tbody>
-        {% if categories %}
-            <tfoot>
-                <tr>
-                    <th scope="row" colspan="2" class="l">{% translate "Total" %}</th>
-                    <td class="value">{{ total_m|pmrvalue }}</td>
-                    <td class="bar m">
-                        <div style="width: {% widthratio total_m max -100 %}%"></div>
-                        {% if total < 0 %}
-                            <div class="tot" style="width:{% widthratio total max -100 %}%">
-                                <span>{{ total|pmrvalue }}</span>
-                            </div>
-                        {% endif %}
-                    </td>
-                    <td class="bar p">
-                        <div style="width: {% widthratio total_p max 100 %}%"></div>
-                        {% if total > 0 %}
-                            <div class="tot" style="width:{% widthratio total max 100 %}%">
-                                <span>{{ total|pmrvalue }}</span>
-                            </div>
-                        {% endif %}
-                    </td>
-                    <td class="value">{{ total_p|pmrvalue }}</td>
-                </tr>
-            </tfoot>
-        {% endif %}
-    </table>
+  <table class="full-width">
+    <colgroup>
+      <col class="desc">
+      <col class="value">
+      <col span="2" class="bar">
+      <col class="value">
+    </colgroup>
+    <thead>
+      <tr>
+        <th scope="col">{% translate "Category" %}</th>
+        <th scope="col" colspan="2">{% translate "Expenses" %}</th>
+        <th scope="col" colspan="2">{% translate "Income" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% spaceless %}
+        {% for cat in categories %}
+          <tr>
+            <th scope="row" class="l wi">
+              {% if cat.category %}
+                {% if year %}
+                  <a href="{% history_url year=year category=cat.category account=account.id %}">{{ cat.category__icon|remix }}{{ cat.category__name }}</a>
+                {% elif month %}
+                  <a href="{% url_get "transactions" start_date=month end_date=month|end_of_month account=account.id category=cat.category %}">{{ cat.category__icon|remix }}{{ cat.category__name }}</a>
+                {% elif statement %}
+                  <a href="{% url_get "transactions" account=statement.account.id statement=statement.id category=cat.category %}">{{ cat.category_.icon|remix }}{{ cat.category__name }}</a>
+                {% elif account %}
+                  <a href="{% url_get "transactions" account=account.id category=cat.category %}">{{ cat.category__icon|remix }}{{ cat.category__name }}</a>
+                {% else %}
+                  {{ cat.category__icon|remix }}{{ cat.category__name }}
+                {% endif %}
+              {% endif %}
+            </th>
+            <td class="value">{{ cat.sum_m|pmvalue }}</td>
+            <td class="bar m">
+              {% if cat.sum_m %}
+                <div style="width: {% widthratio cat.sum_m max -100 %}%"></div>
+              {% endif %}
+              {% if cat.sum < 0 %}
+                <div class="tot" style="width:{% widthratio cat.sum max -100 %}%">
+                  <span>{{ cat.sum|pmvalue }}</span>
+                </div>
+              {% endif %}
+            </td>
+            <td class="bar p">
+              {% if cat.sum_p %}
+                <div style="width: {% widthratio cat.sum_p max 100 %}%"></div>
+              {% endif %}
+              {% if cat.sum > 0 %}
+                <div class="tot" style="width:{% widthratio cat.sum max 100 %}%">
+                  <span>{{ cat.sum|pmvalue }}</span>
+                </div>
+              {% endif %}
+            </td>
+            <td class="value">{{ cat.sum_p|pmvalue }}</td>
+          </tr>
+        {% empty %}
+          <tr>
+            <td class="empty" colspan="5">{% translate "No transaction" %}</td>
+          </tr>
+        {% endfor %}
+      {% endspaceless %}
+    </tbody>
+    <tfoot>
+      {% if categories %}
+        <tr>
+          <th scope="row" class="l">{% translate "Total" %}</th>
+          <td class="value">{{ total_m|pmvalue }}</td>
+          <td class="bar m">
+            <div style="width: {% widthratio total_m max -100 %}%"></div>
+            {% if total < 0 %}
+              <div class="tot" style="width:{% widthratio total max -100 %}%">
+                <span>{{ total|pmvalue }}</span>
+              </div>
+            {% endif %}
+          </td>
+          <td class="bar p">
+            <div style="width: {% widthratio total_p max 100 %}%"></div>
+            {% if total > 0 %}
+              <div class="tot" style="width:{% widthratio total max 100 %}%">
+                <span>{{ total|pmvalue }}</span>
+              </div>
+            {% endif %}
+          </td>
+          <td class="value">{{ total_p|pmvalue }}</td>
+        </tr>
+      {% endif %}
+      {% if statement and statement.diff != statement.sum %}
+        <tr>
+          <th scope="row" class="l">{% translate "Expected total" %}</th>
+          <td class="c">{{ total|check:statement.diff }}</td>
+          <td class="bar m">
+            {% if statement.diff < 0 %}
+              <div class="tot" style="width:{% widthratio statement.diff max -100 %}%">
+                <span>{{ statement.diff|pmvalue }}</span>
+              </div>
+            {% endif %}
+          </td>
+          <td class="bar p">
+            {% if statement.diff >= 0 %}
+              <div class="tot" style="width:{% widthratio statement.diff max 100 %}%">
+                <span>{{ statement.diff|pmvalue }}</span>
+              </div>
+            {% endif %}
+          </td>
+          <td></td>
+        </tr>
+      {% endif %}
+    </tfoot>
+  </table>
 </div>

nummi/category/templates/category/forms/widgets/category.html

@@ -0,0 +1,5 @@
+{% load main_extras %}
+<span class="ico-input category-select">
+  {{ "folder"|remix }}
+  {% include "django/forms/widgets/select.html" %}
+</span>

nummi/category/templatetags/category.py

@@ -5,11 +5,14 @@ from django.db.models.functions import Greatest
 register = template.Library()
 
 
-@register.inclusion_tag("category/category_plot.html")
-def category_plot(transactions, **kwargs):
+@register.inclusion_tag("category/category_plot.html", takes_context=True)
+def category_plot(context, transactions, **kwargs):
+    kwargs.setdefault("account", context.get("account"))
+
+    if not kwargs.get("account"):
+        transactions = transactions.exclude(category__budget=False)
     categories = (
-        transactions.exclude(category__budget=False)
-        .values("category", "category__name", "category__icon")
+        transactions.values("category", "category__name", "category__icon")
         .annotate(
             sum=models.Sum("value"),
             sum_m=models.Sum("value", filter=models.Q(value__lt=0)),

nummi/category/urls.py

@@ -1,20 +1,15 @@
 from django.urls import path
-from transaction.views import TransactionMonthView
 
 from . import views
 
 urlpatterns = [
     path("new", views.CategoryCreateView.as_view(), name="new_category"),
-    path("<category>", views.CategoryUpdateView.as_view(), name="category"),
+    path("<category>", views.CategoryDetailView.as_view(), name="category"),
+    path("<category>/edit", views.CategoryUpdateView.as_view(), name="edit_category"),
     path(
         "<category>/transactions",
         views.CategoryTListView.as_view(),
         name="category_transactions",
     ),
     path("<category>/delete", views.CategoryDeleteView.as_view(), name="del_category"),
-    path(
-        "<category>/history/<int:year>/<int:month>",
-        TransactionMonthView.as_view(),
-        name="transaction_month",
-    ),
 ]

nummi/category/views.py

@@ -1,7 +1,10 @@
 from django.shortcuts import get_object_or_404
-from django.urls import reverse_lazy
-from history.utils import history
-from main.views import NummiCreateView, NummiDeleteView, NummiUpdateView
+from main.views import (
+    NummiCreateView,
+    NummiDeleteView,
+    NummiDetailView,
+    NummiUpdateView,
+)
 from transaction.views import TransactionListView
 
 from .forms import CategoryForm
@@ -18,20 +21,11 @@ class CategoryUpdateView(NummiUpdateView):
     form_class = CategoryForm
     pk_url_kwarg = "category"
 
-    def get_context_data(self, **kwargs):
-        _max = 8
-        data = super().get_context_data(**kwargs)
-        category = data["form"].instance
 
-        data["transactions"] = category.transaction_set.all()[:_max]
-        if len(data["transactions"]) == _max:
-            data["transactions_url"] = reverse_lazy(
-                "category_transactions", args=(category.pk,)
-            )
-
-        return data | {
-            "history": history(category.transaction_set),
-        }
+class CategoryDetailView(NummiDetailView):
+    model = Category
+    pk_url_kwarg = "category"
+    context_object_name = "category"
 
 
 class CategoryDeleteView(NummiDeleteView):

nummi/history/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-22 15:16+0200\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-22 15:18+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -17,14 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: .\history\templates\history\plot.html:15
+#: .\history\templates\history\plot.html:10
+msgid "Year"
+msgstr "Année"
+
+#: .\history\templates\history\plot.html:13
+msgid "Total"
+msgstr "Total"
+
+#: .\history\templates\history\plot.html:56
 msgid "Month"
 msgstr "Mois"
 
-#: .\history\templates\history\plot.html:16
+#: .\history\templates\history\plot.html:57
 msgid "Expenses"
 msgstr "Dépenses"
 
-#: .\history\templates\history\plot.html:17
+#: .\history\templates\history\plot.html:58
 msgid "Income"
 msgstr "Revenus"

nummi/history/templates/history/pagination.html

@@ -0,0 +1,25 @@
+{% load history_extras %}
+{% if month %}
+  <p class="pagination">
+    <a href="{% history_url year=month %}">{{ month.year }}</a>
+  </p>
+{% endif %}
+<p class="pagination n3">
+  {% if month %}
+    {% if previous_month %}
+      <a href="{% history_url month=previous_month %}">{{ previous_month|date:"F Y"|capfirst }}</a>
+    {% endif %}
+    <a class="cur" href="{% history_url month=month %}">{{ month|date:"F Y"|capfirst }}</a>
+    {% if next_month %}
+      <a href="{% history_url month=next_month %}">{{ next_month|date:"F Y"|capfirst }}</a>
+    {% endif %}
+  {% elif year %}
+    {% if previous_year %}
+      <a href="{% history_url year=previous_year %}">{{ previous_year|date:"Y" }}</a>
+    {% endif %}
+    <a class="cur" href="{% history_url year=year %}">{{ year|date:"Y" }}</a>
+    {% if next_year %}
+      <a href="{% history_url year=next_year %}">{{ next_year|date:"Y" }}</a>
+    {% endif %}
+  {% endif %}
+</p>

nummi/history/templates/history/plot.html

@@ -1,63 +1,92 @@
 {% load main_extras %}
+{% load history_extras %}
+{% load transaction_extras %}
 {% load i18n %}
-<div class="plot">
-    <table class="full-width">
-        <colgroup>
-            <col class="icon">
-            <col class="desc">
-            <col class="value">
-            <col span="2" class="bar">
-            <col class="value">
-        </colgroup>
-        <thead>
-            <tr>
-                <th scope="col">{{ "expand-up-down"|remix }}</th>
-                <th scope="col">{% translate "Month" %}</th>
-                <th scope="col" colspan="2">{% translate "Expenses" %}</th>
-                <th scope="col" colspan="2">{% translate "Income" %}</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% spaceless %}
-                {% for date in history.data %}
-                    <tr>
-                        <td class="icon">
-                            <span class="ri-{% if date.sum > 0 %}arrow-up-s-line green{% elif date.sum < 0 %}arrow-down-s-line red{% endif %}"></span>
-                        </td>
-                        <th class="date" scope="row">
-                            {% if date.has_transactions %}
-                                {% if account %}
-                                    <a href="{% url "transaction_month" account=account.pk year=date.month.year month=date.month.month %}">{{ date.month|date:"Y-m" }}</a>
-                                {% elif category %}
-                                    <a href="{% url "transaction_month" category=category.pk year=date.month.year month=date.month.month %}">{{ date.month|date:"Y-m" }}</a>
-                                {% else %}
-                                    <a href="{% url "transaction_month" year=date.month.year month=date.month.month %}">{{ date.month|date:"Y-m" }}</a>
-                                {% endif %}
-                            {% else %}
-                                {{ date.month|date:"Y-m" }}
-                            {% endif %}
-                        </th>
-                        <td class="value">{{ date.sum_m|pmrvalue }}</td>
-                        <td class="bar m">
-                            <div style="width: {% widthratio date.sum_m history.max -100 %}%"></div>
-                            {% if date.sum < 0 %}
-                                <div class="tot" style="width:{% widthratio date.sum history.max -100 %}%">
-                                    <span>{{ date.sum|pmrvalue }}</span>
-                                </div>
-                            {% endif %}
-                        </td>
-                        <td class="bar p">
-                            <div style="width: {% widthratio date.sum_p history.max 100 %}%"></div>
-                            {% if date.sum > 0 %}
-                                <div class="tot" style="width:{% widthratio date.sum history.max 100 %}%">
-                                    <span>{{ date.sum|pmrvalue }}</span>
-                                </div>
-                            {% endif %}
-                        </td>
-                        <td class="value">{{ date.sum_p|pmrvalue }}</td>
-                    </tr>
-                {% endfor %}
-            {% endspaceless %}
-        </tbody>
-    </table>
+<div class="calendar">
+  <table>
+    <thead>
+      <tr>
+        {% if not year %}
+          <th scope="col">{% translate "Year" %}</th>
+        {% endif %}
+        {% calendar_head %}
+        <th scope="col">{% translate "Total" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% regroup history.data by month.year as years_list %}
+      {% for y, y_data in years_list reversed %}
+        <tr>
+          {% if not year %}
+            <th class="date" scope="row">
+              <a href="{% history_url year=y account=account.id category=category.id %}">{{ y }}</a>
+            </th>
+          {% endif %}
+          {% for m in y_data %}
+            {% if forloop.parentloop.last and forloop.first %}
+            {% empty_calendar_cells_start m.month.month %}
+            {% endif %}
+            {% if m %}
+              <td class="month {% if m.sum > 0 %}p{% else %}m{% endif %}"
+                  style="--opacity: {% calendar_opacity m.sum history.max.sum %}"
+                  title="{{ m.sum|pmrvalue }}">{% up_down_icon m.sum %}</td>
+            {% else %}
+              <td class="month"></td>
+            {% endif %}
+            {% if forloop.parentloop.first and forloop.last %}
+            {% empty_calendar_cells_end m.month.month %}
+            {% endif %}
+          {% endfor %}
+          <td class="total">{{ y_data|sum_year|pmrvalue }}</td>
+        </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
+<div class="history plot">
+  <table class="full-width">
+    <colgroup>
+      <col class="icon">
+      <col class="desc">
+      <col class="value">
+      <col span="2" class="bar">
+      <col class="value">
+    </colgroup>
+    <thead>
+      <tr>
+        <th scope="col">{{ "expand-up-down"|remix }}</th>
+        <th scope="col">{% translate "Month" %}</th>
+        <th scope="col" colspan="2">{% translate "Expenses" %}</th>
+        <th scope="col" colspan="2">{% translate "Income" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for date in history.data reversed %}
+        {% ifchanged %}
+          {% if date.sum_m or date.sum_p %}
+            <tr {% if not date.month.month|divisibleby:"2" %}class="even"{% endif %}>
+              <td class="icon">{% up_down_icon date.sum %}</td>
+              <th class="date" scope="row">
+                <a href="{% history_url year=date.month.year month=date.month.month account=account.id category=category.id %}">
+                  {% if year %}
+                    {{ date.month|date:"F"|capfirst }}
+                  {% else %}
+                    {{ date.month|date:"Y-m" }}
+                  {% endif %}
+                </a>
+              </th>
+              <td class="value">{{ date.sum_m|pmrvalue }}</td>
+              <td class="bar m">{% plot_bar date.sum date.sum_m history.max.pm %}</td>
+              <td class="bar p">{% plot_bar date.sum date.sum_p history.max.pm %}</td>
+              <td class="value">{{ date.sum_p|pmrvalue }}</td>
+            </tr>
+          {% else %}
+            <tr class="empty">
+              <td colspan="6" class="empty"></td>
+            </tr>
+          {% endif %}
+        {% endifchanged %}
+      {% endfor %}
+    </tbody>
+  </table>
 </div>

nummi/history/templates/history/transaction_archive.html

@@ -0,0 +1,51 @@
+{% extends "main/base.html" %}
+{% load i18n static main_extras transaction_extras category history_extras %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/plot.css" %}
+  {% css "main/css/table.css" %}
+{% endblock link %}
+{% block body %}
+  <h2>
+    {% block h2 %}
+    {% endblock h2 %}
+  </h2>
+  {% history_pagination %}
+  {% if account or category %}
+    <p class="back">
+      <a class="big-link"
+         href="{% history_url year=year month=month clear=True %}">{{ "arrow-go-back"|remix }}{% translate "Back" %}</a>
+      {% if account %}
+        <a class="big-link" href="{% url "account" account.id %}">{{ account.icon|remix }}{{ account }}</a>
+      {% endif %}
+      {% if category %}
+        <a class="big-link" href="{% url "category" category.id %}">{{ category.icon|remix }}{{ category }}</a>
+      {% endif %}
+    </p>
+  {% endif %}
+  {% if history %}
+    <section>
+      <h3>{% translate "History" %}</h3>
+      {% include "history/plot.html" %}
+    </section>
+  {% endif %}
+  {% if not category %}
+    <section>
+      <h3>{% translate "Categories" %}</h3>
+      {% category_plot transactions month=month year=year %}
+    </section>
+  {% endif %}
+  <section>
+    <h3>{% translate "Transactions" %}</h3>
+    {% if month %}
+      {% url_get "transactions" start_date=month end_date=month|end_of_month category=category.id account=account.id as t_url %}
+    {% elif year %}
+      {% url_get "transactions" start_date=year end_date=year|end_of_year category=category.id account=account.id as t_url %}
+    {% endif %}
+    <p>
+      <a class="big-link" href="{{ t_url }}">{{ "list-check"|remixnl }}{% translate "View all transactions" %}</a>
+    </p>
+    {% transaction_table transactions n_max=8 transactions_url=t_url %}
+  </section>
+  {% history_pagination %}
+{% endblock body %}

nummi/history/templates/history/transaction_month.html

@@ -0,0 +1,8 @@
+{% extends "history/transaction_archive.html" %}
+{% load i18n static main_extras transaction_extras category %}
+{% block title %}
+  {{ month|date:"F Y"|capfirst }} – {{ block.super }}
+{% endblock title %}
+{% block h2 %}
+  {{ month|date:"F Y"|capfirst }}
+{% endblock h2 %}

nummi/history/templates/history/transaction_year.html

@@ -0,0 +1,8 @@
+{% extends "history/transaction_archive.html" %}
+{% load i18n static main_extras transaction_extras category %}
+{% block title %}
+  {{ year|date:"Y" }} – {{ block.super }}
+{% endblock title %}
+{% block h2 %}
+  {{ year|date:"Y" }}
+{% endblock h2 %}

nummi/history/templatetags/history_extras.py

@@ -0,0 +1,119 @@
+import datetime
+import math
+from urllib import parse
+
+from django import template
+from django.urls import reverse
+from django.utils.safestring import mark_safe
+from history.utils import history
+from main.templatetags.main_extras import pmrvalue, remix
+
+register = template.Library()
+
+
+@register.inclusion_tag("history/plot.html", takes_context=True)
+def history_plot(context, transactions, **kwargs):
+    kwargs.setdefault("account", context.get("account"))
+    kwargs.setdefault("category", context.get("category"))
+
+    if kwargs.get("category") or kwargs.get("account"):
+        kwargs["history"] = history(transactions.all())
+    else:
+        kwargs["history"] = history(transactions.exclude(category__budget=False))
+
+    return kwargs
+
+
+@register.simple_tag
+def calendar_opacity(v, vmax):
+    if v is None:
+        return "0%"
+    return f"{math.sin(min(1, math.fabs(v/vmax))*math.pi/2): .0%}"
+
+
+@register.simple_tag
+def empty_calendar_cells(n):
+    return mark_safe(n * "<td></td>")
+
+
+@register.simple_tag
+def empty_calendar_cells_start(n):
+    return empty_calendar_cells(n - 1)
+
+
+@register.simple_tag
+def empty_calendar_cells_end(n):
+    return empty_calendar_cells(12 - n)
+
+
+@register.simple_tag
+def up_down_icon(val):
+    if val is None:
+        return ""
+    if val > 0:
+        return remix("arrow-up-s", "green")
+    elif val < 0:
+        return remix("arrow-down-s", "red")
+
+    return remix("equal", "white")
+
+
+@register.simple_tag
+def plot_bar(s, sum_pm, s_max):
+    _res = ""
+
+    if s_max:
+        if sum_pm:
+            _w = abs(sum_pm / s_max)
+            _res += f"""<div style="width: {_w: .1%}"></div>"""
+        if sum_pm is not None and s * sum_pm > 0:
+            _w = abs(s / s_max)
+            _res += (
+                f"""<div class="tot" style="width: {_w: .1%}">"""
+                f"""<span>{pmrvalue(s)}</span></div>"""
+            )
+    else:
+        _res += "<div></div>"
+
+    return mark_safe(_res)
+
+
+@register.simple_tag
+def calendar_head():
+    months = range(1, 13)
+    th = (f"""<th>{month: 02d}</th>""" for month in months)
+
+    return mark_safe("".join(th))
+
+
+@register.filter
+def sum_year(y_data):
+    return sum(y["sum"] or 0 for y in y_data)
+
+
+@register.inclusion_tag("history/pagination.html", takes_context=True)
+def history_pagination(context):
+    return context
+
+
+@register.simple_tag(takes_context=True)
+def history_url(context, month=None, year=None, clear=False, **kwargs):
+    if not clear:
+        kwargs.setdefault("account", getattr(context.get("account"), "id", None))
+        kwargs.setdefault("category", getattr(context.get("category"), "id", None))
+
+    if month:
+        if isinstance(month, datetime.date):
+            year = month.year
+            month = month.month
+        url = reverse("history:month", kwargs={"year": year, "month": month})
+    elif year:
+        if isinstance(year, datetime.date):
+            year = year.year
+        url = reverse("history:year", kwargs={"year": year})
+
+    kwargs = {k: v for k, v in kwargs.items() if v}
+
+    if kwargs:
+        return f"{url}?{parse.urlencode(kwargs)}"
+    return url

nummi/history/urls.py

@@ -0,0 +1,13 @@
+from django.urls import path
+
+from . import views
+
+app_name = "history"
+urlpatterns = [
+    path(
+        "month/<int:year>/<int:month>",
+        views.TransactionMonthView.as_view(),
+        name="month",
+    ),
+    path("year/<int:year>", views.TransactionYearView.as_view(), name="year"),
+]

nummi/history/utils.py

@@ -1,48 +1,54 @@
-from django.db import models
-from django.db.models import Func, Max, Min, Q, Sum, Value
-from django.db.models.functions import Now, TruncMonth
+import datetime
 
-
-class GenerateMonth(Func):
-    function = "generate_series"
-    template = "%(function)s(%(expressions)s, '1 month')::date"
+from django.db.models import Q, Sum
+from django.db.models.functions import Abs, Greatest, TruncMonth
 
 
 def history(transaction_set):
     if not transaction_set.exists():
         return None
+
     _transaction_month = transaction_set.values(month=TruncMonth("date")).order_by(
         "-date"
     )
-    _months = (
-        transaction_set.values(
-            month=GenerateMonth(
-                _transaction_month.last()["month"],
-                Now(output_field=models.DateField()),
-            )
-        )
-        .annotate(
-            sum_m=Value(0), sum_p=Value(0), sum=Value(0), has_transactions=Value(0)
-        )
-        .difference(
-            _transaction_month.annotate(
-                sum_m=Value(0), sum_p=Value(0), sum=Value(0), has_transactions=Value(0)
-            )
+    _first_month = _transaction_month.last()["month"]
+    _last_month = _transaction_month.first()["month"]
+
+    _history = (
+        _transaction_month.annotate(
+            sum_p=Sum("value", filter=Q(value__gt=0), default=0),
+            sum_m=Sum("value", filter=Q(value__lt=0), default=0),
+            sum=Sum("value"),
         )
+        .annotate(max_sum=Greatest("sum_p", Abs("sum_m")))
+        .order_by("-month")
     )
-    _history = _transaction_month.annotate(
-        sum_p=Sum("value", filter=Q(value__gt=0)),
-        sum_m=Sum("value", filter=Q(value__lt=0)),
-        sum=Sum("value"),
-        has_transactions=Value(1),
-    ).order_by("-month")
+
+    _data = [
+        _history.filter(month=datetime.date(y, m + 1, 1)).first()
+        or {"month": datetime.date(y, m + 1, 1), "sum": None}
+        for y in range(
+            _first_month.year,
+            _last_month.year + 1,
+        )
+        for m in range(
+            _first_month.month - 1 if _first_month.year == y else 0,
+            _last_month.month if _last_month.year == y else 12,
+        )
+    ]
 
     return {
-        "data": _history.union(_months).order_by("-month"),
-        "max": max(
-            _history.aggregate(
-                max=Max("sum_p", default=0),
-                min=-Min("sum_m", default=0),
-            ).values(),
-        ),
+        "data": _data,
+        "max": {
+            "pm": 125
+            * _history.order_by("-max_sum")[len(_history.exclude(max_sum=0)) // 10][
+                "max_sum"
+            ]
+            / 100,
+            "sum": 125
+            * _history.annotate(abs_sum=Abs("sum")).order_by("-abs_sum")[
+                len(_history) // 10
+            ]["abs_sum"]
+            / 100,
+        },
     }

nummi/history/views.py

@@ -0,0 +1,54 @@
+from django.shortcuts import get_object_or_404
+from django.views.generic.dates import MonthArchiveView, YearArchiveView
+from history.utils import history
+from main.views import UserMixin
+from transaction.models import Transaction
+
+
+class ACFilterMixin:
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        if account := self.request.GET.get("account"):
+            queryset = queryset.filter(statement__account=account)
+        if category := self.request.GET.get("category"):
+            queryset = queryset.filter(category=category)
+
+        return queryset
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        if account := self.request.GET.get("account"):
+            context_data["account"] = get_object_or_404(
+                self.request.user.account_set, pk=account
+            )
+        if category := self.request.GET.get("category"):
+            context_data["category"] = get_object_or_404(
+                self.request.user.category_set, pk=category
+            )
+
+        return context_data
+
+
+class TransactionMonthView(UserMixin, ACFilterMixin, MonthArchiveView):
+    model = Transaction
+    date_field = "date"
+    context_object_name = "transactions"
+    month_format = "%m"
+    template_name = "history/transaction_month.html"
+
+
+class TransactionYearView(UserMixin, ACFilterMixin, YearArchiveView):
+    model = Transaction
+    date_field = "date"
+    context_object_name = "transactions"
+    make_object_list = True
+    template_name = "history/transaction_year.html"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        h_data = context_data.get("transactions")
+        if not (context_data.get("account") or context_data.get("category")):
+            h_data = h_data.exclude(category__budget=False)
+        context_data["history"] = history(h_data)
+
+        return context_data

nummi/main/forms.py

@@ -1,4 +1,7 @@
 from django import forms
+from django.forms.widgets import TextInput
+
+from .utils import get_icons
 
 
 class NummiFileInput(forms.ClearableFileInput):
@@ -7,6 +10,42 @@ class NummiFileInput(forms.ClearableFileInput):
 
 class NummiForm(forms.ModelForm):
     template_name = "main/form/form_base.html"
+    meta_fieldsets = []
 
-    def __init__(self, *args, user, **kwargs):
+    def __init__(self, *args, **kwargs):
+        kwargs.pop("user", None)
         super().__init__(*args, **kwargs)
+
+    @property
+    def fieldsets(self):
+        if self.meta_fieldsets:
+            for group in self.meta_fieldsets:
+                yield ((self[f] for f in fieldset) for fieldset in group)
+        else:
+            yield ([f] for f in self)
+
+
+class DatalistInput(TextInput):
+    template_name = "main/forms/widgets/datalist.html"
+
+    def __init__(self, *args, options=[]):
+        self.options = options
+        super().__init__(*args)
+
+    def get_context(self, *args):
+        context = super().get_context(*args)
+        name = context["widget"]["name"]
+        context["widget"]["attrs"]["list"] = f"{name}-list"
+        context["widget"]["attrs"]["autocomplete"] = "off"
+        context["widget"]["options"] = self.options
+        return context
+
+
+class IconInput(DatalistInput):
+    template_name = "main/forms/widgets/icon.html"
+    icon_list = get_icons()
+
+    def get_context(self, *args):
+        context = super().get_context(*args)
+        context["widget"]["options"] = self.icon_list
+        return context

nummi/main/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-25 12:05+0100\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-23 08:03+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -21,110 +21,114 @@ msgstr ""
 msgid "User"
 msgstr "Utilisateur"
 
-#: .\main\templates\main\base.html:27
+#: .\main\templates\main\base.html:28
 msgid "Skip to main content"
 msgstr "Aller au contenu principal"
 
-#: .\main\templates\main\base.html:33
+#: .\main\templates\main\base.html:35
 msgid "Home"
 msgstr "Accueil"
 
-#: .\main\templates\main\base.html:38 .\main\templates\main\index.html:40
+#: .\main\templates\main\base.html:42 .\main\templates\main\index.html:17
 msgid "Statements"
 msgstr "Relevés"
 
-#: .\main\templates\main\base.html:44 .\main\templates\main\index.html:24
+#: .\main\templates\main\base.html:49
 msgid "Transactions"
 msgstr "Transactions"
 
-#: .\main\templates\main\base.html:50
-msgid "Create account"
-msgstr "Créer un compte"
-
-#: .\main\templates\main\base.html:55
-msgid "Create statement"
-msgstr "Créer un relevé"
-
-#: .\main\templates\main\base.html:60
-msgid "Create category"
-msgstr "Créer une catégorie"
-
-#: .\main\templates\main\base.html:65
-msgid "Create transaction"
-msgstr "Créer une transaction"
-
-#: .\main\templates\main\base.html:70 .\main\templates\main\list.html:10
-#: .\main\templates\main\list.html:36
+#: .\main\templates\main\base.html:57 .\main\templates\main\list.html:10
+#: .\main\templates\main\list.html:37
 msgid "Search"
 msgstr "Rechercher"
 
-#: .\main\templates\main\base.html:73
-msgid "Log out"
-msgstr "Se déconnecter"
-
-#: .\main\templates\main\base.html:78 .\main\templates\main\form\login.html:6
-#: .\main\templates\main\login.html:14
-msgid "Log in"
-msgstr "Se connecter"
-
-#: .\main\templates\main\base.html:84
+#: .\main\templates\main\base.html:62
 #, python-format
 msgid "Logged in as <strong>%(user)s</strong>"
 msgstr "Connecté en tant que <strong>%(user)s</strong>"
 
-#: .\main\templates\main\confirm_delete.html:19
+#: .\main\templates\main\base.html:66
+msgid "Log out"
+msgstr "Se déconnecter"
+
+#: .\main\templates\main\base.html:74 .\main\templates\main\form\login.html:5
+#: .\main\templates\main\login.html:11
+msgid "Log in"
+msgstr "Se connecter"
+
+#: .\main\templates\main\confirm_delete.html:15
 #, python-format
 msgid "Are you sure you want do delete <strong>%(object)s</strong> ?"
 msgstr "Êtes-vous sûr de vouloir supprimer <strong>%(object)s</strong> ?"
 
-#: .\main\templates\main\confirm_delete.html:23
+#: .\main\templates\main\confirm_delete.html:20
 msgid "Cancel"
 msgstr "Annuler"
 
-#: .\main\templates\main\confirm_delete.html:24
+#: .\main\templates\main\confirm_delete.html:21
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: .\main\templates\main\form\fileinput.html:8
+#: .\main\templates\main\form\fileinput.html:6
 msgid "File"
 msgstr "Fichier"
 
-#: .\main\templates\main\form\form_base.html:30
-msgid "Delete"
-msgstr "Supprimer"
-
-#: .\main\templates\main\form\form_base.html:32
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: .\main\templates\main\form\form_base.html:34
+#: .\main\templates\main\form\form_base.html:46
 msgid "Create"
 msgstr "Créer"
 
-#: .\main\templates\main\form\form_base.html:36
+#: .\main\templates\main\form\form_base.html:48
 msgid "Save"
 msgstr "Enregistrer"
 
-#: .\main\templates\main\index.html:15
+#: .\main\templates\main\form\form_base.html:50
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: .\main\templates\main\form\form_base.html:52
+msgid "Delete"
+msgstr "Supprimer"
+
+#: .\main\templates\main\index.html:13
 msgid "Accounts"
 msgstr "Comptes"
 
-#: .\main\templates\main\index.html:20
-msgid "No account"
-msgstr "Aucun compte"
-
-#: .\main\templates\main\index.html:28
+#: .\main\templates\main\index.html:23
 msgid "Categories"
 msgstr "Catégories"
 
-#: .\main\templates\main\index.html:34
-msgid "No category"
-msgstr "Aucune catégorie"
+#: .\main\templates\main\index.html:29
+msgid "Create category"
+msgstr "Créer une catégorie"
 
-#: .\main\templates\main\index.html:44
+#: .\main\templates\main\index.html:34
 msgid "History"
 msgstr "Historique"
 
-#: .\main\views.py:68
+#: .\main\views.py:54
 msgid "was created successfully"
 msgstr "a été créé avec succès"
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ msgid "Balance"
+#~ msgstr "Solde"
+
+#~ msgid "Edit"
+#~ msgstr "Modifier"
+
+#~ msgid "No account"
+#~ msgstr "Aucun compte"
+
+#~ msgid "Create account"
+#~ msgstr "Créer un compte"
+
+#~ msgid "Create statement"
+#~ msgstr "Créer un relevé"
+
+#~ msgid "Create transaction"
+#~ msgstr "Créer une transaction"
+
+#~ msgid "No category"
+#~ msgstr "Aucune catégorie"

nummi/main/models.py

@@ -1,15 +1,46 @@
 from django.conf import settings
+from django.contrib.postgres.search import (
+    SearchQuery,
+    SearchRank,
+    SearchVector,
+    TrigramSimilarity,
+)
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 
-class UserModel(models.Model):
+class NummiQuerySet(models.QuerySet):
+    main_field = "name"
+    fields = dict()
+
+    def search(self, search):
+        return (
+            self.annotate(
+                rank=SearchRank(
+                    sum(
+                        (
+                            SearchVector(field, weight=weight)
+                            for field, weight in self.fields.items()
+                        ),
+                        start=SearchVector(self.main_field, weight="A"),
+                    ),
+                    SearchQuery(search, search_type="websearch"),
+                ),
+                similarity=TrigramSimilarity(self.main_field, search),
+            )
+            .filter(models.Q(rank__gte=0.1) | models.Q(similarity__gte=0.3))
+            .order_by("-rank")
+        )
+
+
+class NummiModel(models.Model):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
         verbose_name=_("User"),
         editable=False,
     )
+    objects = NummiQuerySet.as_manager()
 
     class Meta:
         abstract = True

nummi/main/static/main/css/form.css

@@ -1,62 +1,217 @@
-form ul.errorlist {
-  color: var(--red);
-  font-weight: 550;
-  list-style-type: "! ";
-  margin: 0;
+.drop-zone {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  grid-template-columns: 1fr;
+  grid-template-rows: 1fr;
+  align-items: center;
+  text-align: center;
+  color: transparent;
+  display: grid;
+  transition-property: backdrop-filter;
+  transition-duration: 750ms;
+  z-index: -1;
+
+  > span {
+    font-weight: 650;
+    font-size: 2rem;
+    transition-property: color;
+    transition-duration: inherit;
+  }
+
+  main.highlight > & {
+    z-index: 100;
+    backdrop-filter: blur(0.1rem);
+    > span {
+      color: var(--green);
+    }
+  }
 }
 
-form > table > tbody > tr > th {
-  background: var(--bg-01);
-  background-clip: padding-box;
-}
-form tbody input,
-form tbody select,
-form tbody textarea {
-  font: inherit;
-  border: none;
-  background: var(--bg);
-  width: 100%;
-  height: 100%;
-  line-height: 1.5;
-}
-form input[type="checkbox"] {
-  width: initial;
-}
-table.file-input tr {
-  border: none;
-}
-table.file-input th {
-  text-align: left;
-}
-table.file-input tr :first-child {
-  padding-left: 0;
-}
-table.file-input tr :last-child {
-  padding-right: 0;
-}
+form {
+  display: grid;
+  gap: 0.5rem;
+  grid-template-columns: repeat(auto-fill, 32rem);
+  @media (width < 1024px) {
+    grid-template-columns: 1fr;
+  }
 
-form tfoot {
-  text-align: right;
-}
-.buttons input {
-  font: inherit;
-  line-height: 1.5;
-  margin-left: var(--gap);
-  border-radius: var(--radius);
-  padding: 0 var(--gap);
-  cursor: pointer;
-}
-.buttons input:hover {
-  text-decoration: underline;
-}
-.buttons input[type="submit"] {
-  border: 0.1rem solid var(--green);
-  background: var(--green-1);
-}
-.buttons input[type="reset"] {
-  border: 0.1rem solid var(--red);
-  background: var(--red-1);
-}
-.buttons a.del {
-  color: var(--red);
+  &.hidden {
+    display: none;
+  }
+
+  .column {
+    display: grid;
+    gap: 0.5rem;
+    border: 1px solid var(--gray);
+    padding: var(--gap);
+    block-size: min-content;
+  }
+  .fieldset {
+    display: grid;
+    grid-auto-columns: 1fr;
+    grid-auto-flow: column;
+    gap: inherit;
+    padding: 0;
+    margin: 0;
+    border: none;
+  }
+
+  ul.errorlist {
+    color: var(--red);
+    font-weight: 550;
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+
+  .field {
+    display: grid;
+    grid-auto-rows: min-content;
+    align-items: center;
+    column-gap: 0.5rem;
+
+    ul.errorlist {
+      font-size: 0.8rem;
+    }
+
+    &:has(> textarea) {
+      grid-template-rows: min-content 1fr;
+      textarea {
+        resize: block;
+      }
+    }
+    &:has(> input[type="checkbox"]) {
+      grid-template-columns: min-content 1fr;
+      > label {
+        font-size: inherit;
+        grid-row: 1;
+        grid-column: 2;
+        padding: 0.5rem;
+        line-height: initial;
+      }
+      > input {
+        grid-row: 1;
+        grid-column: 1;
+        margin: 0.5rem;
+      }
+      &:has(> :focus) {
+        background: var(--bg-1);
+      }
+    }
+
+    > label {
+      font-size: 0.8rem;
+      line-height: 0.8rem;
+      z-index: 10;
+    }
+
+    > a {
+      padding: 0.5rem;
+    }
+
+    input,
+    select,
+    textarea {
+      font: inherit;
+      line-height: initial;
+      border: none;
+      border: 1px solid transparent;
+      border-bottom: 1px solid var(--gray);
+      background: none;
+      z-index: 1;
+      padding: 0.5rem;
+
+      &:has(~ ul.errorlist) {
+        border-color: var(--red);
+      }
+      &.autocompleted:not(.mod) {
+        border-bottom-color: var(--green);
+      }
+
+      &:not([type="checkbox"]) {
+        width: 100%;
+        margin: 0;
+      }
+
+      &[name*="value"] {
+        text-align: right;
+        font-feature-settings: var(--num);
+      }
+      &[name*="date"] {
+        font-feature-settings: var(--num);
+      }
+
+      &:focus {
+        outline: none;
+        background: var(--bg-1);
+      }
+    }
+
+    > .file-input {
+      display: grid;
+
+      > .current {
+        display: grid;
+        grid-template-columns: 1fr;
+        grid-auto-columns: max-content;
+        grid-auto-flow: column;
+        a {
+          padding: 0.5rem;
+        }
+      }
+
+      input[type="file"] {
+        &::file-selector-button {
+          display: none;
+        }
+      }
+    }
+    > .ico-input {
+      display: grid;
+      grid-template-columns: min-content 1fr;
+      column-gap: 0.5rem;
+      align-items: center;
+      span[class|="ri"] {
+        padding: 0.5rem;
+      }
+
+      &:has(> :focus) {
+        background: var(--bg-1);
+      }
+    }
+  }
+  .buttons {
+    grid-column: 1 / -1;
+    line-height: 2rem;
+    input,
+    a {
+      font: inherit;
+      cursor: pointer;
+      padding: 0 var(--gap);
+      border: var(--gray) 1px solid;
+      margin-right: 0.5rem;
+      margin-bottom: 0.5rem;
+      color: inherit;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+
+    input[type="submit"] {
+      background: var(--green-1);
+      border-color: var(--green);
+    }
+    input[type="reset"] {
+      background: var(--bg-1);
+    }
+    a.del {
+      color: var(--red);
+      border-color: var(--red);
+      border-style: dashed;
+    }
+  }
 }

nummi/main/static/main/css/main.css

@@ -1,4 +1,5 @@
 @import "https://rsms.me/inter/inter.css";
+@import "https://cdn.jsdelivr.net/npm/remixicon@4.5.0/fonts/remixicon.css";
 
 *,
 *::before,
@@ -23,7 +24,7 @@
   --bg-inv: var(--theme-1);
   --text-inv: #ffffffde;
 
-  --bg-01: #f0f0f0;
+  --bg-1: #f0f0f0;
 
   --text-green: #296629;
   --text-link: var(--text-green);
@@ -39,7 +40,8 @@
   --border: 0.5em;
   --radius: 0.25em;
 
-  --num: "tnum", "ss01", "ss02", "case";
+  --default-ffs: "dlig", "ss01", "ss04";
+  --num: var(--default-ffs), "tnum", "case";
 }
 
 body {
@@ -51,6 +53,7 @@ body {
 
   display: grid;
   grid-template-columns: max-content 1fr;
+  font-feature-settings: var(--default-ffs);
 }
 
 p {
@@ -60,9 +63,10 @@ a {
   color: var(--text-link);
   text-decoration: none;
   display: inline-block;
-}
-a:hover {
-  text-decoration: underline;
+
+  &:is(:hover, :focus) {
+    text-decoration: underline;
+  }
 }
 
 .red {
@@ -77,12 +81,33 @@ a:hover {
 main,
 nav,
 footer {
-  padding: 2rem;
+  padding: 2rem 1rem;
+  @media (width > 720px) {
+    padding: 2rem;
+  }
+  background: var(--bg);
 }
 main {
+  position: relative;
   grid-column: 2;
   grid-row: 1;
   overflow-x: hidden;
+  h2.new {
+    opacity: 0.8;
+  }
+
+  .split {
+    display: grid;
+    gap: var(--gap);
+    grid-template-columns: 100%;
+    @media (width > 720px) {
+      grid-template-columns: minmax(20rem, max-content) 1fr;
+    }
+
+    & > section > :first-child {
+      margin-top: 0;
+    }
+  }
 }
 nav {
   grid-column: 1;
@@ -93,40 +118,48 @@ nav {
   top: 0;
   overflow-y: auto;
 
-  background: var(--bg-01);
+  background: var(--bg-1);
   line-height: 2rem;
+
+  h1 img {
+    height: 1cap;
+  }
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    position: relative;
+  }
+  a {
+    &.skip-link {
+      font-weight: 300;
+
+      &:is(:active, :focus) {
+        font-weight: 500;
+      }
+    }
+    display: grid;
+    grid-template-columns: 1fr max-content;
+    align-items: baseline;
+
+    [class^="ri-"] {
+      height: 1.5em;
+      width: 1.5em;
+      line-height: 1.5em;
+      border-radius: var(--radius);
+    }
+
+    &.cur {
+      font-weight: 550;
+      [class^="ri-"] {
+        background: var(--text-link);
+        color: var(--bg);
+      }
+    }
+  }
 }
-nav h1 img {
-  height: 1cap;
-}
-nav ul {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-  position: relative;
-}
-nav .skip-link {
-  opacity: 0.8;
-  font-weight: 300;
-}
-nav .skip-link:active,
-nav .skip-link:focus {
-  opacity: initial;
-  font-weight: 500;
-}
-nav a {
-  display: block;
-}
-nav a.cur {
-  font-weight: 550;
-}
-nav a.cur::after {
-  content: "◎";
-  position: absolute;
-  right: 0;
-}
-nav > :first-child,
-main > :first-child {
+:is(nav, main) > :first-child,
+main > section:first-child > :first-child {
   margin-top: 0;
 }
 footer {
@@ -135,16 +168,46 @@ footer {
   font-weight: 250;
 }
 
-#pagination {
+.pagination {
   text-align: center;
   font-feature-settings: var(--num);
-}
-#pagination a {
-  width: 2rem;
-}
-#pagination a.cur {
-  font-weight: 650;
-  text-decoration: underline dotted;
+
+  a {
+    min-width: 1rem;
+    padding: 0 0.5rem;
+
+    &.cur {
+      font-weight: 650;
+      text-decoration: underline dotted;
+
+      &:is(:hover, :focus) {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  @media (width > 720px) {
+    &.n3 {
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      width: max-content;
+      margin: 0.5rem auto;
+
+      .prev {
+        grid-column: 1;
+      }
+      .cur {
+        grid-column: 2;
+      }
+      .next {
+        grid-column: 3;
+      }
+    }
+  }
+
+  & + section :first-child {
+    margin-top: 0;
+  }
 }
 
 @media (width < 1024px) {
@@ -160,15 +223,38 @@ footer {
     height: initial;
   }
 }
-
-a.big-link {
-  margin-right: 1em;
-}
-a.big-link [class^="ri-"] {
-  margin-right: 0.5em;
-}
 [class^="ri-"] {
+  display: inline-block;
+  text-align: center;
   font-weight: normal;
+
+  &.green,
+  &.red,
+  &.white {
+    &.green {
+      background: var(--green);
+      color: var(--bg);
+    }
+    &.red {
+      background: var(--red);
+      color: var(--bg);
+    }
+    &.white {
+      background: var(--bg-1);
+    }
+    border-radius: var(--radius);
+    height: 1.5em;
+    width: 1.5em;
+    line-height: 1.5em;
+  }
+
+  a:not(.i) &,
+  .wi &,
+  h2 & {
+    &:first-child::after {
+      content: "\2002";
+    }
+  }
 }
 
 h1,
@@ -188,9 +274,6 @@ h2 {
 h3 {
   font-size: 1.5rem;
 }
-main h2.new {
-  opacity: 0.8;
-}
 p {
   margin: 0.5em 0;
 }
@@ -199,20 +282,291 @@ ul.messages {
   font-weight: 550;
   list-style-type: none;
   margin: 0;
-  background: var(--bg-01);
+  margin-bottom: var(--gap);
+  background: var(--bg-1);
   padding: 0;
-}
-ul.messages li {
-  padding: calc(var(--gap) / 2) var(--gap);
-  border-left: var(--border) solid var(--gray);
+
+  li {
+    --message-color: var(--text);
+    padding: calc(var(--gap) / 2) var(--gap);
+    border-left: var(--message-color) solid var(--border);
+
+    [class^="ri-"] {
+      height: 1.5em;
+      width: 1.5em;
+      line-height: 1.5em;
+      border-radius: var(--radius);
+      background: var(--message-color);
+      color: var(--bg);
+      margin-right: 0.5rem;
+    }
+
+    &.msg-level-20 {
+      --message-color: var(--green);
+    }
+    &.msg-level-25 {
+      --message-color: var(--green-1);
+    }
+    &.msg-level-30 {
+      --message-color: var(--red-1);
+    }
+    &.msg-level-40 {
+      --message-color: var(--red);
+    }
+  }
 }
 
-ul.messages li.msg-level-25 {
-  border-left-color: var(--green-1);
+.backlinks {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+
+  p {
+    grid-column: 1;
+
+    &.back {
+      grid-column: 2;
+      text-align: right;
+
+      a {
+        margin-right: 0;
+        margin-left: 1em;
+        [class^="ri-"] {
+          margin-right: 0em;
+          margin-left: 0.5em;
+        }
+      }
+    }
+  }
 }
-ul.messages li.msg-level-30 {
-  border-left-color: var(--red-1);
+
+dl.accounts {
+  margin: 0;
+
+  dt,
+  dd {
+    margin: 0;
+  }
+  .account {
+    padding: 0.5rem;
+    margin-bottom: 0.5rem;
+    border: 1px solid var(--gray);
+
+    display: grid;
+    grid-template-columns: 1fr min-content;
+    &.new,
+    &.more {
+      border-style: dashed;
+    }
+    &.more label {
+      display: block;
+    }
+  }
+  &:not(.show-archive) .account.archived {
+    display: none;
+  }
 }
-ul.messages li.msg-level-40 {
-  border-left-color: var(--red);
+
+ul.statements,
+ul.invoices {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+  grid-auto-rows: 1fr;
+  gap: 0.5rem;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+
+  li {
+    display: grid;
+    gap: 0.5rem;
+    padding: var(--gap);
+    border: var(--gray) 1px solid;
+    text-align: right;
+    align-items: center;
+
+    > * {
+      &.title {
+        font-weight: 650;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    &.new,
+    &.more {
+      border-style: dashed;
+    }
+  }
+}
+
+ul.statements {
+  li {
+    > * {
+      display: grid;
+      align-items: center;
+
+      &.date :first-child {
+        font-size: 2rem;
+      }
+      &.value :first-child {
+        font-weight: 650;
+      }
+      &.icon {
+        span {
+          margin: auto;
+        }
+      }
+      &.account a {
+        overflow: hidden;
+        text-overflow: ".";
+        white-space: nowrap;
+      }
+    }
+  }
+}
+
+ul.invoices {
+  grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
+}
+
+.statement-details {
+  display: grid;
+  @media (width > 720px) {
+    grid-template-columns: repeat(3, min-content);
+  }
+  gap: var(--gap);
+  align-items: center;
+
+  > span.evolution {
+    display: grid;
+    grid-auto-rows: min-content;
+    > span[class^="ri-"] {
+      font-size: 2rem;
+    }
+    > span.value {
+      text-align: right;
+    }
+  }
+  > span.start,
+  > span.end,
+  > span.file,
+  > span.incons {
+    display: grid;
+    border: var(--gray) 1px solid;
+    padding: var(--gap);
+
+    &.file,
+    &.incons {
+      grid-column: 1 / -1;
+    }
+    &.incons {
+      border-color: var(--red);
+      grid-template-columns: min-content 1fr;
+      grid-auto-flow: column;
+      align-items: center;
+      gap: 0.5rem;
+
+      > .ds {
+        display: grid;
+        grid-auto-rows: min-content;
+      }
+      .value {
+        text-align: right;
+      }
+      .diff {
+        font-weight: 650;
+      }
+      .sum {
+        text-decoration: line-through;
+      }
+      .links {
+        grid-column: 1 / -1;
+        grid-row: 2;
+        display: grid;
+        gap: inherit;
+        a {
+          color: var(--red);
+        }
+      }
+    }
+
+    > .date {
+      text-align: right;
+    }
+    > .value {
+      font-size: 2rem;
+    }
+  }
+}
+
+.multilink {
+  display: grid;
+  grid-auto-columns: max-content;
+}
+
+.transaction-details {
+  display: grid;
+  grid-auto-columns: minmax(1fr, max-content);
+  grid-auto-rows: min-content;
+
+  max-width: 32rem;
+
+  ul {
+    list-style: none;
+    display: grid;
+
+    li.value {
+      font-size: 1.5rem;
+      text-align: right;
+    }
+  }
+
+  p.description,
+  ul {
+    border: var(--gray) 1px solid;
+    padding: var(--gap);
+  }
+}
+
+.category,
+.big-link {
+  padding: 0 var(--gap);
+  border: var(--gray) 1px solid;
+  margin-right: 0.5rem;
+  margin-bottom: 0.5rem;
+
+  &.add {
+    border-style: dashed;
+  }
+}
+
+.date,
+.value {
+  font-feature-settings: var(--num);
+}
+
+details {
+  border: var(--gray) 1px solid;
+  margin-bottom: var(--gap);
+
+  summary {
+    font-weight: 650;
+    cursor: pointer;
+    padding: var(--gap);
+
+    &::marker {
+      content: "\ed27\2002";
+      font-family: remixicon;
+      font-weight: initial;
+    }
+  }
+
+  &[open] summary {
+    background: var(--bg-1);
+  }
+
+  form {
+    padding: var(--gap);
+  }
 }

nummi/main/static/main/css/plot.css

@@ -1,76 +1,123 @@
 table.full-width col.bar {
   width: auto;
 }
+
 .plot {
   overflow-x: auto;
-}
 
-.plot td.bar {
-  position: relative;
-  padding: 0;
-}
-.plot td.bar div {
-  position: absolute;
-  height: 0.5rem;
-  top: 0;
-}
+  table {
+    min-width: 40rem;
+  }
 
-.plot td.bar div:not(.tot) {
-  width: 0;
-  box-sizing: border-box;
-  z-index: 1;
-  display: inline-block;
-}
-.plot td.bar.p div {
-  left: 0;
-  border-radius: 0 var(--radius) var(--radius) 0;
-}
-.plot td.bar.m div {
-  right: 0;
-  border-radius: var(--radius) 0 0 var(--radius);
-}
-.plot td.bar.m div {
-  background: var(--red-1);
-}
-.plot td.bar.p div {
-  background: var(--green-1);
-}
-
-.plot td.bar div.tot {
-  z-index: 10;
-  height: 0.5rem;
-}
-.plot td.bar.m div.tot {
-  background: var(--red);
-}
-.plot td.bar.p div.tot {
-  background: var(--green);
-}
-.plot td.bar div.tot span {
-  position: absolute;
-  display: inline-block;
-  white-space: nowrap;
-  margin: 0 var(--gap);
-  font-weight: 650;
-  top: 0.5rem;
-  line-height: 1.5rem;
-  height: 1.5rem;
-  font-feature-settings: var(--num);
-}
-.plot td.bar.p div.tot span {
-  left: 0;
-}
-.plot td.bar.m div.tot span {
-  right: 0;
-}
-
-@media (width < 720px) {
-  .plot .bar {
-    width: 0;
+  td.bar {
+    position: relative;
+    padding: 0;
     overflow: hidden;
+
+    div {
+      position: absolute;
+      height: 0.5rem;
+      top: 0;
+      &:not(.tot) {
+        width: 0;
+        box-sizing: border-box;
+        z-index: 1;
+        display: inline-block;
+      }
+      &.tot {
+        z-index: 10;
+        height: 0.5rem;
+
+        span {
+          position: absolute;
+          display: inline-block;
+          white-space: nowrap;
+          margin: 0 var(--gap);
+          font-weight: 650;
+          top: 0.5rem;
+          line-height: 1.5rem;
+          height: 1.5rem;
+          font-feature-settings: var(--num);
+        }
+      }
+    }
+    &.p div {
+      left: 0;
+      border-radius: 0 var(--radius) var(--radius) 0;
+      background: var(--green-1);
+      &.tot {
+        background: var(--green);
+
+        span {
+          left: 0;
+        }
+      }
+    }
+    &.m div {
+      right: 0;
+      border-radius: var(--radius) 0 0 var(--radius);
+      background: var(--red-1);
+      &.tot {
+        background: var(--red);
+
+        span {
+          right: 0;
+        }
+      }
+    }
+  }
+
+  &.history tbody tr {
+    background: initial;
+  }
+  tbody tr {
+    &.empty {
+      height: 0.5rem;
+    }
+    &.even {
+      background: #eeeeff;
+    }
   }
 }
 
-.plot tfoot {
-  background: var(--bg-01);
+.calendar {
+  overflow-x: auto;
+
+  margin-bottom: var(--gap);
+  font-feature-settings: var(--num);
+
+  table {
+    tbody tr {
+      background: initial;
+      &:not(:last-child) {
+        border-bottom: none;
+      }
+      &:not(:first-child) {
+        border-top: none;
+      }
+
+      td.month {
+        text-align: center;
+        background-color: color-mix(
+          in hsl,
+          var(--td-bg, var(--bg)) var(--opacity),
+          var(--bg)
+        );
+        padding: 0;
+        width: 4rem;
+        height: 4rem;
+        &.p {
+          --td-bg: var(--green);
+        }
+        &.m {
+          --td-bg: var(--red);
+        }
+      }
+      td.total {
+        text-align: right;
+        font-weight: 650;
+        font-feature-settings: var(--num);
+      }
+    }
+  }
 }

nummi/main/static/main/css/table.css

@@ -1,54 +1,59 @@
-.table,
-form {
+.table {
   overflow-x: auto;
+  width: 100%;
 }
 table {
   border-collapse: collapse;
-}
-table.more tbody:last-child tr:last-child {
-  border-bottom: 0.1rem dashed var(--gray);
-}
-table.full-width {
-  width: 100%;
-}
-thead {
-  background: var(--bg-01);
-}
-table.full-width col {
-  width: 8rem;
-}
-table col.icon {
-  width: 1ch;
-}
-tr {
-  border: 0.1rem solid var(--gray);
-  height: 2rem;
-  line-height: 2rem;
-}
-td,
-th {
-  padding: 0 var(--gap);
-  position: relative;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.date,
-.value {
-  font-feature-settings: var(--num);
-}
-.l {
-  text-align: left;
-}
-.r,
-.value {
-  text-align: right;
-}
-.c,
-.date {
-  text-align: center;
-}
-td.empty {
-  text-align: center;
-  opacity: 0.8;
-  font-weight: 300;
+
+  &.full-width {
+    width: 100%;
+
+    col {
+      width: 8rem;
+    }
+  }
+  col.icon {
+    width: 1ch;
+  }
+  thead tr:not(.new) {
+    background: var(--bg-1);
+  }
+  tr {
+    border: 1px solid var(--gray);
+    height: 2rem;
+    line-height: 2rem;
+
+    tbody &:where(:nth-of-type(even)) {
+      background: #eeeeff;
+    }
+    &.more,
+    &.new {
+      text-align: center;
+      border-style: dashed;
+    }
+  }
+  td,
+  th {
+    padding: 0 var(--gap);
+    position: relative;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    &.empty {
+      text-align: center;
+      opacity: 0.8;
+      font-weight: 300;
+    }
+  }
+
+  .l {
+    text-align: left;
+  }
+  .r,
+  .value {
+    text-align: right;
+  }
+  .c,
+  .date {
+    text-align: center;
+  }
 }

nummi/main/static/main/js/base.js

@@ -0,0 +1,181 @@
+const beforeUnloadHandler = (event) => {
+  event.preventDefault();
+};
+
+const forms = document.querySelectorAll("form");
+
+for (let form of forms) {
+  let inputs = form.querySelectorAll("input");
+  for (input of inputs) {
+    input.addEventListener("input", (event) => {
+      window.addEventListener("beforeunload", beforeUnloadHandler);
+    });
+  }
+
+  form.addEventListener("submit", (event) => {
+    window.removeEventListener("beforeunload", beforeUnloadHandler);
+  });
+  form.addEventListener("reset", (event) => {
+    window.removeEventListener("beforeunload", beforeUnloadHandler);
+  });
+
+  let categorySelect = form.querySelector(".category-select");
+  if (categorySelect) {
+    let input = categorySelect.querySelector("select");
+    let icon = categorySelect.querySelector("span");
+    let icons = JSON.parse(input.dataset.icons);
+
+    function setIcon(event) {
+      icon.className = `ri-${icons[input.value] || "folder"}-line`;
+    }
+    setIcon();
+    input.addEventListener("input", setIcon);
+    form.addEventListener("reset", (event) => {
+      setTimeout(setIcon, 0);
+    });
+  }
+  let accountSelect = form.querySelector(".account-select");
+  if (accountSelect) {
+    let input = accountSelect.querySelector("select");
+    let icon = accountSelect.querySelector("span");
+    let icons = JSON.parse(input.dataset.icons);
+
+    function setIcon(event) {
+      icon.className = `ri-${icons[input.value] || "bank"}-line`;
+    }
+    setIcon();
+    input.addEventListener("input", setIcon);
+    form.addEventListener("reset", (event) => {
+      setTimeout(setIcon, 0);
+    });
+  }
+
+  let iconSelect = form.querySelector(".icon-select");
+  if (iconSelect) {
+    let input = iconSelect.querySelector("input");
+    let icon = iconSelect.querySelector("span");
+    let icons = Array.from(iconSelect.querySelector("datalist").options).map(
+      (opt) => opt.value,
+    );
+
+    function setIcon(event) {
+      icon.className = `ri-${
+        icons.includes(input.value) ? input.value : "square"
+      }-line`;
+    }
+    setIcon();
+    input.addEventListener("input", setIcon);
+    form.addEventListener("reset", (event) => {
+      setTimeout(setIcon, 0);
+    });
+  }
+
+  let ac_json = form.querySelector("#autocomplete");
+  if (ac_json) {
+    let autocomplete_data = JSON.parse(ac_json.textContent);
+    let fields = form.querySelectorAll("[name]");
+    function clearMod(event) {
+      event.target.classList.add("mod");
+      event.target.removeEventListener("input", clearMod);
+    }
+    function setMod() {
+      for (let f of fields) {
+        f.addEventListener("input", clearMod);
+      }
+    }
+    setMod();
+    form.addEventListener("reset", (event) => {
+      for (let f of fields) {
+        f.classList.remove("mod", "autocompleted");
+      }
+      setMod();
+    });
+
+    let old_values = [];
+
+    let field = form.querySelector(`[name="${autocomplete_data.field}"]`);
+    field.addEventListener("change", (event) => {
+      if (field.value in autocomplete_data.data) {
+        old_values = [];
+        for (let comp of autocomplete_data.data[field.value]) {
+          let f = form.querySelector(`[name="${comp.field}"]`);
+          if (!f.classList.contains("mod")) {
+            old_values.push({ field: f, value: f.value });
+
+            f.value = comp.value;
+            f.dispatchEvent(new Event("input"));
+            f.animate([{ borderColor: "var(--green)" }, {}], 750);
+            f.classList.remove("mod");
+            f.classList.add("autocompleted");
+            f.addEventListener("input", clearMod);
+            function ccAutocomplete(event) {
+              document.removeEventListener("keyup", cancelAutocomplete);
+              for (comp of old_values) {
+                comp.field.removeEventListener("input", ccAutocomplete);
+              }
+            }
+            f.addEventListener("input", ccAutocomplete);
+          }
+        }
+        function cancelAutocomplete(event) {
+          if (event.code == "Escape") {
+            for (comp of old_values) {
+              let f = comp.field;
+              f.value = comp.value;
+              f.dispatchEvent(new Event("input"));
+              f.animate([{ borderColor: "var(--red)" }, {}], 750);
+              f.classList.remove("mod");
+              f.classList.remove("autocompleted");
+              f.addEventListener("input", clearMod);
+            }
+            document.removeEventListener("keyup", cancelAutocomplete);
+          }
+        }
+        document.addEventListener("keyup", cancelAutocomplete);
+        form.addEventListener("reset", (event) => {
+          document.removeEventListener("keyup", cancelAutocomplete);
+        });
+      }
+    });
+  }
+}
+
+let accounts = document.querySelector("dl.accounts");
+if (accounts) {
+  let toggle = accounts.querySelector("input#show-archived-accounts");
+  if (toggle) {
+    accounts.classList.toggle("show-archive", toggle.checked);
+    toggle.addEventListener("change", (event) => {
+      accounts.classList.toggle("show-archive", toggle.checked);
+    });
+  }
+}
+
+const filterForm = document.querySelector("form.filter");
+if (filterForm) {
+  const accountSelect = filterForm.querySelector("[name='account']");
+  const statementSelect = filterForm.querySelector("[name='statement']");
+  if (!statementSelect.disabled) {
+    accountSelect.addEventListener("input", (event) => {
+      statementSelect.value = "";
+      statementSelect.disabled = true;
+    });
+    filterForm.addEventListener("reset", (event) => {
+      statementSelect.disabled = false;
+    });
+  }
+  let disableStatement = false;
+  filterForm.addEventListener("submit", (event) => {
+    for (element of filterForm.elements) {
+      if (
+        element.value == "" ||
+        (disableStatement && element.name == "statement")
+      ) {
+        if (element.name == "account") {
+          disableStatement = true;
+        }
+        element.disabled = true;
+      }
+    }
+  });
+}

nummi/main/templates/main/base.html

@@ -1,99 +1,96 @@
 {% load static %}
 {% load i18n %}
+{% load main_extras %}
 <!DOCTYPE html>
 <html lang="fr">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
-        <title>
-            {% block title %}Nummi{% endblock %}
-        </title>
-        {% block link %}
-            <link rel="icon" href="{% static "main/svg/logo.svg" %}" type="image/svg+xml" />
-            <link rel="stylesheet" href="{% static "main/css/main.css" %}" type="text/css" />
-            <link rel="stylesheet" href="{% static "main/remixicon/remixicon.css" %}" type="text/css" />
-        {% endblock %}
-    </head>
-    <body>
-        {% block nav %}
-            {% spaceless %}
-                <nav>
-                    <h1>
-                        <img src="{% static "main/svg/logo.svg" %}" alt="" />
-                        Nummi
-                    </h1>
-                    <ul>
-                        <li>
-                            <a class="skip-link" href="#main">{% translate "Skip to main content" %}</a>
-                        </li>
-                        {% if user.is_authenticated %}
-                            <li>
-                                <a href="{% url "index" %}"
-                                   class="home{% if request.resolver_match.url_name == "index" %} cur{% endif %}"
-                                   accesskey="h">{% translate "Home" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "statements" %}"
-                                   class="{% if request.resolver_match.url_name == "statements" %}cur{% endif %}">
-                                    {% translate "Statements" %}
-                                </a>
-                            </li>
-                            <li>
-                                <a href="{% url "transactions" %}"
-                                   class="{% if request.resolver_match.url_name == "transactions" %}cur{% endif %}">
-                                    {% translate "Transactions" %}
-                                </a>
-                            </li>
-                            <li>
-                                <a href="{% url "new_account" %}"
-                                   class="{% if request.resolver_match.url_name == "new_account" %}cur{% endif %}"
-                                   accesskey="a">{% translate "Create account" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "new_statement" %}"
-                                   class="{% if request.resolver_match.url_name == "new_statement" %}cur{% endif %}"
-                                   accesskey="s">{% translate "Create statement" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "new_category" %}"
-                                   class="{% if request.resolver_match.url_name == "new_category" %}cur{% endif %}"
-                                   accesskey="c">{% translate "Create category" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "new_transaction" %}"
-                                   class="{% if request.resolver_match.url_name == "new_transaction" %}cur{% endif %}"
-                                   accesskey="t">{% translate "Create transaction" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "search" %}"
-                                   class="{% if request.resolver_match.url_name == "search" %}cur{% endif %}"
-                                   accesskey="r">{% translate "Search" %}</a>
-                            </li>
-                            <li>
-                                <a href="{% url "logout" %}" accesskey="l">{% translate "Log out" %}</a>
-                            </li>
-                        {% else %}
-                            <li>
-                                <a {% if request.resolver_match.url_name == "login" %}class="cur"{% endif %}
-                                   href="{% url "login" %}">{% translate "Log in" %}</a>
-                            </li>
-                        {% endif %}
-                    </ul>
-                    {% if user.is_authenticated %}
-                        <p>
-                            {% blocktranslate %}Logged in as <strong>{{ user }}</strong>{% endblocktranslate %}
-                        </p>
-                    {% endif %}
-                </nav>
-            {% endspaceless %}
-        {% endblock %}
-        <main id="main">
-            {% if messages %}
-                <ul class="messages">
-                    {% for message in messages %}<li class="msg-level-{{ message.level }}">{{ message }}</li>{% endfor %}
-                </ul>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>
+      {% block title %}Nummi{% endblock %}
+    </title>
+    {% block link %}
+      <link rel="icon" href="{% static "main/svg/logo.svg" %}" type="image/svg+xml">
+      {% css "main/css/main.css" %}
+      {% js "main/js/base.js" %}
+    {% endblock %}
+  </head>
+  <body>
+    {% block nav %}
+      {% spaceless %}
+        <nav>
+          <h1>
+            <img src="{% static "main/svg/logo.svg" %}" alt="">
+            Nummi
+          </h1>
+          <ul>
+            <li>
+              <a class="skip-link" href="#main">{% translate "Skip to main content" %}</a>
+            </li>
+            {% if user.is_authenticated %}
+              <li>
+                <a href="{% url "index" %}"
+                   class="home{% if request.resolver_match.url_name == "index" %} cur{% endif %}"
+                   accesskey="h">
+                  <span>{% translate "Home" %}</span>
+                  {{ "home"|remix }}
+                </a>
+              </li>
+              <li>
+                <a href="{% url "statements" %}"
+                   class="{% if request.resolver_match.url_name == "statements" %}cur{% endif %}">
+                  <span>{% translate "Statements" %}</span>
+                  {{ "file"|remix }}
+                </a>
+              </li>
+              <li>
+                <a href="{% url "transactions" %}"
+                   class="{% if request.resolver_match.url_name == "transactions" %}cur{% endif %}">
+                  <span>{% translate "Transactions" %}</span>
+                  {{ "receipt"|remix }}
+                </a>
+              </li>
+              <li>
+                <a href="{% url "search" %}"
+                   class="{% if request.resolver_match.url_name == "search" %}cur{% endif %}"
+                   accesskey="r">
+                  <span>{% translate "Search" %}</span>
+                  {{ "search"|remix }}
+                </a>
+              </li>
+              <li>
+                {% blocktranslate %}Logged in as <strong>{{ user }}</strong>{% endblocktranslate %}
+              </li>
+              <li>
+                <a href="{% url "logout" %}" accesskey="l">
+                  <span>{% translate "Log out" %}</span>
+                  {{ "close-circle"|remix }}
+                </a>
+              </li>
+            {% else %}
+              <li>
+                <a {% if request.resolver_match.url_name == "login" %}class="cur"{% endif %}
+                   href="{% url "login" %}">
+                  <span>{% translate "Log in" %}</span>
+                  {{ "user"|remix }}
+                </a>
+              </li>
             {% endif %}
-            {% block body %}{% endblock %}
-        </main>
-    </body>
+          </ul>
+        </nav>
+      {% endspaceless %}
+    {% endblock %}
+    <main id="main">
+      {% if messages %}
+        <ul class="messages">
+          {% for message in messages %}
+            <li class="msg-level-{{ message.level }}">
+              {{ message.level|messageicon }}{{ message }}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endif %}
+      {% block body %}{% endblock %}
+    </main>
+  </body>
 </html>

nummi/main/templates/main/confirm_delete.html

@@ -3,26 +3,23 @@
 {% load main_extras %}
 {% load i18n %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/form.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
+  {{ block.super }}
+  {% css "main/css/form.css" %}
+  {% css "main/css/table.css" %}
 {% endblock %}
 {% block body %}
-    {% spaceless %}
-        <form method="post">
-            {% csrf_token %}
-            <p>
-                {% blocktranslate %}Are you sure you want do delete <strong>{{ object }}</strong> ?{% endblocktranslate %}
-            </p>
-            {{ form }}
-            <div class="buttons">
-                <a href="{{ object.get_absolute_url }}">{% translate "Cancel" %}</a>
-                <input class="del" type="submit" value="{% translate "Confirm" %}" />
-            </div>
-        </form>
-    {% endspaceless %}
+  {% spaceless %}
+    <form method="post">
+      {% csrf_token %}
+      <p>
+        {% blocktranslate %}Are you sure you want do delete <strong>{{ object }}</strong> ?{% endblocktranslate %}
+      </p>
+      {% block additionalinfo %}{% endblock %}
+      {{ form }}
+      <div class="buttons">
+        <a href="{{ object.get_absolute_url }}">{% translate "Cancel" %}</a>
+        <input class="del" type="submit" value="{% translate "Confirm" %}" />
+      </div>
+    </form>
+  {% endspaceless %}
 {% endblock %}

nummi/main/templates/main/form/base.html

@@ -3,42 +3,38 @@
 {% load main_extras %}
 {% load i18n %}
 {% block title %}
-    {% if form.instance|adding %}
-        {% block title_new %}{% endblock %}
-    {% else %}
-        {{ form.instance }}
-    {% endif %}
-    – Nummi
+  {% if form.instance|adding %}
+    {% block title_new %}{% endblock %}
+  {% else %}
+    {{ form.instance }}
+  {% endif %}
+  – Nummi
 {% endblock %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/form.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/plot.css' %}"
-          type="text/css" />
+  {{ block.super }}
+  {% css "main/css/form.css" %}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
 {% endblock %}
 {% block body %}
-    {% with instance=form.instance %}
-        {% if instance|adding %}
-            <h2 class="new">
-                {% block h2_new %}{% endblock %}
-            </h2>
-        {% else %}
-            <h2>
-                {% block h2 %}{{ instance }}{% endblock %}
-            </h2>
-        {% endif %}
-        {% block pre %}{% endblock %}
-        <form method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            {% if instance|adding %}<input hidden name="next" value="{{ request.path }}" />{% endif %}
-            {{ form }}
-        </form>
-        {% block tables %}{% endblock %}
-    {% endwith %}
+  {% with instance=form.instance %}
+    {% if instance|adding %}
+      <h2 class="new">
+        {% block h2_new %}{% endblock %}
+      </h2>
+    {% else %}
+      <h2>
+        {% block h2 %}{{ instance }}{% endblock %}
+      </h2>
+    {% endif %}
+    {% block pre %}{% endblock %}
+    <form method="post" enctype="multipart/form-data">
+      {% csrf_token %}
+      {% if instance|adding %}
+        <input hidden name="next" value="{{ request.path }}">
+      {% endif %}
+      {{ form }}
+    </form>
+    {% block tables %}{% endblock %}
+  {% endwith %}
 {% endblock %}

nummi/main/templates/main/form/fileinput.html

@@ -1,36 +1,21 @@
 {% load i18n %}
 {% load main_extras %}
-<table class="file-input">
-    {% if widget.is_initial %}
-        <tr>
-            <th>{{ widget.initial_text }}</th>
-            <td>
-                <a href="{{ widget.value.url }}">{% translate "File" %} [{{ widget.value|extension }}]</a>
-            </td>
-        </tr>
-        {% if not widget.required %}
-            <tr>
-                <th>
-                    <label for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</label>
-                </th>
-                <td>
-                    <input type="checkbox"
-                           name="{{ widget.checkbox_name }}"
-                           id="{{ widget.checkbox_id }}"
-                           {% if widget.attrs.disabled %}disabled{% endif %}>
-                </td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{{ widget.input_text }}</th>
-            <td>
-            {% else %}
-                <tr>
-                    <td colspan="2">
-                    {% endif %}
-                    <input type="{{ widget.type }}"
-                           name="{{ widget.name }}"
-                           {% include "django/forms/widgets/attrs.html" %}>
-                </td>
-            </tr>
-        </table>
+<div class="file-input">
+  {% if widget.is_initial %}
+    <div class="current">
+      <a href="{{ widget.value.url }}" target="_blank">{{ "file"|remix }}{% translate "File" %} [{{ widget.value|extension }}]</a>
+      {% if not widget.required %}
+        <span class="field checkbox">
+          <label for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</label>
+          <input type="checkbox"
+                 name="{{ widget.checkbox_name }}"
+                 id="{{ widget.checkbox_id }}"
+                 {% if widget.attrs.disabled %}disabled{% endif %}>
+        </span>
+      {% endif %}
+    </div>
+  {% endif %}
+  <input type="{{ widget.type }}"
+         name="{{ widget.name }}"
+         {% include "django/forms/widgets/attrs.html" %}>
+</div>

nummi/main/templates/main/form/form_base.html

@@ -1,43 +1,56 @@
 {% load i18n %}
 {% load main_extras %}
 {% block fields %}
-    {% if form.non_field_errors %}
-        <ul class='errorlist'>
-            {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
-        </ul>
-    {% endif %}
-    <table>
-        <tbody>
-            {% for field in form %}
+  {% if form.autocomplete %}{{ form.autocomplete|json_script:"autocomplete" }}{% endif %}
+  {% if form.non_field_errors %}
+    <ul class="errorlist">
+      {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+    </ul>
+  {% endif %}
+  {% if form.fieldsets %}
+    {% for group in form.fieldsets %}
+      <div class="column">
+        {% for fieldset in group %}
+          <div class="fieldset">
+            {% for field in fieldset %}
+              <div class="field">
+                <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+                {{ field }}
                 {% if field.errors %}
-                    <tr>
-                        <td colspan="2">{{ field.errors }}</td>
-                    </tr>
+                  <ul class="errorlist">
+                    {% for error in field.errors %}
+                      <li class="wi">{{ "error-warning"|remix }}{{ error }}</li>
+                    {% endfor %}
+                  </ul>
                 {% endif %}
-                <tr>
-                    <th class="l">
-                        <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-                    </th>
-                    <td>{{ field }}</td>
-                </tr>
+              </div>
             {% endfor %}
-        </tbody>
-        <tfoot>
-            <tr class="buttons">
-                <td colspan="2">
-                    {% block buttons %}
-                        {% if not form.instance|adding %}
-                            <a class="del" href="{{ form.instance.get_delete_url }}">{% translate "Delete" %}</a>
-                        {% endif %}
-                        <input type="reset" value="{% translate "Reset" %}" />
-                        {% if form.instance|adding %}
-                            <input type="submit" value="{% translate "Create" %}" />
-                        {% else %}
-                            <input type="submit" value="{% translate "Save" %}" />
-                        {% endif %}
-                    {% endblock %}
-                </td>
-            </tr>
-        </tfoot>
-    </table>
-{% endblock %}
+          </div>
+        {% endfor %}
+      </div>
+    {% endfor %}
+  {% else %}
+    <div class="column">
+      {% for field in form %}
+        {% if field.errors %}<p class="error">{{ field.errors }}</p>{% endif %}
+        <div class="field">
+          <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+          {{ field }}
+        </div>
+      {% endfor %}
+    </div>
+  {% endif %}
+  <div class="buttons">
+    {% block buttons %}
+      {% if form.instance|adding %}
+        <input type="submit" value="{% translate "Create" %}">
+      {% else %}
+        <input type="submit" value="{% translate "Save" %}">
+      {% endif %}
+      <input type="reset" value="{% translate "Reset" %}">
+      {% if not form.instance|adding %}
+        <a class="del" href="{{ form.instance.get_delete_url }}">{% translate "Delete" %}</a>
+      {% endif %}
+    {% endblock buttons %}
+  </div>
+{% endblock fields %}

nummi/main/templates/main/form/login.html

@@ -1,7 +1,7 @@
 {% extends "main/form/form_base.html" %}
 {% load i18n %}
 {% block buttons %}
-    <input hidden value="{{ next }}" name="next" />
-    <input type="reset" />
-    <input type="submit" value="{% translate "Log in" %}" />
-{% endblock %}
+  <input hidden value="{{ next }}" name="next">
+  <input type="submit" value="{% translate "Log in" %}">
+  <input type="reset">
+{% endblock buttons %}

nummi/main/templates/main/forms/widgets/datalist.html

@@ -0,0 +1,4 @@
+{% include "django/forms/widgets/text.html" %}
+<datalist id="{{ widget.attrs.list }}">
+  {% for option in widget.options %}<option value="{{ option }}"></option>{% endfor %}
+</datalist>

nummi/main/templates/main/forms/widgets/icon.html

@@ -0,0 +1,5 @@
+{% load main_extras %}
+<span class="ico-input icon-select">
+  {{ "square"|remix }}
+  {% include "main/forms/widgets/datalist.html" %}
+</span>

nummi/main/templates/main/index.html

@@ -1,47 +1,37 @@
 {% extends "main/base.html" %}
 {% load static %}
-{% load main_extras %}
+{% load main_extras account_extras history_extras statement_extras %}
 {% load i18n %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/plot.css' %}"
-          type="text/css" />
-{% endblock %}
+  {{ block.super }}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
+{% endblock link %}
 {% block body %}
-    <h2>{% translate "Accounts" %}</h2>
-    <p>
-        {% for acc in accounts %}
-            <a class="big-link" href="{{ acc.get_absolute_url }}">{{ acc.icon|remix }}{{ acc }}</a>
-        {% empty %}
-            {% translate "No account" %}
+  <div class="split">
+    <section>
+      <h2>{% translate "Accounts" %}</h2>
+      {% account_table user.account_set.all index=True %}
+    </section>
+    <section>
+      <h2>{% translate "Statements" %}</h2>
+      {% url "statements" as s_url %}
+      {% statement_table statements statements_url=s_url %}
+    </section>
+  </div>
+  <section>
+    <h2>{% translate "Categories" %}</h2>
+    {% spaceless %}
+      <p>
+        {% for cat in user.category_set.all %}
+          <a class="category" href="{{ cat.get_absolute_url }}">{{ cat.icon|remix }}{{ cat }}</a>
         {% endfor %}
-    </p>
-    {% if transactions %}
-        <h2>{% translate "Transactions" %}</h2>
-        {% include "transaction/transaction_table.html" %}
-    {% endif %}
-    {% if categories %}
-        <h2>{% translate "Categories" %}</h2>
-        {% spaceless %}
-            <p>
-                {% for cat in categories %}
-                    <a class="big-link" href="{{ cat.get_absolute_url }}">{{ cat.icon|remix }}{{ cat }}</a>
-                {% empty %}
-                    {% translate "No category" %}
-                {% endfor %}
-            </p>
-        {% endspaceless %}
-    {% endif %}
-    {% if statements %}
-        <h2>{% translate "Statements" %}</h2>
-        {% include "statement/statement_table.html" %}
-    {% endif %}
-    {% if history.data %}
-        <h2>{% translate "History" %}</h2>
-        {% include "history/plot.html" %}
-    {% endif %}
-{% endblock %}
+        <a class="category add" href="{% url "new_category" %}">{{ "add"|remix }}{% translate "Create category" %}</a>
+      </p>
+    {% endspaceless %}
+  </section>
+  <section>
+    <h2>{% translate "History" %}</h2>
+    {% history_plot user.transaction_set.all %}
+  </section>
+{% endblock body %}

nummi/main/templates/main/list.html

@@ -3,40 +3,45 @@
 {% load main_extras %}
 {% load i18n %}
 {% block title %}
-    {% block name %}{% endblock %}
-    {% if account %}– {{ account }}{% endif %}
-    {% if category %}– {{ category }}{% endif %}
-    {% if search %}
-        – {% translate "Search" %}
-    {% endif %}
-    – Nummi
+  {% block name %}{% endblock %}
+  {% if account %}– {{ account }}{% endif %}
+  {% if category %}– {{ category }}{% endif %}
+  {% if search %}
+    – {% translate "Search" %}
+  {% endif %}
+  – Nummi
 {% endblock %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
+  {{ block.super }}
+  {% css "main/css/table.css" %}
 {% endblock %}
 {% block body %}
-    <h2>
-        {% block h2 %}{% endblock %}
-    </h2>
-    {% if account %}
-        <p>
+  <h2>
+    {% block h2 %}{% endblock %}
+  </h2>
+  {% if account or category or search %}
+    <div class="backlinks">
+      {% block backlinks %}
+        {% if account %}
+          <p>
             <a class="big-link" href="{{ account.get_absolute_url }}">{{ account.icon|remix }}{{ account }}</a>
-        </p>
-    {% endif %}
-    {% if category %}
-        <p>
+          </p>
+        {% endif %}
+        {% if category %}
+          <p>
             <a class="big-link" href="{{ category.get_absolute_url }}">{{ category.icon|remix }}{{ category }}</a>
-        </p>
-    {% endif %}
-    {% if search %}
-        <p>
+          </p>
+        {% endif %}
+        {% if search %}
+          <p>
             <a href="{% url "search" %}">{% translate "Search" %}</a>
-        </p>
-    {% endif %}
-    {% include "main/pagination.html" %}
-    {% block table %}{% endblock %}
-    {% include "main/pagination.html" %}
+          </p>
+        {% endif %}
+      {% endblock %}
+    </div>
+  {% endif %}
+  {% include "main/pagination.html" %}
+  {% block table %}{% endblock %}
+  {% include "main/pagination.html" %}
+  {% block body_more %}{% endblock %}
 {% endblock %}

nummi/main/templates/main/login.html

@@ -1,19 +1,16 @@
 {% extends "main/base.html" %}
+{% load main_extras %}
 {% load static %}
 {% load i18n %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/form.css' %}"
-          type="text/css" />
+  {{ block.super }}
+  {% css "main/css/table.css" %}
+  {% css "main/css/form.css" %}
 {% endblock %}
 {% block body %}
-    <h2>{% translate "Log in" %}</h2>
-    <form action="{% url 'login' %}" method="post">
-        {% csrf_token %}
-        {% include "main/form/login.html" %}
-    </form>
+  <h2>{% translate "Log in" %}</h2>
+  <form action="{% url 'login' %}" method="post">
+    {% csrf_token %}
+    {% include "main/form/login.html" %}
+  </form>
 {% endblock %}

nummi/main/templates/main/pagination.html

@@ -1,9 +1,4 @@
-{% load i18n %}
+{% load i18n main_extras transaction_extras %}
 {% if page_obj %}
-    <p id="pagination">
-        {% for page in paginator.page_range %}
-            <a href="?page={{ page }}"
-               {% if page == page_obj.number %}class="cur"{% endif %}>{{ page }}</a>
-        {% endfor %}
-    </p>
+  <p class="pagination">{% pagination_links page_obj %}</p>
 {% endif %}

nummi/main/templates/main/pagination_links.html

@@ -0,0 +1,13 @@
+{% load i18n main_extras %}
+{% if first.show %}
+  <a href="?{% page_url 1 %}" class="first">1</a>
+  {% if first.dots %}<span>…</span>{% endif %}
+{% endif %}
+{% for page in pages %}
+  <a href="?{% page_url page.number %}"
+     {% if page.current %}class="cur"{% endif %}>{{ page.number }}</a>
+{% endfor %}
+{% if last.show %}
+  {% if last.dots %}<span>…</span>{% endif %}
+  <a href="?{% page_url last.number %}" class="last">{{ last.number }}</a>
+{% endif %}

nummi/main/templatetags/main_extras.py

@@ -1,4 +1,9 @@
+from urllib import parse
+
+from dateutil.relativedelta import relativedelta
 from django import template
+from django.templatetags.static import static
+from django.urls import reverse
 from django.utils import formats
 from django.utils.safestring import mark_safe
 
@@ -7,16 +12,16 @@ register = template.Library()
 
 @register.filter
 def value(val, pm=False, r=2):
-    if not val:
+    if val is None:
         return ""
     _prefix = ""
     _suffix = " €"
-    _val = formats.number_format(round(val, r), r, use_l10n=True, force_grouping=True)
+    _val = formats.number_format(val, decimal_pos=r, use_l10n=True, force_grouping=True)
 
     if val > 0:
         if pm:
             _prefix += "+ "
-    else:
+    elif val < 0:
         _val = _val[1:]
         _prefix += "&minus;&nbsp;"
 
@@ -34,21 +39,31 @@ def pmrvalue(val):
 
 
 @register.filter
-def remix(icon, cls=""):
-    return mark_safe(f"""<span class="ri-{icon}-line {cls}"></span>""")
+def remix(icon, *args):
+    return remixnl(f"{icon}-line", *args)
 
 
 @register.filter
-def check(sum, diff):
-    if sum == diff:
-        return remix("check", "green")
-    else:
-        return remix("close", "red")
+def remixnl(icon, cls=""):
+    return mark_safe(f"""<span class="ri-{icon} {cls}"></span>""")
+
+
+@register.filter
+def messageicon(level):
+    ico = {
+        10: "bug",
+        20: "information",
+        25: "check",
+        30: "alert",
+        40: "error-warning",
+    }
+
+    return remix(ico.get(level, "question"))
 
 
 @register.filter
 def extension(file):
-    return file.name.split(".")[-1].upper()
+    return file.name.split(".", 1)[1].upper()
 
 
 @register.filter
@@ -59,3 +74,67 @@ def verbose_name(obj):
 @register.filter
 def adding(obj):
     return obj._state.adding
+
+
+@register.simple_tag
+def css(href):
+    return mark_safe(
+        f"""<link rel="stylesheet" href="{static(href)}" type="text/css">"""
+    )
+
+
+@register.simple_tag
+def js(href):
+    return mark_safe(f"""<script src="{static(href)}" defer></script>""")
+
+
+@register.filter
+def balance(accounts):
+    return sum(
+        statement.value for acc in accounts if (statement := acc.statement_set.first())
+    )
+
+
+@register.inclusion_tag("main/pagination_links.html", takes_context=True)
+def pagination_links(context, page_obj):
+    _n = 3
+    return {
+        "request": context["request"],
+        "pages": [
+            {"number": p, "current": p == page_obj.number}
+            for p in page_obj.paginator.page_range
+            if abs(p - page_obj.number) < _n
+        ],
+        "first": {
+            "show": page_obj.number > _n,
+            "dots": page_obj.number > _n + 1,
+        },
+        "last": {
+            "show": page_obj.number <= page_obj.paginator.num_pages - _n,
+            "dots": page_obj.number < page_obj.paginator.num_pages - _n,
+            "number": page_obj.paginator.num_pages,
+        },
+    }
+
+
+@register.simple_tag(takes_context=True)
+def page_url(context, page):
+    query = context["request"].GET.copy()
+    query["page"] = page
+    return query.urlencode()
+
+
+@register.simple_tag
+def url_get(name, **kwargs):
+    kwargs = {k: v for k, v in kwargs.items() if v}
+    return f"{reverse(name)}?{parse.urlencode(kwargs)}"
+
+
+@register.filter
+def end_of_month(month):
+    return month + relativedelta(months=1, days=-1)
+
+
+@register.filter
+def end_of_year(year):
+    return year + relativedelta(years=1, days=-1)

nummi/main/urls.py

@@ -10,5 +10,6 @@ urlpatterns = [
     path("category/", include("category.urls")),
     path("statement/", include("statement.urls")),
     path("transaction/", include("transaction.urls")),
+    path("history/", include("history.urls")),
     path("search/", include("search.urls")),
 ]

nummi/main/utils.py

@@ -0,0 +1,18 @@
+import json
+import pathlib
+
+from django.contrib.staticfiles import finders
+
+def get_icons():
+    with open(finders.find("main/icons/remixicon.glyph.json"), "r") as f:
+        data = json.load(f)
+    return [i.removesuffix("-line") for i in data.keys() if i.endswith("-line")]
+
+
+def pdf_outline_to_str(outline):
+    return " ".join(
+        (
+            dest.title if not isinstance(dest, list) else pdf_outline_to_str(dest)
+            for dest in outline
+        )
+    )

nummi/main/views.py

@@ -1,5 +1,3 @@
-from account.models import Account
-from category.models import Category
 from django.contrib import messages
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.mixins import LoginRequiredMixin
@@ -9,36 +7,24 @@ from django.utils.translation import gettext as _
 from django.views.generic import (
     CreateView,
     DeleteView,
+    DetailView,
     ListView,
     TemplateView,
     UpdateView,
 )
-from history.utils import history
-from statement.models import Statement
-from transaction.models import Transaction
 
 
 class IndexView(LoginRequiredMixin, TemplateView):
     template_name = "main/index.html"
 
     def get_context_data(self, **kwargs):
-        _max = 8
-        _transactions = Transaction.objects.filter(user=self.request.user)
-        _statements = Statement.objects.filter(user=self.request.user)
-
-        res = {
-            "accounts": Account.objects.filter(user=self.request.user),
-            "transactions": _transactions[:_max],
-            "categories": Category.objects.filter(user=self.request.user),
-            "statements": _statements[:_max],
-            "history": history(_transactions.exclude(category__budget=False)),
+        return super().get_context_data(**kwargs) | {
+            "statements": (
+                self.request.user.statement_set.exclude(account__archived=True)
+                .order_by("account__id", "-date")
+                .distinct("account__id")
+            )
         }
-        if _transactions.count() > _max:
-            res["transactions_url"] = reverse_lazy("transactions")
-        if _statements.count() > _max:
-            res["statements_url"] = reverse_lazy("statements")
-
-        return super().get_context_data(**kwargs) | res
 
 
 class UserMixin(LoginRequiredMixin):
@@ -76,6 +62,10 @@ class NummiUpdateView(UserMixin, UpdateView):
     pass
 
 
+class NummiDetailView(UserMixin, DetailView):
+    pass
+
+
 class NummiDeleteView(UserMixin, DeleteView):
     template_name = "main/confirm_delete.html"
     success_url = reverse_lazy("index")
@@ -96,4 +86,4 @@ class LogoutView(auth_views.LogoutView):
 
 
 class NummiListView(UserMixin, ListView):
-    paginate_by = 96
+    pass

nummi/nummi/settings.py

@@ -22,6 +22,7 @@ if CONFIG_PATH is not None:
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 MEDIA_CONF = CONFIG.get("media", {})
+STATIC_CONF = CONFIG.get("static", {})
 BASE_DIR = Path(__file__).resolve().parent.parent
 MEDIA_ROOT = Path(MEDIA_CONF.get("root", "/var/lib/nummi"))
 MEDIA_URL = "media/"
@@ -124,7 +125,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = "static/"
-STATIC_ROOT = "/srv/nummi"
+STATIC_ROOT = STATIC_CONF.get("root", "/srv/nummi")
 LOGIN_URL = "login"
 
 # Default primary key field type

nummi/search/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-22 15:16+0200\n"
+"POT-Creation-Date: 2024-01-02 15:52+0100\n"
 "PO-Revision-Date: 2023-04-22 15:20+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 3.2.2\n"
 
 #: .\search\forms.py:7 .\search\templates\search\search.html:6
-#: .\search\templates\search\search.html:18
+#: .\search\templates\search\search.html:14
 #: .\search\templates\search\search_form.html:5
 msgid "Search"
 msgstr "Rechercher"

nummi/search/templates/search/search.html

@@ -3,23 +3,19 @@
 {% load main_extras %}
 {% load i18n %}
 {% block title %}
-    {% translate "Search" %} – Nummi
+  {% translate "Search" %} – Nummi
 {% endblock %}
 {% block link %}
-    {{ block.super }}
-    <link rel="stylesheet"
-          href="{% static 'main/css/form.css' %}"
-          type="text/css" />
-    <link rel="stylesheet"
-          href="{% static 'main/css/table.css' %}"
-          type="text/css" />
+  {{ block.super }}
+  {% css "main/css/form.css" %}
+  {% css "main/css/table.css" %}
 {% endblock %}
 {% block body %}
-    <h2>{% translate "Search" %}</h2>
-    {% spaceless %}
-        <form id="search" method="post">
-            {% csrf_token %}
-            {{ form }}
-        </form>
-    {% endspaceless %}
+  <h2>{% translate "Search" %}</h2>
+  {% spaceless %}
+    <form id="search" method="post">
+      {% csrf_token %}
+      {{ form }}
+    </form>
+  {% endspaceless %}
 {% endblock %}

nummi/search/templates/search/search_form.html

@@ -1,6 +1,7 @@
 {% extends "main/form/form_base.html" %}
 {% load i18n %}
 {% block buttons %}
-    <input type="reset" />
-    <input type="submit" value="{% translate "Search" %}" />
-{% endblock %}
+  <input type="submit" value="{% translate "Search" %}" />
+  <input type="reset" value="{% translate "Reset" %}" />
+  <a href="{% url "search" %}">{% translate "Clear" %}</a>
+{% endblock buttons %}

nummi/search/templates/search/search_results.html

@@ -0,0 +1,59 @@
+{% extends "main/base.html" %}
+{% load i18n static %}
+{% load main_extras account_extras transaction_extras statement_extras %}
+{% block title %}
+  {% translate "Search" %} – Nummi
+{% endblock title %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/form.css" %}
+  {% css "main/css/table.css" %}
+{% endblock link %}
+{% block body %}
+  <h2>{% translate "Search" %}</h2>
+  <form method="post" action="{% url "search" %}">
+    {% csrf_token %}
+    {{ form }}
+  </form>
+  {% if accounts %}
+    <section>
+      <h3>{% translate "Accounts" %}</h3>
+      <div class="split">{% account_table accounts search=True %}</div>
+    </section>
+  {% endif %}
+  {% if statements %}
+    <section>
+      <h3>{% translate "Statements" %}</h3>
+      {% statement_table statements %}
+    </section>
+  {% endif %}
+  {% if categories %}
+    <section>
+      <h3>{% translate "Categories" %}</h3>
+      <p>
+        {% for cat in categories %}
+          <a class="category" href="{{ cat.get_absolute_url }}">{{ cat.icon|remix }}{{ cat }}</a>
+        {% endfor %}
+      </p>
+    </section>
+  {% endif %}
+  {% if transactions %}
+    <section>
+      <h3>{% translate "Transactions" %}</h3>
+      {% url_get "transactions" search=search as t_url %}
+      <p>
+        <a class="big-link" href="{{ t_url }}">{{ "list-check"|remixnl }}{% translate "Show all transactions" %}</a>
+      </p>
+      {% transaction_table transactions n_max=8 transactions_url=t_url %}
+    </section>
+  {% endif %}
+  {% if invoices %}
+    <section>
+      <h3>{% translate "Invoices" %}</h3>
+      {% invoice_table invoices=invoices %}
+    </section>
+  {% endif %}
+  {% if not accounts and not categories and not transactions and not invoices %}
+    <p>{% translate "No results found." %}</p>
+  {% endif %}
+{% endblock body %}

nummi/search/views.py

@@ -1,14 +1,7 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.contrib.postgres.search import (
-    SearchQuery,
-    SearchRank,
-    SearchVector,
-    TrigramSimilarity,
-)
-from django.db import models
 from django.shortcuts import redirect
+from django.views.generic import TemplateView
 from django.views.generic.edit import FormView
-from transaction.views import TransactionListView
 
 from .forms import SearchForm
 
@@ -21,24 +14,19 @@ class SearchFormView(LoginRequiredMixin, FormView):
         return redirect("search", search=form.cleaned_data.get("search"))
 
 
-class SearchView(TransactionListView):
-    def get_queryset(self):
-        self.search = self.kwargs["search"]
-        return (
-            super()
-            .get_queryset()
-            .annotate(
-                rank=SearchRank(
-                    SearchVector("name", weight="A")
-                    + SearchVector("description", weight="B")
-                    + SearchVector("trader", weight="B"),
-                    SearchQuery(self.search, search_type="websearch"),
-                ),
-                similarity=TrigramSimilarity("name", self.search),
-            )
-            .filter(models.Q(rank__gte=0.1) | models.Q(similarity__gte=0.3))
-            .order_by("-rank", "-date")
-        )
+class SearchView(LoginRequiredMixin, TemplateView):
+    template_name = "search/search_results.html"
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"search": self.kwargs["search"]}
+        context = super().get_context_data(**kwargs)
+        _user = self.request.user
+
+        context["form"] = SearchForm(initial={"search": self.kwargs["search"]})
+        context["search"] = self.kwargs["search"]
+        context["transactions"] = _user.transaction_set.search(self.kwargs["search"])
+        context["accounts"] = _user.account_set.search(self.kwargs["search"])
+        context["statements"] = _user.statement_set.search(self.kwargs["search"])
+        context["categories"] = _user.category_set.search(self.kwargs["search"])
+        context["invoices"] = _user.invoice_set.search(self.kwargs["search"])[:10]
+
+        return context

nummi/statement/forms.py

@@ -1,5 +1,8 @@
-from account.models import Account
+import json
+
+from account.forms import AccountSelect
 from django import forms
+from django.forms.widgets import Select
 from django.utils.translation import gettext_lazy as _
 from main.forms import NummiFileInput, NummiForm
 from transaction.models import Transaction
@@ -13,21 +16,44 @@ class StatementForm(NummiForm):
         fields = ["account", "start_date", "date", "start_value", "value", "file"]
         widgets = {
             "file": NummiFileInput,
+            "account": AccountSelect,
         }
 
+    meta_fieldsets = [
+        [
+            ["account"],
+            ["start_date", "start_value"],
+            ["date", "value"],
+            ["file"],
+        ],
+    ]
+
     def __init__(self, *args, **kwargs):
-        _user = kwargs.get("user")
+        _user = kwargs.pop("user")
         _disable_account = kwargs.pop("disable_account", False)
         super().__init__(*args, **kwargs)
-        self.fields["account"].queryset = Account.objects.filter(user=_user)
+        self.fields["account"].queryset = _user.account_set.exclude(archived=True)
         self.fields["transactions"] = forms.MultipleChoiceField(
             choices=(
                 ((_transaction.id), _transaction)
-                for _transaction in Transaction.objects.filter(user=_user)
+                for _transaction in Transaction.objects.filter(
+                    user=_user, statement=None
+                )
             ),
             label=_("Add transactions"),
             required=False,
         )
+
+        self.fields["account"].widget.attrs |= {
+            "class": "account",
+            "data-icons": json.dumps(
+                {
+                    str(acc.id): acc.icon
+                    for acc in self.fields["account"].queryset.only("id", "icon")
+                }
+            ),
+        }
+
         if _disable_account:
             self.fields["account"].disabled = True
 
@@ -39,3 +65,7 @@ class StatementForm(NummiForm):
 
         instance.transaction_set.add(*new_transactions, bulk=False)
         return instance
+
+
+class StatementSelect(Select):
+    template_name = "statement/forms/widgets/statement.html"

nummi/statement/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-25 12:05+0100\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-22 15:22+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: .\statement\forms.py:28
+#: .\statement\forms.py:43
 msgid "Add transactions"
 msgstr "Ajouter des transactions"
 
@@ -37,36 +37,53 @@ msgstr "Valeur finale"
 msgid "Start value"
 msgstr "Valeur initiale"
 
-#: .\statement\models.py:29
-#: .\statement\templates\statement\statement_table.html:27
-msgid "Difference"
-msgstr "Différence"
-
-#: .\statement\models.py:36
-msgid "Transaction difference"
-msgstr "Différence des transactions"
-
-#: .\statement\models.py:42
+#: .\statement\models.py:28
 msgid "File"
 msgstr "Fichier"
 
-#: .\statement\models.py:49
+#: .\statement\models.py:35
 #, python-format
 msgid "%(date)s statement"
 msgstr "Relevé du %(date)s"
 
-#: .\statement\models.py:89
+#: .\statement\models.py:68
 msgid "Statement"
 msgstr "Relevé"
 
-#: .\statement\models.py:90
+#: .\statement\models.py:69
 #: .\statement\templates\statement\statement_list.html:4
 #: .\statement\templates\statement\statement_list.html:7
 msgid "Statements"
 msgstr "Relevés"
 
+#: .\statement\templates\statement\confirm_delete.html:5
+msgid "This will delete all transactions in this statement."
+msgstr "Ceci va supprimer toutes les transactions de ce relevé."
+
+#: .\statement\templates\statement\statement_detail.html:19
+#: .\statement\templates\statement\statement_detail.html:30
+msgid "Edit statement"
+msgstr "Modifier le relevé"
+
+#: .\statement\templates\statement\statement_detail.html:31
+#: .\statement\templates\statement\statement_detail.html:61
+msgid "Add transaction"
+msgstr "Ajouter une transaction"
+
+#: .\statement\templates\statement\statement_detail.html:57
+msgid "Transactions"
+msgstr "Transactions"
+
+#: .\statement\templates\statement\statement_detail.html:62
+msgid "View all transactions"
+msgstr "Afficher toutes les transactions"
+
+#: .\statement\templates\statement\statement_detail.html:67
+msgid "Categories"
+msgstr "Catégories"
+
 #: .\statement\templates\statement\statement_form.html:4
-#: .\statement\templates\statement\statement_table.html:5
+#: .\statement\templates\statement\statement_table.html:7
 msgid "Create statement"
 msgstr "Créer un relevé"
 
@@ -74,34 +91,28 @@ msgstr "Créer un relevé"
 msgid "New statement"
 msgstr "Nouveau relevé"
 
-#: .\statement\templates\statement\statement_form.html:22
-msgid "Categories"
-msgstr "Catégories"
+#: .\statement\templates\statement\statement_form.html:12
+msgid "Back"
+msgstr "Retour"
 
-#: .\statement\templates\statement\statement_form.html:24
 #: .\statement\templates\statement\statement_table.html:28
-msgid "Transactions"
-msgstr "Transactions"
-
-#: .\statement\templates\statement\statement_table.html:22
-msgid "Date"
-msgstr "Date"
-
-#: .\statement\templates\statement\statement_table.html:24
-msgid "Account"
-msgstr "Compte"
-
-#: .\statement\templates\statement\statement_table.html:26
-msgid "Value"
-msgstr "Valeur"
-
-#: .\statement\templates\statement\statement_table.html:56
-msgid "No statement"
-msgstr "Aucun relevé"
-
-#: .\statement\templates\statement\statement_table.html:64
 msgid "View all statements"
 msgstr "Voir tous les relevés"
 
+#~ msgid "Difference"
+#~ msgstr "Différence"
+
+#~ msgid "Transaction difference"
+#~ msgstr "Différence des transactions"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ msgid "Value"
+#~ msgstr "Valeur"
+
 #~ msgid "No transaction"
 #~ msgstr "Aucune transaction"

nummi/statement/migrations/0003_remove_statement_diff_remove_statement_sum.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2 on 2025-01-03 13:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("statement", "0002_alter_statement_table"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="statement",
+            name="diff",
+        ),
+        migrations.RemoveField(
+            model_name="statement",
+            name="sum",
+        ),
+    ]

nummi/statement/migrations/0004_statement_metadata_statement_tags.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2025-01-05 17:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("statement", "0003_remove_statement_diff_remove_statement_sum"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="statement",
+            name="metadata",
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name="statement",
+            name="tags",
+            field=models.TextField(blank=True),
+        ),
+    ]

nummi/statement/models.py

@@ -4,10 +4,20 @@ from uuid import uuid4
 
 from account.models import AccountModel
 from django.core.validators import FileExtensionValidator
-from django.db import models, transaction
+from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from main.models import NummiQuerySet
+from main.utils import pdf_outline_to_str
 from media.utils import get_path
+from pypdf import PdfReader
+
+
+class StatementQuerySet(NummiQuerySet):
+    main_field = "metadata"
+    fields = {
+        "tags": "B",
+    }
 
 
 class Statement(AccountModel):
@@ -22,20 +32,6 @@ class Statement(AccountModel):
     start_value = models.DecimalField(
         max_digits=12, decimal_places=2, default=0, verbose_name=_("Start value")
     )
-    diff = models.DecimalField(
-        max_digits=12,
-        decimal_places=2,
-        default=0,
-        verbose_name=_("Difference"),
-        editable=False,
-    )
-    sum = models.DecimalField(
-        max_digits=12,
-        decimal_places=2,
-        default=0,
-        verbose_name=_("Transaction difference"),
-        editable=False,
-    )
     file = models.FileField(
         upload_to=get_path,
         validators=[FileExtensionValidator(["pdf"])],
@@ -44,12 +40,13 @@ class Statement(AccountModel):
         blank=True,
         default="",
     )
+    metadata = models.TextField(blank=True)
+    tags = models.TextField(blank=True)
+
+    objects = StatementQuerySet.as_manager()
 
     def __str__(self):
-        desc = _("%(date)s statement") % {"date": self.date}
-        if hasattr(self, "account"):
-            return f"{desc} – {self.account}"
-        return desc
+        return _("%(date)s statement") % {"date": self.date}
 
     def save(self, *args, **kwargs):
         if Statement.objects.filter(id=self.id).exists():
@@ -57,21 +54,39 @@ class Statement(AccountModel):
             if _prever.file and _prever.file != self.file:
                 Path(_prever.file.path).unlink(missing_ok=True)
 
-        with transaction.atomic():
-            for trans in self.transaction_set.all():
-                trans.save()
+        if self.file:
+            reader = PdfReader(self.file)
+
+            if reader.metadata:
+                self.metadata = " ".join(
+                    (
+                        m.replace("\x00", "").strip()
+                        for m in (
+                            reader.metadata.title,
+                            reader.metadata.author,
+                            reader.metadata.subject,
+                        )
+                        if m
+                    )
+                )
+
+            _tags = pdf_outline_to_str(reader.outline)
+            _tags += " ".join(
+                (page.extract_text().replace("\x00", "") for page in reader.pages)
+            )
+            self.tags = " ".join((tag for tag in _tags.split() if len(tag) >= 3))
 
-        self.diff = self.value - self.start_value
-        self.sum = (
-            self.transaction_set.aggregate(sum=models.Sum("value")).get("sum", 0) or 0
-        )
         super().save(*args, **kwargs)
 
-    def update_sum(self):
-        self.sum = (
-            self.transaction_set.aggregate(sum=models.Sum("value")).get("sum", 0) or 0
+    @property
+    def sum(self):
+        return self.transaction_set.aggregate(sum=models.Sum("value", default=0)).get(
+            "sum"
         )
-        super().save()
+
+    @property
+    def diff(self):
+        return self.value - self.start_value
 
     def delete(self, *args, **kwargs):
         if self.file:

nummi/statement/templates/statement/confirm_delete.html

@@ -0,0 +1,7 @@
+{% extends "main/confirm_delete.html" %}
+{% load i18n %}
+{% block additionalinfo %}
+  <p>
+    {% blocktranslate %}This will delete all transactions in this statement.{% endblocktranslate %}
+  </p>
+{% endblock %}

nummi/statement/templates/statement/forms/widgets/statement.html

@@ -0,0 +1,11 @@
+{% load main_extras %}
+{% if widget.attrs.disabled %}
+  {% for group_name, group_choices, group_index in widget.optgroups %}
+    {% for option in group_choices %}
+      {% if option.selected %}
+        <a href="{% url "statement" statement=option.value %}">{{ "file"|remix }}{{ option.label }}</a>
+      {% endif %}
+    {% endfor %}
+  {% endfor %}
+{% endif %}
+{% include "django/forms/widgets/select.html" %}

nummi/statement/templates/statement/statement_detail.html

@@ -0,0 +1,70 @@
+{% extends "main/base.html" %}
+{% load i18n main_extras statement_extras transaction_extras category %}
+{% block title %}
+  {{ statement }}
+  – Nummi
+{% endblock title %}
+{% block link %}
+  {{ block.super }}
+  {% css "main/css/form.css" %}
+  {% css "main/css/table.css" %}
+  {% css "main/css/plot.css" %}
+{% endblock link %}
+{% block body %}
+  <h2>{{ statement }}</h2>
+  <p>
+    <a href="{{ account.get_absolute_url }}">{{ account.icon|remix }}{{ account }}</a>
+  </p>
+  <p>
+    <a href="{% url "edit_statement" statement.id %}">{{ "file-edit"|remix }}{% translate "Edit statement" %}</a>
+  </p>
+  <div class="statement-details">
+    {% if statement.sum != statement.diff %}
+      <span class="incons">
+        {{ statement.sum|check:statement.diff }}
+        <span class="ds">
+          <span class="diff value">{{ statement.diff|pmvalue }}</span>
+          <span class="sum value">{{ statement.sum|pmvalue }}</span>
+        </span>
+        <span class="links">
+          <a class="edit" href="{% url "edit_statement" statement.id %}">{{ "file-edit"|remix }}{% translate "Edit statement" %}</a>
+          <a href="{% url "new_transaction" statement=statement.id %}">{{ "add-circle"|remix }}{% translate "Add transaction" %}</a>
+        </span>
+      </span>
+    {% endif %}
+    {% if statement.file %}
+      <span class="file">
+        <a class="title" href="{{ statement.file.url }}">{{ "file"|remix }}{{ statement }} [{{ statement.file|extension }}]</a>
+      </span>
+    {% endif %}
+    <span class="start">
+      <span class="date">{{ statement.start_date|date:"Y-m-d" }}</span>
+      <span class="value">{{ statement.start_value|value }}</span>
+    </span>
+    <span class="evolution">
+      <span class="value">{{ statement.sum|pmvalue }}</span>
+      {{ "funds"|remix }}
+      {% if statement.diff != statement.sum %}
+        <span class="value">{{ statement.diff|pmvalue }}</span>
+      {% endif %}
+    </span>
+    <span class="end">
+      <span class="date">{{ statement.date|date:"Y-m-d" }}</span>
+      <span class="value">{{ statement.value|value }}</span>
+    </span>
+  </div>
+  <section>
+    <h3>{% translate "Transactions" %}</h3>
+    {% url_get "transactions" account=account.id statement=statement.id as t_url %}
+    <p>
+      <a class="big-link"
+         href="{% url "new_transaction" statement=statement.id %}">{{ "add-circle"|remix }}{% translate "Add transaction" %}</a>
+      <a class="big-link" href="{{ t_url }}">{{ "list-check"|remixnl }}{% translate "View all transactions" %}</a>
+    </p>
+    {% transaction_table statement.transaction_set.all n_max=8 transactions_url=t_url %}
+  </section>
+  <section>
+    <h3>{% translate "Categories" %}</h3>
+    {% category_plot transactions statement=object %}
+  </section>
+{% endblock body %}

nummi/statement/templates/statement/statement_form.html

@@ -1,27 +1,15 @@
 {% extends "main/form/base.html" %}
-{% load i18n main_extras category %}
+{% load i18n main_extras statement_extras category %}
 {% block title_new %}
-    {% translate "Create statement" %}
+  {% translate "Create statement" %}
 {% endblock %}
 {% block h2_new %}
-    {% translate "New statement" %}
-{% endblock %}
-{% block h2 %}
-    {{ form.instance.sum|check:form.instance.diff }}
-    {{ form.instance }}
+  {% translate "New statement" %}
 {% endblock %}
 {% block pre %}
-    {% if account %}
-        <p>
-            <a href="{{ account.get_absolute_url }}">{{ account.icon|remix }}{{ account }}</a>
-        </p>
-    {% endif %}
-{% endblock %}
-{% block tables %}
-    {% if not form.instance|adding %}
-        <h3>{% translate "Categories" %}</h3>
-        {% category_plot transactions %}
-        <h3>{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})</h3>
-        {% include "transaction/transaction_table.html" %}
-    {% endif %}
+  {% if not instance|adding %}
+    <p>
+      <a href="{{ instance.get_absolute_url }}">{{ "arrow-go-back"|remix }}{% translate "Back" %}</a>
+    </p>
+  {% endif %}
 {% endblock %}

nummi/statement/templates/statement/statement_list.html

@@ -1,11 +1,12 @@
 {% extends "main/list.html" %}
-{% load i18n %}
+{% load i18n statement_extras %}
 {% block name %}
-    {% translate "Statements" %}
-{% endblock %}
+  {% translate "Statements" %}
+{% endblock name %}
 {% block h2 %}
-    {% translate "Statements" %}
-{% endblock %}
+  {% translate "Statements" %}
+{% endblock h2 %}
 {% block table %}
-    {% include "statement/statement_table.html" %}
-{% endblock %}
+  {% url "new_statement" as ns_url %}
+  {% statement_table statements new_statement_url=ns_url %}
+{% endblock table %}

nummi/statement/templates/statement/statement_table.html

@@ -1,66 +1,33 @@
-{% load main_extras %}
-{% load i18n %}
-{% if new_statement_url %}
-    <p>
-        <a href="{{ new_statement_url }}">{% translate "Create statement" %}</a>
-    </p>
-{% endif %}
-<div id="statements" class="table">
-    <table class="full-width {% if statements_url %}more{% endif %}">
-        <colgroup>
-            <col class="icon" span="2">
-            <col class="date">
-            {% if not account %}
-                <col class="icon">
-                <col class="desc">
-            {% endif %}
-            <col class="value" span="3">
-        </colgroup>
-        <thead>
-            <th>{{ "check"|remix }}</th>
-            <th>{{ "attachment"|remix }}</th>
-            <th>{% translate "Date" %}</th>
-            {% if not account %}
-                <th colspan="2">{% translate "Account" %}</th>
-            {% endif %}
-            <th>{% translate "Value" %}</th>
-            <th>{% translate "Difference" %}</th>
-            <th>{% translate "Transactions" %}</th>
-        </thead>
-        <tbody>
-            {% for snap in statements %}
-                <tr>
-                    {% if snap.sum == snap.diff %}
-                        <td class="c green">{{ "check"|remix }}</td>
-                    {% else %}
-                        <td class="c red">{{ "close"|remix }}</td>
-                    {% endif %}
-                    <td class="c">
-                        {% if snap.file %}<a href="{{ snap.file.url }}">{{ "attachment"|remix }}</a>{% endif %}
-                    </td>
-                    <th class="date" scope="row">
-                        <a href="{{ snap.get_absolute_url }}">{{ snap.date|date:"Y-m-d" }}</a>
-                    </th>
-                    {% if not account %}
-                        <td class="r">{{ snap.account.icon|remix }}</td>
-                        <td>
-                            <a href="{{ snap.account.get_absolute_url }}">{{ snap.account }}</a>
-                        </td>
-                    {% endif %}
-                    <td class="value">{{ snap.value|value }}</td>
-                    <td class="value">{{ snap.diff|pmvalue }}</td>
-                    <td class="value">{{ snap.sum|pmvalue }}</td>
-                </tr>
-            {% empty %}
-                <tr>
-                    <td class="empty" colspan="{% if account %}6{% else %}8{% endif %}">{% translate "No statement" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+{% load i18n main_extras statement_extras %}
+<div id="statements">
+  <ul class="statements">
+    {% if new_statement_url %}
+      <li class="new">
+        <span>
+          <a href="{{ new_statement_url }}">{{ "file-add"|remix }}{% translate "Create statement" %}</a>
+        </span>
+      </li>
+    {% endif %}
+    {% for sta in statements %}
+      <li>
+        <a href="{{ sta.get_absolute_url }}" class="date"><span>{{ sta.date|date:"d" }}</span>
+          <span>{{ sta.date|date:"M y" }}</span></a>
+        <span class="value"><span>{{ sta.value|value }}</span>
+        <span>{{ sta.diff|pmvalue }}</span></span>
+        {% if not account %}
+          <span class="account">
+            <a href="{{ sta.account.get_absolute_url }}">{{ sta.account.icon|remix }}{{ sta.account }}</a>
+          </span>
+        {% endif %}
+        <span class="icon">{{ sta.sum|check:sta.diff }}</span>
+      </li>
+    {% endfor %}
+    {% if statements_url %}
+      <li class="more">
+        <span>
+          <a href="{{ statements_url }}">{{ "gallery-view"|remixnl }}{% translate "View all statements" %}</a>
+        </span>
+      </li>
+    {% endif %}
+  </ul>
 </div>
-{% if statements_url %}
-    <p>
-        <a href="{{ statements_url }}">{% translate "View all statements" %}</a>
-    </p>
-{% endif %}

nummi/statement/templatetags/statement_extras.py

@@ -0,0 +1,26 @@
+from django import template
+from main.templatetags.main_extras import remix
+
+register = template.Library()
+
+
+@register.filter
+def check(s, diff):
+    if s is None:
+        s = 0
+    if s == diff:
+        return remix("check", "green")
+    else:
+        return remix("close", "red")
+
+
+@register.inclusion_tag("statement/statement_table.html")
+def statement_table(statements, **kwargs):
+    if (n_max := kwargs.get("n_max")) is not None:
+        if statements.count() <= n_max:
+            del kwargs["statements_url"]
+        statements = statements[:n_max]
+
+    return kwargs | {
+        "statements": statements,
+    }

nummi/statement/urls.py

@@ -6,7 +6,10 @@ from . import views
 urlpatterns = [
     path("list", views.StatementListView.as_view(), name="statements"),
     path("new", views.StatementCreateView.as_view(), name="new_statement"),
-    path("<statement>", views.StatementUpdateView.as_view(), name="statement"),
+    path("<statement>", views.StatementDetailView.as_view(), name="statement"),
+    path(
+        "<statement>/edit", views.StatementUpdateView.as_view(), name="edit_statement"
+    ),
     path(
         "<statement>/transaction/list",
         views.StatementTListView.as_view(),

nummi/statement/views.py

@@ -1,7 +1,13 @@
 from account.models import Account
 from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
-from main.views import NummiCreateView, NummiDeleteView, NummiListView, NummiUpdateView
+from main.views import (
+    NummiCreateView,
+    NummiDeleteView,
+    NummiDetailView,
+    NummiListView,
+    NummiUpdateView,
+)
 from transaction.views import TransactionListView
 
 from .forms import StatementForm
@@ -52,13 +58,33 @@ class StatementUpdateView(NummiUpdateView):
 
 
 class StatementDeleteView(NummiDeleteView):
+    template_name = "statement/confirm_delete.html"
     model = Statement
     pk_url_kwarg = "statement"
 
 
+class StatementDetailView(NummiDetailView):
+    model = Statement
+    pk_url_kwarg = "statement"
+    context_object_name = "statement"
+
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        statement = data.get("statement")
+
+        return data | {
+            "account": statement.account,
+            "new_transaction_url": reverse_lazy(
+                "new_transaction", kwargs={"statement": statement.pk}
+            ),
+            "transactions": statement.transaction_set.all(),
+        }
+
+
 class StatementListView(NummiListView):
     model = Statement
     context_object_name = "statements"
+    paginate_by = 32
 
 
 class StatementMixin:

nummi/transaction/forms.py

@@ -1,8 +1,14 @@
-from category.models import Category
-from main.forms import NummiFileInput, NummiForm
-from statement.models import Statement
+import json
+
+from account.forms import AccountSelect
+from category.forms import CategorySelect
+from django import forms
+from django.utils.translation import gettext_lazy as _
+from main.forms import DatalistInput, NummiFileInput, NummiForm
+from statement.forms import StatementSelect
 
 from .models import Invoice, Transaction
+from .utils import get_datalist
 
 
 class TransactionForm(NummiForm):
@@ -19,15 +25,87 @@ class TransactionForm(NummiForm):
             "payment",
             "description",
         ]
+        widgets = {
+            "statement": StatementSelect(),
+            "category": CategorySelect(),
+            "name": DatalistInput(),
+            "trader": DatalistInput(),
+            "payment": DatalistInput(),
+        }
+
+    meta_fieldsets = [
+        [
+            ["statement"],
+            ["name"],
+            ["value"],
+            [
+                "date",
+                "real_date",
+            ],
+            ["category"],
+            ["trader", "payment"],
+        ],
+        [["description"]],
+    ]
 
     def __init__(self, *args, **kwargs):
-        _user = kwargs.get("user")
+        _user = kwargs.pop("user")
         _disable_statement = kwargs.pop("disable_statement", False)
+        _autocomplete = kwargs.pop("autocomplete", False)
         super().__init__(*args, **kwargs)
-        self.fields["category"].queryset = Category.objects.filter(user=_user)
-        self.fields["statement"].queryset = Statement.objects.filter(user=_user)
+
+        self.fields["category"].queryset = self.fields["category"].queryset.filter(
+            user=_user
+        )
+        self.fields["statement"].queryset = self.fields["statement"].queryset.filter(
+            user=_user
+        )
+
+        self.fields["name"].widget.options = get_datalist(_user, "name")
+        self.fields["trader"].widget.options = get_datalist(_user, "trader")
+        self.fields["payment"].widget.options = get_datalist(_user, "payment")
+
+        self.fields["category"].widget.attrs |= {
+            "class": "category",
+            "data-icons": json.dumps(
+                {
+                    str(cat.id): cat.icon
+                    for cat in self.fields["category"].queryset.only("id", "icon")
+                }
+            ),
+        }
+
+        if _autocomplete:
+            self.autocomplete = {
+                "field": "name",
+                "data": {
+                    t.name: [
+                        {
+                            "field": "value",
+                            "value": t.value,
+                        },
+                        {
+                            "field": "category",
+                            "value": t.category.id if t.category else "",
+                        },
+                        {
+                            "field": "trader",
+                            "value": t.trader,
+                        },
+                        {
+                            "field": "payment",
+                            "value": t.payment,
+                        },
+                    ]
+                    for t in _user.transaction_set.order_by("name", "-date").distinct(
+                        "name"
+                    )
+                },
+            }
+
         if _disable_statement:
             self.fields["statement"].disabled = True
+            self.fields["statement"].widget.attrs["hidden"] = True
 
 
 class InvoiceForm(NummiForm):
@@ -42,3 +120,98 @@ class InvoiceForm(NummiForm):
         widgets = {
             "file": NummiFileInput,
         }
+
+
+class MultipleFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+
+class MultipleFileField(forms.FileField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("widget", MultipleFileInput())
+        super().__init__(*args, **kwargs)
+
+    def clean(self, data, initial=None):
+        single_file_clean = super().clean
+        if isinstance(data, (list, tuple)):
+            result = [single_file_clean(d, initial) for d in data]
+        else:
+            result = single_file_clean(data, initial)
+        return result
+
+
+class MultipleInvoicesForm(forms.Form):
+    prefix = "invoices"
+    invoices = MultipleFileField()
+
+
+class DateInput(forms.DateInput):
+    input_type = "date"
+
+    def __init__(self, attrs=None):
+        super().__init__(attrs)
+        self.format = "%Y-%m-%d"
+
+
+class DateField(forms.DateField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("widget", DateInput())
+        super().__init__(*args, **kwargs)
+
+
+class TransactionFiltersForm(forms.Form):
+    start_date = DateField(required=False)
+    end_date = DateField(required=False)
+    category = forms.ModelChoiceField(
+        queryset=None, required=False, widget=CategorySelect()
+    )
+    account = forms.ModelChoiceField(
+        queryset=None, required=False, widget=AccountSelect()
+    )
+    statement = forms.ModelChoiceField(queryset=None, required=False)
+    search = forms.CharField(label=_("Search"), required=False)
+    sort_by = forms.ChoiceField(
+        label=_("Sort by"),
+        choices=[
+            ("", _("Default")),
+            ("date", _("Date +")),
+            ("-date", _("Date -")),
+            ("value", _("Value +")),
+            ("-value", _("Value -")),
+        ],
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        _user = kwargs.pop("user")
+        super().__init__(*args, **kwargs)
+
+        self.fields["category"].queryset = _user.category_set
+        self.fields["account"].queryset = _user.account_set
+
+        if acc_id := kwargs.get("initial", {}).get("account"):
+            self.fields["statement"].queryset = (
+                self.fields["account"].queryset.get(id=acc_id).statement_set
+            )
+        else:
+            self.fields["statement"].queryset = _user.statement_set.none()
+            self.fields["statement"].disabled = True
+
+        self.fields["category"].widget.attrs |= {
+            "class": "category",
+            "data-icons": json.dumps(
+                {
+                    str(cat.id): cat.icon
+                    for cat in self.fields["category"].queryset.only("id", "icon")
+                }
+            ),
+        }
+        self.fields["account"].widget.attrs |= {
+            "class": "account",
+            "data-icons": json.dumps(
+                {
+                    str(acc.id): acc.icon
+                    for acc in self.fields["account"].queryset.only("id", "icon")
+                }
+            ),
+        }

nummi/transaction/locale/fr_FR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-25 12:05+0100\n"
+"POT-Creation-Date: 2025-01-04 18:51+0100\n"
 "PO-Revision-Date: 2023-04-23 08:03+0200\n"
 "Last-Translator: Edgar P. Burkhart <traduction@edgarpierre.fr>\n"
 "Language-Team: \n"
@@ -17,103 +17,152 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: .\transaction\models.py:19 .\transaction\models.py:82
+#: .\transaction\forms.py:175
+msgid "Search"
+msgstr "Rechercher"
+
+#: .\transaction\forms.py:177
+msgid "Sort by"
+msgstr "Trier par"
+
+#: .\transaction\forms.py:179
+msgid "Default"
+msgstr "Défaut"
+
+#: .\transaction\forms.py:180
+msgid "Date +"
+msgstr "Date +"
+
+#: .\transaction\forms.py:181
+msgid "Date -"
+msgstr "Date -"
+
+#: .\transaction\forms.py:182
+msgid "Value +"
+msgstr "Valeur +"
+
+#: .\transaction\forms.py:183
+msgid "Value -"
+msgstr "Valeur -"
+
+#: .\transaction\models.py:18 .\transaction\models.py:63
 msgid "Transaction"
 msgstr "Transaction"
 
-#: .\transaction\models.py:19 .\transaction\models.py:89
-#: .\transaction\templates\transaction\invoice_table.html:9
-#: .\transaction\templates\transaction\transaction_table.html:28
+#: .\transaction\models.py:18 .\transaction\models.py:70
+#: .\transaction\templates\transaction\transaction_table.html:19
 msgid "Name"
 msgstr "Nom"
 
-#: .\transaction\models.py:21
+#: .\transaction\models.py:20
 msgid "Description"
 msgstr "Description"
 
-#: .\transaction\models.py:23
-#: .\transaction\templates\transaction\transaction_table.html:29
+#: .\transaction\models.py:22
 msgid "Value"
 msgstr "Valeur"
 
-#: .\transaction\models.py:25
-#: .\transaction\templates\transaction\transaction_table.html:27
+#: .\transaction\models.py:24
+#: .\transaction\templates\transaction\transaction_table.html:18
 msgid "Date"
 msgstr "Date"
 
-#: .\transaction\models.py:26
+#: .\transaction\models.py:25
 msgid "Real date"
 msgstr "Date réelle"
 
-#: .\transaction\models.py:28
-#: .\transaction\templates\transaction\transaction_table.html:30
+#: .\transaction\models.py:27
+#: .\transaction\templates\transaction\transaction_table.html:22
 msgid "Trader"
 msgstr "Commerçant"
 
-#: .\transaction\models.py:31
+#: .\transaction\models.py:30
 msgid "Payment"
 msgstr "Paiement"
 
-#: .\transaction\models.py:38
-#: .\transaction\templates\transaction\transaction_table.html:32
+#: .\transaction\models.py:37
+#: .\transaction\templates\transaction\transaction_table.html:24
 msgid "Category"
 msgstr "Catégorie"
 
-#: .\transaction\models.py:43
+#: .\transaction\models.py:44
 msgid "Statement"
 msgstr "Relevé"
 
-#: .\transaction\models.py:48
-#: .\transaction\templates\transaction\transaction_table.html:35
-msgid "Account"
-msgstr "Compte"
-
-#: .\transaction\models.py:83
-#: .\transaction\templates\transaction\transaction_archive_month.html:11
+#: .\transaction\models.py:64
+#: .\transaction\templates\transaction\transaction_archive_month.html:25
+#: .\transaction\templates\transaction\transaction_archive_year.html:31
 #: .\transaction\templates\transaction\transaction_list.html:4
-#: .\transaction\templates\transaction\transaction_list.html:7
+#: .\transaction\templates\transaction\transaction_list.html:11
 msgid "Transactions"
 msgstr "Transactions"
 
-#: .\transaction\models.py:89 .\transaction\models.py:122
+#: .\transaction\models.py:70 .\transaction\models.py:103
 msgid "Invoice"
 msgstr "Facture"
 
-#: .\transaction\models.py:94
-#: .\transaction\templates\transaction\invoice_table.html:10
-#: .\transaction\templates\transaction\invoice_table.html:20
+#: .\transaction\models.py:75
 msgid "File"
 msgstr "Fichier"
 
-#: .\transaction\models.py:123
-#: .\transaction\templates\transaction\transaction_form.html:19
+#: .\transaction\models.py:104
+#: .\transaction\templates\transaction\transaction_detail.html:46
 msgid "Invoices"
 msgstr "Factures"
 
 #: .\transaction\templates\transaction\invoice_form.html:4
-#: .\transaction\templates\transaction\invoice_table.html:35
 msgid "Create invoice"
 msgstr "Créer une facture"
 
 #: .\transaction\templates\transaction\invoice_form.html:7
+#: .\transaction\templates\transaction\invoice_table.html:12
 msgid "New invoice"
 msgstr "Nouvelle facture"
 
-#: .\transaction\templates\transaction\invoice_table.html:11
-#: .\transaction\templates\transaction\invoice_table.html:23
-msgid "Delete"
-msgstr "Supprimer"
+#: .\transaction\templates\transaction\invoice_table.html:7
+msgid "Edit"
+msgstr "Modifier"
 
-#: .\transaction\templates\transaction\invoice_table.html:28
-msgid "No invoice"
-msgstr "Aucune facture"
+#: .\transaction\templates\transaction\transaction_archive_month.html:13
+#: .\transaction\templates\transaction\transaction_archive_year.html:13
+#: .\transaction\templates\transaction\transaction_form.html:18
+msgid "Back"
+msgstr "Retour"
 
-#: .\transaction\templates\transaction\transaction_archive_month.html:14
+#: .\transaction\templates\transaction\transaction_archive_month.html:20
+#: .\transaction\templates\transaction\transaction_archive_year.html:26
 msgid "Categories"
 msgstr "Catégories"
 
+#: .\transaction\templates\transaction\transaction_archive_year.html:20
+msgid "History"
+msgstr "Historique"
+
+#: .\transaction\templates\transaction\transaction_detail.html:39
+msgid "Edit transaction"
+msgstr "Modifier la transaction"
+
+#: .\transaction\templates\transaction\transaction_detail.html:57
+msgid "Add invoice"
+msgstr "Ajouter une facture"
+
+#: .\transaction\templates\transaction\transaction_filters.html:3
+msgid "Filters"
+msgstr "Filtres"
+
+#: .\transaction\templates\transaction\transaction_filters.html:12
+msgid "Filter"
+msgstr "Filtrer"
+
+#: .\transaction\templates\transaction\transaction_filters.html:13
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: .\transaction\templates\transaction\transaction_filters.html:15
+msgid "Clear"
+msgstr "Effacer"
+
 #: .\transaction\templates\transaction\transaction_form.html:5
-#: .\transaction\templates\transaction\transaction_table.html:5
 msgid "Create transaction"
 msgstr "Créer une transaction"
 
@@ -121,10 +170,33 @@ msgstr "Créer une transaction"
 msgid "New transaction"
 msgstr "Nouvelle transaction"
 
-#: .\transaction\templates\transaction\transaction_table.html:71
+#: .\transaction\templates\transaction\transaction_list.html:15
+msgid "Add transaction"
+msgstr "Ajouter une transaction"
+
+#: .\transaction\templates\transaction\transaction_table.html:20
+msgid "Expenses"
+msgstr "Dépenses"
+
+#: .\transaction\templates\transaction\transaction_table.html:21
+msgid "Income"
+msgstr "Recettes"
+
+#: .\transaction\templates\transaction\transaction_table.html:27
+msgid "Account"
+msgstr "Compte"
+
+#: .\transaction\templates\transaction\transaction_table.html:74
 msgid "No transaction"
 msgstr "Aucune transaction"
 
-#: .\transaction\templates\transaction\transaction_table.html:80
+#: .\transaction\templates\transaction\transaction_table.html:82
 msgid "View all transactions"
 msgstr "Voir toutes les transactions"
+
+#: .\transaction\views.py:101
+msgid "Error processing file"
+msgstr "Erreur lors du traitement du fichier"
+
+#~ msgid "Delete"
+#~ msgstr "Supprimer"

nummi/transaction/migrations/0003_alter_transaction_account_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.2 on 2024-12-30 15:29
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("statement", "0002_alter_statement_table"),
+        ("account", "0003_account_archived"),
+        ("transaction", "0002_alter_invoice_table_alter_transaction_table"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="transaction",
+            name="account",
+            field=models.ForeignKey(
+                blank=True,
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="account.account",
+                verbose_name="Account",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="transaction",
+            name="statement",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="statement.statement",
+                verbose_name="Statement",
+            ),
+        ),
+    ]

nummi/transaction/migrations/0004_remove_transaction_account.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2 on 2025-01-02 13:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("transaction", "0003_alter_transaction_account_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="transaction",
+            name="account",
+        ),
+    ]