10 changed files with 72 additions and 260 deletions
--- a/nummi/main/migrations/0013_account_snapshot_account_transaction_account.py
+++ b/nummi/main/migrations/0013_account_snapshot_account_transaction_account.py
@ -1,80 +0,0 @@
-# Generated by Django 4.1.4 on 2022-12-29 18:32
-
-import uuid
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("main", "0012_alter_snapshot_date"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Account",
-            fields=[
-                (
-                    "id",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                    ),
-                ),
-                (
-                    "name",
-                    models.CharField(
-                        default="Account", max_length=64, verbose_name="Nom"
-                    ),
-                ),
-                (
-                    "icon",
-                    models.CharField(
-                        default="folder", max_length=64, verbose_name="Icône"
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        editable=False,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Utilisateur",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Account",
-                "verbose_name_plural": "Accounts",
-                "ordering": ["name"],
-            },
-        ),
-        migrations.AddField(
-            model_name="snapshot",
-            name="account",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                to="main.account",
-                verbose_name="Account",
-            ),
-        ),
-        migrations.AddField(
-            model_name="transaction",
-            name="account",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                to="main.account",
-                verbose_name="Account",
-            ),
-        ),
-    ]
--- a/nummi/main/models.py
+++ b/nummi/main/models.py
@ -2,12 +2,12 @@ import pathlib
 import uuid
 from datetime import date

-from django.contrib.auth.models import User
 from django.core.validators import FileExtensionValidator
 from django.db import models
 from django.forms import ModelForm
 from django.urls import reverse
 from django.utils.translation import gettext as _
+from django.contrib.auth.models import User


 class UserModel(models.Model):
@ -19,57 +19,7 @@ class UserModel(models.Model):
        abstract = True


-class CustomModel(UserModel):
-    @property
-    def adding(self):
-        return self._state.adding
-
-    class Meta:
-        abstract = True
-
-
-class Account(CustomModel):
-    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    name = models.CharField(max_length=64, default=_("Account"), verbose_name=_("Name"))
-    icon = models.CharField(max_length=64, default="folder", verbose_name=_("Icon"))
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("account", kwargs={"pk": self.pk})
-
-    def get_delete_url(self):
-        return reverse("del_account", kwargs={"pk": self.pk})
-
-    @property
-    def transactions(self):
-        return Transaction.objects.filter(account=self)
-
-    @property
-    def snapshots(self):
-        return Snapshot.objects.filter(account=self)
-
-    class Meta:
-        ordering = ["name"]
-        verbose_name = _("Account")
-        verbose_name_plural = _("Accounts")
-
-
-class AccountModel(CustomModel):
-    account = models.ForeignKey(
-        Account,
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True,
-        verbose_name=_("Account"),
-    )
-
-    class Meta:
-        abstract = True
-
-
-class Category(CustomModel):
+class Category(UserModel):
    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
    name = models.CharField(
        max_length=64, default=_("Category"), verbose_name=_("Name")
@ -86,6 +36,10 @@ class Category(CustomModel):
    def get_delete_url(self):
        return reverse("del_category", kwargs={"pk": self.pk})

+    @property
+    def adding(self):
+        return self._state.adding
+
    @property
    def transactions(self):
        return Transaction.objects.filter(category=self)
@ -96,7 +50,15 @@ class Category(CustomModel):
        verbose_name_plural = _("Categories")


-class Transaction(AccountModel):
+class CategoryForm(ModelForm):
+    template_name = "main/form/base.html"
+
+    class Meta:
+        model = Category
+        fields = ["name", "icon", "budget"]
+
+
+class Transaction(UserModel):
    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
    name = models.CharField(
        max_length=256, default=_("Transaction"), verbose_name=_("Name")
@ -130,6 +92,10 @@ class Transaction(AccountModel):
    def get_delete_url(self):
        return reverse("del_transaction", kwargs={"pk": self.pk})

+    @property
+    def adding(self):
+        return self._state.adding
+
    @property
    def invoices(self):
        return Invoice.objects.filter(transaction=self)
@ -144,11 +110,28 @@ class Transaction(AccountModel):
        verbose_name_plural = _("Transactions")


+class TransactionForm(ModelForm):
+    template_name = "main/form/base.html"
+
+    class Meta:
+        model = Transaction
+        fields = [
+            "date",
+            "name",
+            "value",
+            "trader",
+            "category",
+            "real_date",
+            "payment",
+            "description",
+        ]
+
+
 def invoice_path(instance, filename):
    return pathlib.Path("invoices", str(instance.id)).with_suffix(".pdf")


-class Invoice(CustomModel):
+class Invoice(UserModel):
    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
    name = models.CharField(
        max_length=256, default=_("Invoice"), verbose_name=_("Name")
@ -182,16 +165,29 @@ class Invoice(CustomModel):
            "del_invoice", kwargs={"transaction_pk": self.transaction.pk, "pk": self.pk}
        )

+    @property
+    def adding(self):
+        return self._state.adding
+
    class Meta:
        verbose_name = _("Invoice")
        verbose_name_plural = _("Invoices")


+class InvoiceForm(ModelForm):
+    template_name = "main/form/base.html"
+    prefix = "invoice"
+
+    class Meta:
+        model = Invoice
+        fields = "__all__"
+
+
 def snapshot_path(instance, filename):
    return pathlib.Path("snapshots", str(instance.id)).with_suffix(".pdf")


-class Snapshot(AccountModel):
+class Snapshot(UserModel):
    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
    date = models.DateField(default=date.today, verbose_name=_("Date"))
    value = models.DecimalField(
@ -288,6 +284,10 @@ class Snapshot(AccountModel):
    def get_delete_url(self):
        return reverse("del_snapshot", kwargs={"pk": self.pk})

+    @property
+    def adding(self):
+        return self._state.adding
+
    @property
    def sum(self):
        if self.previous is None:
@ -327,37 +327,9 @@ class Snapshot(AccountModel):
        verbose_name_plural = _("Snapshots")


-class NummiForm(ModelForm):
+class SnapshotForm(ModelForm):
    template_name = "main/form/base.html"

-
-class AccountForm(NummiForm):
-    class Meta:
-        model = Account
-        fields = "__all__"
-
-
-class CategoryForm(NummiForm):
-    class Meta:
-        model = Category
-        fields = "__all__"
-
-
-class TransactionForm(NummiForm):
-    class Meta:
-        model = Transaction
-        fields = "__all__"
-
-
-class InvoiceForm(NummiForm):
-    prefix = "invoice"
-
-    class Meta:
-        model = Invoice
-        fields = "__all__"
-
-
-class SnapshotForm(NummiForm):
    class Meta:
        model = Snapshot
-        fields = "__all__"
+        fields = ["date", "value", "file"]
--- a/nummi/main/static/main/css/index.css
+++ b/nummi/main/static/main/css/index.css
@ -12,12 +12,10 @@ h1 img {
 	margin-right: var(--gap);
 }

-#categories > a,
-#accounts > a {
+#categories > a {
 	display: inline-block;
 	padding: 1em;
 }
-#categories > a > i,
-#accounts > a > i {
+#categories > a > i {
 	margin-right: .5rem;
 }
--- a/nummi/main/static/main/css/table.css
+++ b/nummi/main/static/main/css/table.css
@ -14,7 +14,6 @@
 .table.col1-1-1 {grid-template-columns: min-content auto min-content}
 .table.col1-5 {grid-template-columns: min-content repeat(5, auto)}
 .table.col1-6 {grid-template-columns: min-content repeat(6, auto)}
-.table.col1-7 {grid-template-columns: min-content repeat(7, auto)}

 .table > div {
 	display: contents;
--- a/nummi/main/templates/main/account_form.html
+++ b/nummi/main/templates/main/account_form.html
@ -1,22 +0,0 @@
-{% extends "main/base.html" %}
-{% load static %}
-{% 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"/>
-{% endblock %}
-{% block body %}
-    <h1>
-        <i class="fa fa-{{ form.instance.icon }}"></i> {{ form.instance }}
-    </h1>
-    <form method="post">
-        {% csrf_token %}
-        {{ form }}
-    </form>
-{% endblock %}
--- a/nummi/main/templates/main/base.html
+++ b/nummi/main/templates/main/base.html
@ -33,11 +33,6 @@
                        <img src="{% static 'main/svg/logo.svg' %}" alt="" />
                        <h1>Nummi</h1>
                    </a>
-                    <a href="{% url 'account' %}"
-                       class="{% if request.resolver_match.url_name == 'account' %}cur{% endif %}"
-                       accesskey="n">
-                        {% translate "Account" %}
-                    </a>
                    <a href="{% url 'transaction' %}"
                       class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}"
                       accesskey="n">
--- a/nummi/main/templates/main/index.html
+++ b/nummi/main/templates/main/index.html
@ -12,16 +12,6 @@
          type="text/css"/>
 {% endblock %}
 {% block body %}
-    {% if accounts %}
-        <h2>{% translate "Accounts" %}</h2>
-        {% spaceless %}
-            <div id="accounts">
-                {% for acc in accounts %}
-                    <a href="{% url 'account' acc.id %}"><i class="fa fa-{{ acc.icon }}"></i>{{ acc }}</a>
-                {% endfor %}
-            </div>
-        {% endspaceless %}
-    {% endif %}
    {% if transactions %}
        <h2>
            {% translate "Transactions" %}
@ -43,11 +33,10 @@
    {% endif %}
    {% if snapshots %}
        <h2>{% translate "Snapshots" %}</h2>
-        <div id="snapshots" class="table col1-6">
+        <div id="snapshots" class="table col1-5">
            <div class="header">
                <strong class="attach center"><i class="fa fa-paperclip"></i></strong>
                <strong class="date center">{% translate "Date" %}</strong>
-                <strong class="account center">{% translate "Account" %}</strong>
                <strong class="value center">{% translate "Value" %}</strong>
                <strong class="diff center">{% translate "Difference" %}</strong>
                <strong class="diff center">{% translate "Transactions" %}</strong>
@ -65,14 +54,6 @@
                    <span class="date num center">
                        <a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a>
                    </span>
-                    <span class="account text center">
-                        {% if trans.account %}
-                            <i class="fa fa-{{ trans.account.icon }}"></i>
-                            <a href="{% url 'account' trans.account.id %}">{{ trans.account }}</a>
-                        {% else %}
-                            –
-                        {% endif %}
-                    </span>
                    <span class="value num right">{{ snap.value|value }}</span>
                    <span class="diff num right">{{ snap.diff|pmvalue }}</span>
                    {% with sum=snap.sum %}
--- a/nummi/main/templates/main/tag/transaction_table.html
+++ b/nummi/main/templates/main/tag/transaction_table.html
@ -1,6 +1,6 @@
 {% load main_extras %}
 {% load i18n %}
-<div id="transactions" class="table col1-7">
+<div id="transactions" class="table col1-6">
    <div class="header">
        <strong class="attach center"><i class="fa fa-paperclip"></i></strong>
        <strong class="date center">{% translate "Date" %}</strong>
@ -8,7 +8,6 @@
        <strong class="value center">{% translate "Value" %}</strong>
        <strong class="trader center">{% translate "Trader" %}</strong>
        <strong class="category center">{% translate "Category" %}</strong>
-        <strong class="account center">{% translate "Account" %}</strong>
        <strong class="description">{% translate "Description" %}</strong>
    </div>
    {% for trans in transactions %}
@ -34,14 +33,6 @@
                    –
                {% endif %}
            </span>
-            <span class="account text center">
-                {% if trans.account %}
-                    <i class="fa fa-{{ trans.account.icon }}"></i>
-                    <a href="{% url 'account' trans.account.id %}">{{ trans.account }}</a>
-                {% else %}
-                    –
-                {% endif %}
-            </span>
            <span class="description text">{{ trans.description }}</span>
        </div>
    {% endfor %}
--- a/nummi/main/urls.py
+++ b/nummi/main/urls.py
@ -7,7 +7,6 @@ urlpatterns = [
    path("login", views.LoginView.as_view(), name="login"),
    path("logout", views.LogoutView.as_view(), name="logout"),
    path("transactions", views.TransactionListView.as_view(), name="transactions"),
-    path("account", views.AccountCreateView.as_view(), name="account"),
    path("transaction", views.TransactionCreateView.as_view(), name="transaction"),
    path(
        "transaction/<transaction_pk>/invoice",
@ -16,7 +15,6 @@ urlpatterns = [
    ),
    path("category", views.CategoryCreateView.as_view(), name="category"),
    path("snapshot", views.SnapshotCreateView.as_view(), name="snapshot"),
-    path("account/<pk>", views.AccountUpdateView.as_view(), name="account"),
    path("transaction/<pk>", views.TransactionUpdateView.as_view(), name="transaction"),
    path(
        "transaction/<transaction_pk>/invoice/<pk>",
@ -25,11 +23,6 @@ urlpatterns = [
    ),
    path("category/<pk>", views.CategoryUpdateView.as_view(), name="category"),
    path("snapshot/<pk>", views.SnapshotUpdateView.as_view(), name="snapshot"),
-    path(
-        "account/<pk>/delete",
-        views.AccountDeleteView.as_view(),
-        name="del_account",
-    ),
    path(
        "transaction/<pk>/delete",
        views.TransactionDeleteView.as_view(),
--- a/nummi/main/views.py
+++ b/nummi/main/views.py
@ -19,8 +19,6 @@ from django.views.generic import (
 from django.views.generic.edit import ProcessFormView

 from .models import (
-    Account,
-    AccountForm,
    Category,
    CategoryForm,
    Invoice,
@ -37,7 +35,6 @@ class IndexView(LoginRequiredMixin, TemplateView):

    def get_context_data(self, **kwargs):
        return super().get_context_data(**kwargs) | {
-            "accounts": Account.objects.filter(user=self.request.user),
            "transactions": Transaction.objects.filter(user=self.request.user)[:10],
            "categories": Category.objects.filter(user=self.request.user),
            "snapshots": Snapshot.objects.filter(user=self.request.user),
@ -55,11 +52,6 @@ class UserCreateView(LoginRequiredMixin, CreateView):
        return super().form_valid(form)


-class NummiDeleteView(UserMixin, DeleteView):
-    template_name = "main/confirm_delete.html"
-    success_url = reverse_lazy("index")
-
-
 class LoginView(auth_views.LoginView):
    template_name = "main/login.html"
    next_page = "index"
@ -76,11 +68,6 @@ class TransactionListView(UserMixin, ListView):
    context_object_name = "transactions"


-class AccountCreateView(UserCreateView):
-    model = Account
-    form_class = AccountForm
-
-
 class TransactionCreateView(UserCreateView):
    model = Transaction
    form_class = TransactionForm
@ -111,11 +98,6 @@ class SnapshotCreateView(UserCreateView):
    form_class = SnapshotForm


-class AccountUpdateView(UserMixin, UpdateView):
-    model = Account
-    form_class = AccountForm
-
-
 class TransactionUpdateView(UserMixin, UpdateView):
    model = Transaction
    form_class = TransactionForm
@ -150,16 +132,15 @@ class SnapshotUpdateView(UserMixin, UpdateView):
    form_class = SnapshotForm


-class AccountDeleteView(NummiDeleteView):
-    model = Account
-
-
-class TransactionDeleteView(NummiDeleteView):
+class TransactionDeleteView(UserMixin, DeleteView):
    model = Transaction
+    template_name = "main/confirm_delete.html"
+    success_url = reverse_lazy("index")


-class InvoiceDeleteView(NummiDeleteView):
+class InvoiceDeleteView(UserMixin, DeleteView):
    model = Invoice
+    template_name = "main/confirm_delete.html"

    def get_success_url(self):
        return reverse_lazy("transaction", kwargs={"pk": self.object.transaction.pk})
@ -170,12 +151,16 @@ class InvoiceDeleteView(NummiDeleteView):
        )


-class CategoryDeleteView(NummiDeleteView):
+class CategoryDeleteView(UserMixin, DeleteView):
    model = Category
+    template_name = "main/confirm_delete.html"
+    success_url = reverse_lazy("index")


-class SnapshotDeleteView(NummiDeleteView):
+class SnapshotDeleteView(UserMixin, DeleteView):
    model = Snapshot
+    template_name = "main/confirm_delete.html"
+    success_url = reverse_lazy("index")


 class SearchView(UserMixin, ListView, ProcessFormView):