Compare commits
1 commit
main
...
dev-no-fon
| Author | SHA1 | Date | |
|---|---|---|---|
1a26152ac8
|
184 changed files with 1369 additions and 6641 deletions
|
|
@ -1,29 +0,0 @@
|
|||
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
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +1,2 @@
|
|||
/env*
|
||||
env
|
||||
__pycache__
|
||||
/media
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
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:
|
||||
- id: isort
|
||||
args: ["--profile", "black"]
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 23.3.0
|
||||
hooks:
|
||||
- id: black
|
||||
- repo: https://github.com/PyCQA/flake8
|
||||
rev: "6.0.0"
|
||||
hooks:
|
||||
- id: flake8
|
||||
args: ["--max-line-length=88", "--extend-ignore=E203"]
|
||||
- repo: https://github.com/Riverside-Healthcare/djLint
|
||||
rev: v1.23.3
|
||||
hooks:
|
||||
- id: djlint-django
|
||||
args: ["--reformat", "--lint", "--quiet"]
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: "v3.0.0-alpha.6"
|
||||
hooks:
|
||||
- id: prettier
|
||||
types_or: ["css", "javascript", "svg"]
|
||||
|
|
@ -1 +0,0 @@
|
|||
endOfLine = "auto"
|
||||
|
|
@ -1 +0,0 @@
|
|||
3.12
|
||||
22
.vscode/launch.json
vendored
22
.vscode/launch.json
vendored
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
// 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
|
||||
}
|
||||
]
|
||||
}
|
||||
17
Dockerfile
17
Dockerfile
|
|
@ -1,17 +0,0 @@
|
|||
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"]
|
||||
|
|
@ -2,3 +2,8 @@
|
|||
|
||||
Nummi is a web-based accounting software.
|
||||
Nummi uses Django.
|
||||
|
||||
## Installation
|
||||
|
||||
A PKGBUILD along with system files is provided on the
|
||||
[pkgbuild](https://git.edgarpierre.fr/edpibu/nummi/src/branch/pkgbuild) branch.
|
||||
|
|
|
|||
23
compose.yaml
23
compose.yaml
|
|
@ -1,23 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class AccountConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "account"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
from django.forms.widgets import Select
|
||||
from main.forms import IconInput, NummiForm
|
||||
|
||||
from .models import Account
|
||||
|
||||
|
||||
class AccountForm(NummiForm):
|
||||
class Meta:
|
||||
model = Account
|
||||
fields = [
|
||||
"name",
|
||||
"icon",
|
||||
"default",
|
||||
"archived",
|
||||
]
|
||||
widgets = {
|
||||
"icon": IconInput(),
|
||||
}
|
||||
|
||||
|
||||
class AccountSelect(Select):
|
||||
template_name = "account/forms/widgets/account.html"
|
||||
Binary file not shown.
|
|
@ -1,75 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \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"
|
||||
"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.2.2\n"
|
||||
|
||||
#: .\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:12
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
#: .\account\models.py:16
|
||||
msgid "Icon"
|
||||
msgstr "Icône"
|
||||
|
||||
#: .\account\models.py:18
|
||||
msgid "Default"
|
||||
msgstr "Défaut"
|
||||
|
||||
#: .\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"
|
||||
|
||||
#: .\account\templates\account\account_form.html:8
|
||||
msgid "New account"
|
||||
msgstr "Nouveau compte"
|
||||
|
||||
#: .\account\templates\account\account_table.html:16
|
||||
msgid "All accounts"
|
||||
msgstr "Tous les comptes"
|
||||
|
||||
#: .\account\templates\account\account_table.html:26
|
||||
msgid "Show archived"
|
||||
msgstr "Afficher archivés"
|
||||
|
||||
#~ msgid "Transactions"
|
||||
#~ msgstr "Transactions"
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-22 09:01
|
||||
|
||||
import uuid
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
("main", "0002_segmentation"),
|
||||
]
|
||||
|
||||
state_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="Name"
|
||||
),
|
||||
),
|
||||
(
|
||||
"icon",
|
||||
models.SlugField(
|
||||
default="bank", max_length=24, verbose_name="Icon"
|
||||
),
|
||||
),
|
||||
("default", models.BooleanField(default=False, verbose_name="Default")),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Account",
|
||||
"verbose_name_plural": "Accounts",
|
||||
"ordering": ["-default", "name"],
|
||||
"db_table": "account_account",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.SeparateDatabaseAndState(state_operations=state_operations)
|
||||
]
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-22 09:28
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("account", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelTable(
|
||||
name="account",
|
||||
table=None,
|
||||
),
|
||||
]
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
# 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"),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# 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",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
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 NummiModel
|
||||
|
||||
|
||||
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(
|
||||
max_length=24,
|
||||
default="bank",
|
||||
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:
|
||||
for ac in Account.objects.filter(user=self.user, default=True):
|
||||
ac.default = False
|
||||
ac.save()
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
return str(self.name)
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse("account", args=(self.pk,))
|
||||
|
||||
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", "archived", "name"]
|
||||
verbose_name = _("Account")
|
||||
verbose_name_plural = _("Accounts")
|
||||
|
||||
|
||||
class AccountModel(NummiModel):
|
||||
account = models.ForeignKey(
|
||||
Account,
|
||||
on_delete=models.CASCADE,
|
||||
verbose_name=_("Account"),
|
||||
)
|
||||
|
||||
class Meta:
|
||||
abstract = True
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{% extends "main/form/base.html" %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
{% block title_new %}
|
||||
{% translate "Create account" %}
|
||||
{% endblock %}
|
||||
{% block h2_new %}
|
||||
{% translate "New account" %}
|
||||
{% endblock %}
|
||||
{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{% 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>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{% load main_extras %}
|
||||
<span class="ico-input account-select">
|
||||
{{ "bank"|remix }}
|
||||
{% include "django/forms/widgets/select.html" %}
|
||||
</span>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
from django import template
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.inclusion_tag("account/account_table.html")
|
||||
def account_table(accounts, **kwargs):
|
||||
return kwargs | {
|
||||
"accounts": accounts,
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
from django.urls import path
|
||||
from statement.views import StatementCreateView
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path("list", views.AccountListView.as_view(), name="accounts"),
|
||||
path("new", views.AccountCreateView.as_view(), name="new_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(),
|
||||
name="account_transactions",
|
||||
),
|
||||
path(
|
||||
"<account>/statements",
|
||||
views.AccountSListView.as_view(),
|
||||
name="account_statements",
|
||||
),
|
||||
path(
|
||||
"<account>/statement",
|
||||
StatementCreateView.as_view(),
|
||||
name="new_statement",
|
||||
),
|
||||
path(
|
||||
"<account>/delete",
|
||||
views.AccountDeleteView.as_view(),
|
||||
name="del_account",
|
||||
),
|
||||
]
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
from django.shortcuts import get_object_or_404
|
||||
from main.views import (
|
||||
NummiCreateView,
|
||||
NummiDeleteView,
|
||||
NummiDetailView,
|
||||
NummiListView,
|
||||
NummiUpdateView,
|
||||
)
|
||||
from statement.views import StatementListView
|
||||
from transaction.views import TransactionListView
|
||||
|
||||
from .forms import AccountForm
|
||||
from .models import Account
|
||||
|
||||
|
||||
class AccountCreateView(NummiCreateView):
|
||||
model = Account
|
||||
form_class = AccountForm
|
||||
|
||||
|
||||
class AccountUpdateView(NummiUpdateView):
|
||||
model = Account
|
||||
form_class = AccountForm
|
||||
pk_url_kwarg = "account"
|
||||
|
||||
|
||||
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(
|
||||
Account.objects.filter(user=self.request.user),
|
||||
pk=self.kwargs.get("account"),
|
||||
)
|
||||
return super().get_queryset().filter(account=self.account)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
return super().get_context_data(**kwargs) | {"account": self.account}
|
||||
|
||||
|
||||
class AccountListView(NummiListView):
|
||||
model = Account
|
||||
context_object_name = "accounts"
|
||||
|
||||
|
||||
class AccountTListView(AccountMixin, TransactionListView):
|
||||
pass
|
||||
|
||||
|
||||
class AccountSListView(AccountMixin, StatementListView):
|
||||
pass
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class CategoryConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "category"
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
from django.forms.widgets import Select
|
||||
from main.forms import IconInput, NummiForm
|
||||
|
||||
from .models import Category
|
||||
|
||||
|
||||
class CategoryForm(NummiForm):
|
||||
class Meta:
|
||||
model = Category
|
||||
fields = [
|
||||
"name",
|
||||
"icon",
|
||||
"budget",
|
||||
]
|
||||
widgets = {
|
||||
"icon": IconInput,
|
||||
}
|
||||
|
||||
|
||||
class CategorySelect(Select):
|
||||
template_name = "category/forms/widgets/category.html"
|
||||
Binary file not shown.
|
|
@ -1,83 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \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"
|
||||
"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.2.2\n"
|
||||
|
||||
#: .\category\models.py:12 .\category\models.py:32
|
||||
#: .\category\templates\category\category_plot.html:13
|
||||
msgid "Category"
|
||||
msgstr "Catégorie"
|
||||
|
||||
#: .\category\models.py:12
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
#: .\category\models.py:17
|
||||
msgid "Icon"
|
||||
msgstr "Icône"
|
||||
|
||||
#: .\category\models.py:19
|
||||
msgid "Budget"
|
||||
msgstr "Budget"
|
||||
|
||||
#: .\category\models.py:33
|
||||
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"
|
||||
|
||||
#: .\category\templates\category\category_form.html:8
|
||||
msgid "New category"
|
||||
msgstr "Nouvelle catégorie"
|
||||
|
||||
#: .\category\templates\category\category_plot.html:14
|
||||
msgid "Expenses"
|
||||
msgstr "Dépenses"
|
||||
|
||||
#: .\category\templates\category\category_plot.html:15
|
||||
msgid "Income"
|
||||
msgstr "Revenus"
|
||||
|
||||
#: .\category\templates\category\category_plot.html:58
|
||||
msgid "No transaction"
|
||||
msgstr "Aucune transaction"
|
||||
|
||||
#: .\category\templates\category\category_plot.html:66
|
||||
msgid "Total"
|
||||
msgstr "Total"
|
||||
|
||||
#: .\category\templates\category\category_plot.html:89
|
||||
msgid "Expected total"
|
||||
msgstr "Total attendu"
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-22 09:01
|
||||
|
||||
import uuid
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
state_operations = [
|
||||
migrations.CreateModel(
|
||||
name="Category",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(
|
||||
default="Category", max_length=64, verbose_name="Name"
|
||||
),
|
||||
),
|
||||
(
|
||||
"icon",
|
||||
models.SlugField(
|
||||
default="folder", max_length=24, verbose_name="Icon"
|
||||
),
|
||||
),
|
||||
("budget", models.BooleanField(default=True, verbose_name="Budget")),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Category",
|
||||
"verbose_name_plural": "Categories",
|
||||
"ordering": ["name"],
|
||||
"db_table": "category_category",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.SeparateDatabaseAndState(state_operations=state_operations)
|
||||
]
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-22 09:28
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("category", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelTable(
|
||||
name="category",
|
||||
table=None,
|
||||
),
|
||||
]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
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 NummiModel
|
||||
|
||||
|
||||
class Category(NummiModel):
|
||||
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
||||
name = models.CharField(
|
||||
max_length=64, default=_("Category"), verbose_name=_("Name")
|
||||
)
|
||||
icon = models.SlugField(
|
||||
max_length=24,
|
||||
default="folder",
|
||||
verbose_name=_("Icon"),
|
||||
)
|
||||
budget = models.BooleanField(default=True, verbose_name=_("Budget"))
|
||||
|
||||
def __str__(self):
|
||||
return str(self.name)
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse("category", args=(self.pk,))
|
||||
|
||||
def get_delete_url(self):
|
||||
return reverse("del_category", args=(self.pk,))
|
||||
|
||||
class Meta:
|
||||
ordering = ["name"]
|
||||
verbose_name = _("Category")
|
||||
verbose_name_plural = _("Categories")
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{% extends "main/form/base.html" %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
{% block title_new %}
|
||||
{% translate "Create category" %}
|
||||
{% endblock %}
|
||||
{% block h2_new %}
|
||||
{% translate "New category" %}
|
||||
{% endblock %}
|
||||
{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
{% load main_extras statement_extras history_extras %}
|
||||
{% load i18n %}
|
||||
<div class="plot">
|
||||
<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>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{% load main_extras %}
|
||||
<span class="ico-input category-select">
|
||||
{{ "folder"|remix }}
|
||||
{% include "django/forms/widgets/select.html" %}
|
||||
</span>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
from django import template
|
||||
from django.db import models
|
||||
from django.db.models.functions import Greatest
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@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.values("category", "category__name", "category__icon")
|
||||
.annotate(
|
||||
sum=models.Sum("value"),
|
||||
sum_m=models.Sum("value", filter=models.Q(value__lt=0)),
|
||||
sum_p=models.Sum("value", filter=models.Q(value__gt=0)),
|
||||
)
|
||||
.order_by("-sum")
|
||||
)
|
||||
return (
|
||||
kwargs
|
||||
| {
|
||||
"categories": categories,
|
||||
}
|
||||
| categories.aggregate(
|
||||
max=Greatest(-models.Sum("sum_m"), models.Sum("sum_p")),
|
||||
total_m=models.Sum("sum_m"),
|
||||
total_p=models.Sum("sum_p"),
|
||||
total=models.Sum("sum"),
|
||||
)
|
||||
)
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
from django.urls import path
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path("new", views.CategoryCreateView.as_view(), name="new_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"),
|
||||
]
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
from django.shortcuts import get_object_or_404
|
||||
from main.views import (
|
||||
NummiCreateView,
|
||||
NummiDeleteView,
|
||||
NummiDetailView,
|
||||
NummiUpdateView,
|
||||
)
|
||||
from transaction.views import TransactionListView
|
||||
|
||||
from .forms import CategoryForm
|
||||
from .models import Category
|
||||
|
||||
|
||||
class CategoryCreateView(NummiCreateView):
|
||||
model = Category
|
||||
form_class = CategoryForm
|
||||
|
||||
|
||||
class CategoryUpdateView(NummiUpdateView):
|
||||
model = Category
|
||||
form_class = CategoryForm
|
||||
pk_url_kwarg = "category"
|
||||
|
||||
|
||||
class CategoryDetailView(NummiDetailView):
|
||||
model = Category
|
||||
pk_url_kwarg = "category"
|
||||
context_object_name = "category"
|
||||
|
||||
|
||||
class CategoryDeleteView(NummiDeleteView):
|
||||
model = Category
|
||||
pk_url_kwarg = "category"
|
||||
|
||||
|
||||
class CategoryMixin:
|
||||
def get_queryset(self):
|
||||
self.category = get_object_or_404(
|
||||
Category.objects.filter(user=self.request.user),
|
||||
pk=self.kwargs.get("category"),
|
||||
)
|
||||
return super().get_queryset().filter(category=self.category)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
return super().get_context_data(**kwargs) | {"category": self.category}
|
||||
|
||||
|
||||
class CategoryTListView(CategoryMixin, TransactionListView):
|
||||
pass
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class HistoryConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "history"
|
||||
Binary file not shown.
|
|
@ -1,38 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \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"
|
||||
"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.2.2\n"
|
||||
|
||||
#: .\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:57
|
||||
msgid "Expenses"
|
||||
msgstr "Dépenses"
|
||||
|
||||
#: .\history\templates\history\plot.html:58
|
||||
msgid "Income"
|
||||
msgstr "Revenus"
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{% 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>
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
{% load main_extras %}
|
||||
{% load history_extras %}
|
||||
{% load transaction_extras %}
|
||||
{% load i18n %}
|
||||
<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>
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{% 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 %}
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
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"),
|
||||
]
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
import datetime
|
||||
|
||||
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"
|
||||
)
|
||||
_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")
|
||||
)
|
||||
|
||||
_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": _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,
|
||||
},
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
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
|
||||
8
nummi/main/admin.py
Normal file
8
nummi/main/admin.py
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from .models import Transaction, Invoice, Category, Snapshot
|
||||
|
||||
admin.site.register(Transaction)
|
||||
admin.site.register(Invoice)
|
||||
admin.site.register(Category)
|
||||
admin.site.register(Snapshot)
|
||||
|
|
@ -2,4 +2,5 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class MainConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "main"
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
from django import forms
|
||||
from django.forms.widgets import TextInput
|
||||
|
||||
from .utils import get_icons
|
||||
|
||||
|
||||
class NummiFileInput(forms.ClearableFileInput):
|
||||
template_name = "main/form/fileinput.html"
|
||||
|
||||
|
||||
class NummiForm(forms.ModelForm):
|
||||
template_name = "main/form/form_base.html"
|
||||
meta_fieldsets = []
|
||||
|
||||
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
|
||||
Binary file not shown.
|
|
@ -1,134 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \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"
|
||||
"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.2.2\n"
|
||||
|
||||
#: .\main\models.py:10
|
||||
msgid "User"
|
||||
msgstr "Utilisateur"
|
||||
|
||||
#: .\main\templates\main\base.html:28
|
||||
msgid "Skip to main content"
|
||||
msgstr "Aller au contenu principal"
|
||||
|
||||
#: .\main\templates\main\base.html:35
|
||||
msgid "Home"
|
||||
msgstr "Accueil"
|
||||
|
||||
#: .\main\templates\main\base.html:42 .\main\templates\main\index.html:17
|
||||
msgid "Statements"
|
||||
msgstr "Relevés"
|
||||
|
||||
#: .\main\templates\main\base.html:49
|
||||
msgid "Transactions"
|
||||
msgstr "Transactions"
|
||||
|
||||
#: .\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:62
|
||||
#, python-format
|
||||
msgid "Logged in as <strong>%(user)s</strong>"
|
||||
msgstr "Connecté en tant que <strong>%(user)s</strong>"
|
||||
|
||||
#: .\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:20
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
||||
#: .\main\templates\main\confirm_delete.html:21
|
||||
msgid "Confirm"
|
||||
msgstr "Confirmer"
|
||||
|
||||
#: .\main\templates\main\form\fileinput.html:6
|
||||
msgid "File"
|
||||
msgstr "Fichier"
|
||||
|
||||
#: .\main\templates\main\form\form_base.html:46
|
||||
msgid "Create"
|
||||
msgstr "Créer"
|
||||
|
||||
#: .\main\templates\main\form\form_base.html:48
|
||||
msgid "Save"
|
||||
msgstr "Enregistrer"
|
||||
|
||||
#: .\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:23
|
||||
msgid "Categories"
|
||||
msgstr "Catégories"
|
||||
|
||||
#: .\main\templates\main\index.html:29
|
||||
msgid "Create category"
|
||||
msgstr "Créer une catégorie"
|
||||
|
||||
#: .\main\templates\main\index.html:34
|
||||
msgid "History"
|
||||
msgstr "Historique"
|
||||
|
||||
#: .\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"
|
||||
153
nummi/main/migrations/0001_initial.py
Normal file
153
nummi/main/migrations/0001_initial.py
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
# Generated by Django 4.0.4 on 2022-05-22 07:45
|
||||
|
||||
import datetime
|
||||
import django.core.validators
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import re
|
||||
import uuid
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = []
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Category",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(
|
||||
default="New Category",
|
||||
max_length=64,
|
||||
validators=[
|
||||
django.core.validators.RegexValidator(
|
||||
re.compile("^[-\\w]+\\Z"),
|
||||
"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or hyphens.",
|
||||
"invalid",
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
("icon", models.CharField(default="folder", max_length=64)),
|
||||
],
|
||||
options={
|
||||
"ordering": ["name"],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Transaction",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
("name", models.CharField(default="New Transaction", max_length=256)),
|
||||
("description", models.TextField(blank=True, null=True)),
|
||||
(
|
||||
"value",
|
||||
models.DecimalField(decimal_places=2, default=0, max_digits=12),
|
||||
),
|
||||
("date", models.DateField(default=datetime.date.today)),
|
||||
("trader", models.CharField(blank=True, max_length=128, null=True)),
|
||||
(
|
||||
"category",
|
||||
models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
to="main.category",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["-date"],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Snapshot",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
("date", models.DateField(default=datetime.date.today, unique=True)),
|
||||
(
|
||||
"value",
|
||||
models.DecimalField(decimal_places=2, default=0, max_digits=12),
|
||||
),
|
||||
(
|
||||
"diff",
|
||||
models.DecimalField(
|
||||
decimal_places=2, default=0, editable=False, max_digits=12
|
||||
),
|
||||
),
|
||||
(
|
||||
"previous",
|
||||
models.OneToOneField(
|
||||
blank=True,
|
||||
editable=False,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
to="main.snapshot",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["-date"],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Invoice",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
("name", models.CharField(default="New Invoice", max_length=256)),
|
||||
(
|
||||
"file",
|
||||
models.FileField(
|
||||
upload_to="invoices/",
|
||||
validators=[
|
||||
django.core.validators.FileExtensionValidator(["pdf"])
|
||||
],
|
||||
),
|
||||
),
|
||||
(
|
||||
"transaction",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="main.transaction",
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
|
@ -1,349 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-20 15:32
|
||||
|
||||
import datetime
|
||||
import uuid
|
||||
|
||||
import django.contrib.postgres.operations
|
||||
import django.core.validators
|
||||
import django.db.models.deletion
|
||||
import media.utils
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
django.contrib.postgres.operations.TrigramExtension(),
|
||||
django.contrib.postgres.operations.UnaccentExtension(),
|
||||
migrations.CreateModel(
|
||||
name="Category",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(
|
||||
default="Category", max_length=64, verbose_name="Name"
|
||||
),
|
||||
),
|
||||
("budget", models.BooleanField(default=True, verbose_name="Budget")),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
(
|
||||
"icon",
|
||||
models.SlugField(
|
||||
default="folder", max_length=24, verbose_name="Icon"
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["name"],
|
||||
"verbose_name": "Category",
|
||||
"verbose_name_plural": "Categories",
|
||||
},
|
||||
),
|
||||
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="Name"
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
("default", models.BooleanField(default=False, verbose_name="Default")),
|
||||
(
|
||||
"icon",
|
||||
models.SlugField(
|
||||
default="bank", max_length=24, verbose_name="Icon"
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Account",
|
||||
"verbose_name_plural": "Accounts",
|
||||
"ordering": ["-default", "name"],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Snapshot",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"date",
|
||||
models.DateField(
|
||||
default=datetime.date.today, verbose_name="End date"
|
||||
),
|
||||
),
|
||||
(
|
||||
"value",
|
||||
models.DecimalField(
|
||||
decimal_places=2,
|
||||
default=0,
|
||||
max_digits=12,
|
||||
verbose_name="End value",
|
||||
),
|
||||
),
|
||||
(
|
||||
"file",
|
||||
models.FileField(
|
||||
blank=True,
|
||||
default="",
|
||||
max_length=256,
|
||||
upload_to=media.utils.get_path,
|
||||
validators=[
|
||||
django.core.validators.FileExtensionValidator(["pdf"])
|
||||
],
|
||||
verbose_name="File",
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
(
|
||||
"account",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="main.account",
|
||||
verbose_name="Account",
|
||||
),
|
||||
),
|
||||
(
|
||||
"start_date",
|
||||
models.DateField(
|
||||
default=datetime.date.today, verbose_name="Start date"
|
||||
),
|
||||
),
|
||||
(
|
||||
"start_value",
|
||||
models.DecimalField(
|
||||
decimal_places=2,
|
||||
default=0,
|
||||
max_digits=12,
|
||||
verbose_name="Start value",
|
||||
),
|
||||
),
|
||||
(
|
||||
"diff",
|
||||
models.DecimalField(
|
||||
decimal_places=2,
|
||||
default=0,
|
||||
editable=False,
|
||||
max_digits=12,
|
||||
verbose_name="Difference",
|
||||
),
|
||||
),
|
||||
(
|
||||
"sum",
|
||||
models.DecimalField(
|
||||
decimal_places=2,
|
||||
default=0,
|
||||
editable=False,
|
||||
max_digits=12,
|
||||
verbose_name="Transaction difference",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["-date", "account"],
|
||||
"verbose_name": "Statement",
|
||||
"verbose_name_plural": "Statements",
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Transaction",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(
|
||||
default="Transaction", max_length=256, verbose_name="Name"
|
||||
),
|
||||
),
|
||||
(
|
||||
"description",
|
||||
models.TextField(blank=True, null=True, verbose_name="Description"),
|
||||
),
|
||||
(
|
||||
"value",
|
||||
models.DecimalField(
|
||||
decimal_places=2, default=0, max_digits=12, verbose_name="Value"
|
||||
),
|
||||
),
|
||||
(
|
||||
"date",
|
||||
models.DateField(default=datetime.date.today, verbose_name="Date"),
|
||||
),
|
||||
(
|
||||
"trader",
|
||||
models.CharField(
|
||||
blank=True, max_length=128, null=True, verbose_name="Trader"
|
||||
),
|
||||
),
|
||||
(
|
||||
"category",
|
||||
models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
to="main.category",
|
||||
verbose_name="Category",
|
||||
),
|
||||
),
|
||||
(
|
||||
"real_date",
|
||||
models.DateField(blank=True, null=True, verbose_name="Real date"),
|
||||
),
|
||||
(
|
||||
"payment",
|
||||
models.CharField(
|
||||
blank=True, max_length=128, null=True, verbose_name="Payment"
|
||||
),
|
||||
),
|
||||
(
|
||||
"account",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="main.account",
|
||||
verbose_name="Account",
|
||||
),
|
||||
),
|
||||
(
|
||||
"snapshot",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="main.snapshot",
|
||||
verbose_name="Statement",
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["-date", "snapshot"],
|
||||
"verbose_name": "Transaction",
|
||||
"verbose_name_plural": "Transactions",
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="Invoice",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"name",
|
||||
models.CharField(
|
||||
default="Invoice", max_length=256, verbose_name="Name"
|
||||
),
|
||||
),
|
||||
(
|
||||
"file",
|
||||
models.FileField(
|
||||
max_length=128,
|
||||
upload_to=media.utils.get_path,
|
||||
validators=[
|
||||
django.core.validators.FileExtensionValidator(["pdf"])
|
||||
],
|
||||
verbose_name="File",
|
||||
),
|
||||
),
|
||||
(
|
||||
"transaction",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="main.transaction",
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
editable=False,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="User",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["transaction", "name"],
|
||||
"verbose_name": "Invoice",
|
||||
"verbose_name_plural": "Invoices",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
# Generated by Django 4.0.4 on 2022-05-22 09:15
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("main", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="snapshot",
|
||||
name="date",
|
||||
field=models.DateField(unique=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="snapshot",
|
||||
name="diff",
|
||||
field=models.DecimalField(
|
||||
blank=True, decimal_places=2, editable=False, max_digits=12, null=True
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
# Generated by Django 4.1.4 on 2023-04-22 09:01
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("main", "0001_v1"),
|
||||
]
|
||||
|
||||
database_operations = [
|
||||
migrations.AlterModelTable("Account", "account_account"),
|
||||
migrations.AlterModelTable("Category", "category_category"),
|
||||
migrations.AlterModelTable("Snapshot", "statement_statement"),
|
||||
migrations.AlterModelTable("Transaction", "transaction_transaction"),
|
||||
migrations.AlterModelTable("Invoice", "transaction_invoice"),
|
||||
]
|
||||
|
||||
state_operations = [
|
||||
migrations.DeleteModel("Account"),
|
||||
migrations.DeleteModel("Category"),
|
||||
migrations.DeleteModel("Snapshot"),
|
||||
migrations.DeleteModel("Transaction"),
|
||||
migrations.DeleteModel("Invoice"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField("Transaction", "snapshot", "statement"),
|
||||
migrations.SeparateDatabaseAndState(
|
||||
database_operations=database_operations,
|
||||
state_operations=state_operations,
|
||||
),
|
||||
]
|
||||
18
nummi/main/migrations/0003_transaction_real_date.py
Normal file
18
nummi/main/migrations/0003_transaction_real_date.py
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 4.0.4 on 2022-05-22 11:35
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("main", "0002_alter_snapshot_date_alter_snapshot_diff"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="transaction",
|
||||
name="real_date",
|
||||
field=models.DateField(blank=True, null=True),
|
||||
),
|
||||
]
|
||||
18
nummi/main/migrations/0004_transaction_payment.py
Normal file
18
nummi/main/migrations/0004_transaction_payment.py
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 4.0.4 on 2022-05-22 11:51
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("main", "0003_transaction_real_date"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="transaction",
|
||||
name="payment",
|
||||
field=models.CharField(blank=True, max_length=128, null=True),
|
||||
),
|
||||
]
|
||||
18
nummi/main/migrations/0005_alter_category_name.py
Normal file
18
nummi/main/migrations/0005_alter_category_name.py
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 4.0.4 on 2022-05-22 11:56
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("main", "0004_transaction_payment"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="category",
|
||||
name="name",
|
||||
field=models.CharField(default="New Category", max_length=64),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,46 +1,192 @@
|
|||
from django.conf import settings
|
||||
from django.contrib.postgres.search import (
|
||||
SearchQuery,
|
||||
SearchRank,
|
||||
SearchVector,
|
||||
TrigramSimilarity,
|
||||
)
|
||||
from datetime import date
|
||||
import uuid
|
||||
from django.db import models
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.forms import ModelForm
|
||||
from django.core.validators import FileExtensionValidator
|
||||
|
||||
|
||||
class NummiQuerySet(models.QuerySet):
|
||||
main_field = "name"
|
||||
fields = dict()
|
||||
class Category(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
name = models.CharField(max_length=64, default="New Category")
|
||||
icon = models.CharField(max_length=64, default="folder")
|
||||
|
||||
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()
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
class Meta:
|
||||
abstract = True
|
||||
ordering = ["name"]
|
||||
|
||||
|
||||
class CategoryForm(ModelForm):
|
||||
template_name = "main/form.html"
|
||||
|
||||
class Meta:
|
||||
model = Category
|
||||
fields = ["name", "icon"]
|
||||
|
||||
|
||||
class Transaction(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
name = models.CharField(max_length=256, default="New Transaction")
|
||||
description = models.TextField(null=True, blank=True)
|
||||
value = models.DecimalField(max_digits=12, decimal_places=2, default=0)
|
||||
date = models.DateField(default=date.today)
|
||||
real_date = models.DateField(blank=True, null=True)
|
||||
trader = models.CharField(max_length=128, blank=True, null=True)
|
||||
payment = models.CharField(max_length=128, blank=True, null=True)
|
||||
category = models.ForeignKey(
|
||||
Category, on_delete=models.SET_NULL, blank=True, null=True
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
res = f"{self.date} {self.name}: {self.value}€"
|
||||
if self.category:
|
||||
return f"{res} ({self.category})"
|
||||
return res
|
||||
|
||||
class Meta:
|
||||
ordering = ["-date"]
|
||||
|
||||
|
||||
class TransactionForm(ModelForm):
|
||||
template_name = "main/form.html"
|
||||
|
||||
class Meta:
|
||||
model = Transaction
|
||||
fields = [
|
||||
"date",
|
||||
"name",
|
||||
"value",
|
||||
"trader",
|
||||
"category",
|
||||
"real_date",
|
||||
"payment",
|
||||
"description",
|
||||
]
|
||||
|
||||
|
||||
class Invoice(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
name = models.CharField(max_length=256, default="New Invoice")
|
||||
file = models.FileField(
|
||||
upload_to="invoices/", validators=[FileExtensionValidator(["pdf"])]
|
||||
)
|
||||
transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name}: {self.transaction}"
|
||||
|
||||
def delete(self, *args, **kwargs):
|
||||
self.file.delete()
|
||||
super().delete(*args, **kwargs)
|
||||
|
||||
|
||||
class InvoiceForm(ModelForm):
|
||||
template_name = "main/form.html"
|
||||
prefix = "invoice"
|
||||
|
||||
class Meta:
|
||||
model = Invoice
|
||||
fields = ["name", "file"]
|
||||
|
||||
|
||||
class Snapshot(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
date = models.DateField(unique=True)
|
||||
value = models.DecimalField(max_digits=12, decimal_places=2, default=0)
|
||||
previous = models.OneToOneField(
|
||||
"self", on_delete=models.SET_NULL, blank=True, null=True, editable=False
|
||||
)
|
||||
diff = models.DecimalField(
|
||||
max_digits=12, decimal_places=2, editable=False, blank=True, null=True
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
if self.previous is None:
|
||||
return f"Snapshot {self.date}: {self.value}€"
|
||||
return f"Snapshot {self.date}: {self.value}€ (Previous: {self.previous.date})"
|
||||
|
||||
def save(self, *args, only_super=False, **kwargs):
|
||||
if not only_super:
|
||||
_prev = (
|
||||
self.__class__.objects.order_by("-date")
|
||||
.exclude(id=self.id)
|
||||
.filter(date__lt=self.date)
|
||||
.first()
|
||||
)
|
||||
|
||||
try:
|
||||
_next = self.__class__.objects.exclude(id=self.id).get(previous=_prev)
|
||||
except self.__class__.DoesNotExist:
|
||||
pass
|
||||
else:
|
||||
try:
|
||||
_prevnext = self.__class__.objects.exclude(id=self.id).get(
|
||||
previous=self
|
||||
)
|
||||
except self.__class__.DoesNotExist:
|
||||
pass
|
||||
else:
|
||||
_prevnext.previous = (
|
||||
self.__class__.objects.order_by("-date")
|
||||
.exclude(id=self.id)
|
||||
.filter(date__lt=_prevnext.date)
|
||||
.first()
|
||||
)
|
||||
_prevnext.save(only_super=True)
|
||||
_next.previous = self
|
||||
_next.save(only_super=True)
|
||||
|
||||
self.previous = _prev
|
||||
|
||||
if self.previous is None:
|
||||
self.diff = None
|
||||
else:
|
||||
self.diff = self.value - self.previous.value
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
try:
|
||||
_next = self.__class__.objects.get(previous=self)
|
||||
except self.__class__.DoesNotExist:
|
||||
pass
|
||||
else:
|
||||
_next.save(only_super=True)
|
||||
|
||||
def delete(self, *args, only_super=False, **kwargs):
|
||||
if not only_super:
|
||||
try:
|
||||
_next = self.__class__.objects.get(previous=self)
|
||||
except self.__class__.DoesNotExist:
|
||||
super().delete(*args, **kwargs)
|
||||
else:
|
||||
_next.previous = self.previous
|
||||
super().delete(*args, **kwargs)
|
||||
_next.save(only_super=True)
|
||||
else:
|
||||
super().delete(*args, **kwargs)
|
||||
|
||||
@property
|
||||
def sum(self):
|
||||
if self.previous is None:
|
||||
return None
|
||||
trans = self.transactions.aggregate(sum=models.Sum("value"))
|
||||
return trans["sum"] or 0
|
||||
|
||||
@property
|
||||
def transactions(self):
|
||||
if self.previous is None:
|
||||
return Transaction.objects.none()
|
||||
return Transaction.objects.filter(
|
||||
date__lte=self.date, date__gt=self.previous.date
|
||||
)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-date"]
|
||||
|
||||
|
||||
class SnapshotForm(ModelForm):
|
||||
template_name = "main/form.html"
|
||||
|
||||
class Meta:
|
||||
model = Snapshot
|
||||
fields = ["date", "value"]
|
||||
|
|
|
|||
59
nummi/main/static/main/css/chart.css
Normal file
59
nummi/main/static/main/css/chart.css
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
.chart {
|
||||
display: grid;
|
||||
grid-template-columns: auto auto 1fr 1fr auto;
|
||||
grid-gap: var(--gap) 0;
|
||||
}
|
||||
|
||||
.chart > div {
|
||||
position: relative;
|
||||
height: 2rem;
|
||||
line-height: 2rem;
|
||||
}
|
||||
|
||||
.chart .left {
|
||||
text-align: right;
|
||||
}
|
||||
.chart .bar,
|
||||
.chart .value {
|
||||
display: inline-block;
|
||||
height: 2rem;
|
||||
line-height: 2rem;
|
||||
}
|
||||
.chart .value {
|
||||
padding: 0 var(--gap);
|
||||
font-feature-settings: var(--num);
|
||||
text-align: right;
|
||||
}
|
||||
.chart .bar {
|
||||
width: 0;
|
||||
box-sizing: border-box;
|
||||
z-index: 1;
|
||||
}
|
||||
.chart .bar.tot {
|
||||
position: absolute;
|
||||
z-index: 10;
|
||||
height: .5rem;
|
||||
background: black;
|
||||
}
|
||||
|
||||
.chart .left .bar.tot {right: 0}
|
||||
.chart .right .bar.tot {left: 0}
|
||||
.chart .left .bar {border-radius: var(--radius) 0 0 var(--radius)}
|
||||
.chart .right .bar {border-radius: 0 var(--radius) var(--radius) 0}
|
||||
|
||||
.chart .bar_m {background: var(--red-1)}
|
||||
.chart .bar_p {background: var(--green-1)}
|
||||
|
||||
.chart .bar span {
|
||||
position: absolute;
|
||||
display: inline-block;
|
||||
white-space: nowrap;
|
||||
margin: 0 var(--gap);
|
||||
font-weight: 650;
|
||||
top: .5rem;
|
||||
line-height: 1.5rem;
|
||||
height: 1.5rem;
|
||||
font-feature-settings: var(--num);
|
||||
}
|
||||
.chart .right .bar span {left: 0}
|
||||
.chart .left .bar span {right: 0}
|
||||
|
|
@ -1,217 +1,74 @@
|
|||
.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 {
|
||||
display: grid;
|
||||
gap: 0.5rem;
|
||||
grid-template-columns: repeat(auto-fill, 32rem);
|
||||
@media (width < 1024px) {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
&.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;
|
||||
}
|
||||
}
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr;
|
||||
grid-gap: var(--gap);
|
||||
margin: var(--gap) 0;
|
||||
line-height: 2rem;
|
||||
}
|
||||
|
||||
form ul.errorlist {
|
||||
grid-column: 1 / -1;
|
||||
color: var(--red);
|
||||
font-weight: 550;
|
||||
list-style-type: "! ";
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
form input,
|
||||
form select,
|
||||
form textarea {
|
||||
padding: 0 var(--gap);
|
||||
}
|
||||
|
||||
form > label,
|
||||
form > input[type="text"],
|
||||
form > input[type="number"],
|
||||
form > select {
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
font-family: inherit;
|
||||
}
|
||||
form > textarea {
|
||||
font-size: inherit;
|
||||
font-family: inherit;
|
||||
}
|
||||
form > input[type="text"],
|
||||
form > input[type="number"],
|
||||
form > textarea {
|
||||
border: none;
|
||||
border-radius: var(--radius);
|
||||
background: var(--bg-01);
|
||||
}
|
||||
|
||||
form > .buttons {
|
||||
grid-column: 1 / -1;
|
||||
text-align: right;
|
||||
}
|
||||
form > .buttons input,
|
||||
form select,
|
||||
form input[type="file"] {
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
font-family: inherit;
|
||||
border: 0;
|
||||
background: var(--bg-01);
|
||||
cursor: pointer;
|
||||
border-radius: var(--radius);
|
||||
}
|
||||
form > .buttons input {
|
||||
margin-left: var(--gap);
|
||||
}
|
||||
form > .buttons input:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
form > .buttons input[type="submit"] {
|
||||
background: var(--green);
|
||||
color: var(--text-inv);
|
||||
}
|
||||
form > .buttons input[type="reset"] {
|
||||
color: var(--red);
|
||||
}
|
||||
form > .buttons input.del {
|
||||
background: var(--red);
|
||||
color: var(--text-inv);
|
||||
}
|
||||
|
|
|
|||
22
nummi/main/static/main/css/index.css
Normal file
22
nummi/main/static/main/css/index.css
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
h1 {
|
||||
font-size: 4rem;
|
||||
font-variant: small-caps;
|
||||
font-weight: 850;
|
||||
letter-spacing: -.05em;
|
||||
margin: 0;
|
||||
line-height: 1.2em;
|
||||
}
|
||||
h1 img {
|
||||
height: 1.2em;
|
||||
vertical-align: top;
|
||||
margin-right: var(--gap);
|
||||
}
|
||||
|
||||
#categories > a {
|
||||
margin-right: var(--gap);
|
||||
margin-bottom: var(--gap);
|
||||
display: inline-block;
|
||||
}
|
||||
#categories > a > i {
|
||||
margin-right: .5rem;
|
||||
}
|
||||
|
|
@ -1,572 +1,62 @@
|
|||
@import "https://rsms.me/inter/inter.css";
|
||||
@import "https://cdn.jsdelivr.net/npm/remixicon@4.5.0/fonts/remixicon.css";
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
*, *::before, *::after {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
:root {
|
||||
--theme: #66cc66;
|
||||
--theme-0: #338033;
|
||||
--theme-1: #99ff99;
|
||||
--theme-2: var(--theme);
|
||||
--theme-3: #802653;
|
||||
--theme-4: #cc6699;
|
||||
--gray: #dedede;
|
||||
--theme: #006633;
|
||||
--theme-0: #00f279;
|
||||
--theme-1: #00b359;
|
||||
--theme-2: #007339;
|
||||
--theme-3: var(--theme);
|
||||
--theme-4: #004d26;
|
||||
|
||||
--text-theme: var(--text);
|
||||
--text-theme: var(--text-inv);
|
||||
|
||||
--bg: #ffffff;
|
||||
--text: #000000de;
|
||||
--bg: #ffffff;
|
||||
--text: #000000de;
|
||||
|
||||
--bg-inv: var(--theme-1);
|
||||
--text-inv: #ffffffde;
|
||||
--bg-inv: var(--theme-4);
|
||||
--text-inv: #ffffffde;
|
||||
|
||||
--bg-1: #f0f0f0;
|
||||
--bg-01: #dedede;
|
||||
|
||||
--text-green: #296629;
|
||||
--text-link: var(--text-green);
|
||||
--text-link: #0a35ccde;
|
||||
|
||||
--gap: 1rem;
|
||||
--gap: 1rem;
|
||||
|
||||
--red: var(--theme-3);
|
||||
--green: var(--theme-0);
|
||||
--red: #bf1500;
|
||||
--green: var(--theme-2);
|
||||
|
||||
--red-1: var(--theme-4);
|
||||
--green-1: var(--theme);
|
||||
--red-1: #f21b00;
|
||||
--green-1: var(--theme-1);
|
||||
|
||||
--border: 0.5em;
|
||||
--radius: 0.25em;
|
||||
--radius: 2px;
|
||||
|
||||
--default-ffs: "dlig", "ss01", "ss04";
|
||||
--num: var(--default-ffs), "tnum", "case";
|
||||
--num: "tnum", "ss01", "case";
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Inter var experimental", "Inter var", "Inter", sans-serif;
|
||||
margin: 0;
|
||||
font-family: "Inter var experimental", "Inter var", "Inter", sans-serif;
|
||||
margin: 0;
|
||||
padding: 2em;
|
||||
|
||||
background: var(--bg);
|
||||
color: var(--text);
|
||||
|
||||
display: grid;
|
||||
grid-template-columns: max-content 1fr;
|
||||
font-feature-settings: var(--default-ffs);
|
||||
background: var(--bg);
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
p {
|
||||
line-height: 2em;
|
||||
}
|
||||
a {
|
||||
color: var(--text-link);
|
||||
text-decoration: none;
|
||||
display: inline-block;
|
||||
|
||||
&:is(:hover, :focus) {
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
.red {
|
||||
color: var(--red);
|
||||
fill: var(--red);
|
||||
}
|
||||
.green {
|
||||
color: var(--green);
|
||||
fill: var(--green);
|
||||
}
|
||||
|
||||
main,
|
||||
nav,
|
||||
footer {
|
||||
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;
|
||||
grid-row: 1;
|
||||
|
||||
height: 100vh;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
overflow-y: auto;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
:is(nav, main) > :first-child,
|
||||
main > section:first-child > :first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
footer {
|
||||
text-align: center;
|
||||
grid-column: 2;
|
||||
font-weight: 250;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
text-align: center;
|
||||
font-feature-settings: var(--num);
|
||||
|
||||
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) {
|
||||
body {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
nav,
|
||||
main,
|
||||
footer {
|
||||
grid-column: 1;
|
||||
grid-row: auto;
|
||||
position: relative;
|
||||
height: initial;
|
||||
}
|
||||
}
|
||||
[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,
|
||||
h2,
|
||||
h3 {
|
||||
font-weight: 300;
|
||||
margin-top: 1em;
|
||||
margin-bottom: 0.5em;
|
||||
line-height: 1cap;
|
||||
}
|
||||
h1 {
|
||||
font-size: 3rem;
|
||||
}
|
||||
h2 {
|
||||
font-size: 2rem;
|
||||
}
|
||||
h3 {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
p {
|
||||
margin: 0.5em 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
ul.messages {
|
||||
font-weight: 550;
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
margin-bottom: var(--gap);
|
||||
background: var(--bg-1);
|
||||
padding: 0;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
a {
|
||||
color: var(--text-link);
|
||||
text-decoration: none;
|
||||
}
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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.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);
|
||||
}
|
||||
}
|
||||
.red {color: var(--red)}
|
||||
.green {color: var(--green)}
|
||||
|
|
|
|||
42
nummi/main/static/main/css/nav.css
Normal file
42
nummi/main/static/main/css/nav.css
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
:root {
|
||||
--nav-lh: 2em;
|
||||
--nav-pad: 1em;
|
||||
--nav-height: calc(2 * var(--nav-pad) + var(--nav-lh));
|
||||
}
|
||||
|
||||
body {
|
||||
margin-top: var(--nav-height);
|
||||
}
|
||||
|
||||
nav {
|
||||
background: var(--theme);
|
||||
color: var(--text-theme);
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: var(--nav-height);
|
||||
line-height: var(--nav-lh);
|
||||
padding: var(--nav-pad);
|
||||
}
|
||||
nav > a {
|
||||
display: inline-block;
|
||||
color: inherit;
|
||||
text-decoration: inherit;
|
||||
height: var(--nav-lh);
|
||||
margin: 0 var(--nav-pad);
|
||||
}
|
||||
nav > a.cur {
|
||||
font-weight: 750;
|
||||
}
|
||||
nav > a.home {
|
||||
font-variant: small-caps;
|
||||
}
|
||||
nav > a.logout {
|
||||
float: right;
|
||||
}
|
||||
nav > a img {
|
||||
height: var(--nav-lh);
|
||||
vertical-align: top;
|
||||
margin-right: .5rem;
|
||||
}
|
||||
3
nummi/main/static/main/css/page.css
Normal file
3
nummi/main/static/main/css/page.css
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.pagination .current {
|
||||
font-feature-settings: "tnum", "ss01";
|
||||
}
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
table.full-width col.bar {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.plot {
|
||||
overflow-x: auto;
|
||||
|
||||
table {
|
||||
min-width: 40rem;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +1,46 @@
|
|||
.table {
|
||||
overflow-x: auto;
|
||||
width: 100%;
|
||||
display: grid;
|
||||
margin: 2em 0;
|
||||
border-radius: var(--radius);
|
||||
overflow: hidden;
|
||||
border-bottom: .5em solid var(--bg-inv);
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
.table.col2 {grid-template-columns: repeat(2, auto)}
|
||||
.table.col3 {grid-template-columns: repeat(3, auto)}
|
||||
.table.col4 {grid-template-columns: repeat(4, auto)}
|
||||
.table.col5 {grid-template-columns: repeat(5, auto)}
|
||||
.table.col6 {grid-template-columns: repeat(6, auto)}
|
||||
|
||||
&.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;
|
||||
}
|
||||
.table > div {
|
||||
display: contents;
|
||||
}
|
||||
|
||||
.table > div > * {
|
||||
padding: 1em;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.table > div.g> * {background: var(--bg-01)}
|
||||
.table > div.w> * {background: var(--bg)}
|
||||
|
||||
.table > div.header > * {
|
||||
background: var(--bg-inv);
|
||||
color: var(--text-inv);
|
||||
}
|
||||
|
||||
.table > div > .center {
|
||||
text-align: center;
|
||||
}
|
||||
.table > div > .right {
|
||||
text-align: right;
|
||||
}
|
||||
.table > div > .num {
|
||||
font-feature-settings: var(--num);
|
||||
}
|
||||
.table > div > span.value {
|
||||
filter: brightness(95%);
|
||||
}
|
||||
|
||||
.table > div > span.text {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,181 +0,0 @@
|
|||
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;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
22
nummi/main/static/main/svg/logo-white.svg
Normal file
22
nummi/main/static/main/svg/logo-white.svg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<svg version="1.1"
|
||||
width="100"
|
||||
height="100"
|
||||
xmlns="http://www.w3.org/2000/svg">
|
||||
|
||||
<defs>
|
||||
<rect id="basemask" x="-10" y="-10" width="110" height="110" />
|
||||
<rect id="line" x="45" y="-10" width="10" height="120" />
|
||||
</defs>
|
||||
|
||||
<mask id="mask">
|
||||
<use href="#basemask" fill="white" />
|
||||
<use href="#line" fill="black" />
|
||||
<use href="#line" transform="translate(20)" fill="black" />
|
||||
</mask>
|
||||
|
||||
<polygon points="25,0 75,0 100,25 100,75 75,100 25,100 0,75 0,25"
|
||||
fill="white"
|
||||
mask="url(#mask)"
|
||||
transform-origin="center center" transform="rotate(10) scale(.8)" />
|
||||
</svg>
|
||||
|
||||
|
After Width: | Height: | Size: 576 B |
|
|
@ -4,12 +4,8 @@
|
|||
xmlns="http://www.w3.org/2000/svg">
|
||||
|
||||
<defs>
|
||||
<rect id="basemask" x="5" y="-5" width="90" height="110" />
|
||||
<rect id="basemask" x="-10" y="-10" width="110" height="110" />
|
||||
<rect id="line" x="45" y="-10" width="10" height="120" />
|
||||
<linearGradient id="grad" gradientTransform="rotate(90)">
|
||||
<stop offset="5%" stop-color="#66cc66" />
|
||||
<stop offset="95%" stop-color="#cc6699" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
|
||||
<mask id="mask">
|
||||
|
|
@ -18,9 +14,9 @@
|
|||
<use href="#line" transform="translate(20)" fill="black" />
|
||||
</mask>
|
||||
|
||||
<circle cx="50" cy="50" r="50"
|
||||
fill="url('#grad')"
|
||||
mask="url('#mask')"
|
||||
transform-origin="center center" transform="rotate(10)" />
|
||||
<polygon points="25,0 75,0 100,25 100,75 75,100 25,100 0,75 0,25"
|
||||
fill="#006633"
|
||||
mask="url(#mask)"
|
||||
transform-origin="center center" transform="rotate(10) scale(.8)" />
|
||||
</svg>
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 707 B After Width: | Height: | Size: 578 B |
|
|
@ -1,96 +1,50 @@
|
|||
{% 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">
|
||||
{% 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 %}
|
||||
</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>
|
||||
<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/css/nav.css' %}" type="text/css" />
|
||||
{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
{% block nav %}
|
||||
{% spaceless %}
|
||||
<nav>
|
||||
<a href="{% url 'index' %}"
|
||||
class="home{% if request.resolver_match.url_name == 'index' %} cur{% endif %}">
|
||||
<img src="{% static 'main/svg/logo-white.svg' %}" alt="" />Nummi
|
||||
</a>
|
||||
<a href="{% url 'transactions' %}"
|
||||
class="{% if request.resolver_match.url_name == 'transactions' %}cur{% endif %}">
|
||||
Transactions
|
||||
</a>
|
||||
<a href="{% url 'transaction' %}"
|
||||
class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}">
|
||||
Add transaction
|
||||
</a>
|
||||
<a href="{% url 'category' %}"
|
||||
class="{% if request.resolver_match.url_name == 'category' %}cur{% endif %}">
|
||||
Add category
|
||||
</a>
|
||||
<a href="{% url 'snapshot' %}"
|
||||
class="{% if request.resolver_match.url_name == 'snapshot' %}cur{% endif %}">
|
||||
Add snapshot
|
||||
</a>
|
||||
<a href="{% url 'logout' %}"
|
||||
class="logout">
|
||||
Log Out
|
||||
</a>
|
||||
</nav>
|
||||
{% endspaceless %}
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
24
nummi/main/templates/main/category.html
Normal file
24
nummi/main/templates/main/category.html
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load main_extras %}
|
||||
|
||||
{% 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>{{ category.icon }} {{ category }}</h1>
|
||||
|
||||
<form action="{% url 'category' category.id %}" method="post">
|
||||
{% csrf_token %}
|
||||
{{ form }}
|
||||
{% form_buttons category %}
|
||||
</form>
|
||||
|
||||
{% if transactions %}
|
||||
<h2>Transactions</h2>
|
||||
{% transaction_table transactions %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
{% block link %}
|
||||
{{ 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>
|
||||
{% 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 %}
|
||||
5
nummi/main/templates/main/form.html
Normal file
5
nummi/main/templates/main/form.html
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{% for field in form %}
|
||||
{{ field.errors }}
|
||||
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
|
||||
{{ field }}
|
||||
{% endfor %}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
{% block title %}
|
||||
{% if form.instance|adding %}
|
||||
{% block title_new %}{% endblock %}
|
||||
{% else %}
|
||||
{{ form.instance }}
|
||||
{% endif %}
|
||||
– Nummi
|
||||
{% endblock %}
|
||||
{% block link %}
|
||||
{{ 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 %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% load main_extras %}
|
||||
<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>
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
{% load i18n %}
|
||||
{% load main_extras %}
|
||||
{% block fields %}
|
||||
{% 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 %}
|
||||
<ul class="errorlist">
|
||||
{% for error in field.errors %}
|
||||
<li class="wi">{{ "error-warning"|remix }}{{ error }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</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 %}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{% extends "main/form/form_base.html" %}
|
||||
{% load i18n %}
|
||||
{% block buttons %}
|
||||
<input hidden value="{{ next }}" name="next">
|
||||
<input type="submit" value="{% translate "Log in" %}">
|
||||
<input type="reset">
|
||||
{% endblock buttons %}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{% include "django/forms/widgets/text.html" %}
|
||||
<datalist id="{{ widget.attrs.list }}">
|
||||
{% for option in widget.options %}<option value="{{ option }}"></option>{% endfor %}
|
||||
</datalist>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{% load main_extras %}
|
||||
<span class="ico-input icon-select">
|
||||
{{ "square"|remix }}
|
||||
{% include "main/forms/widgets/datalist.html" %}
|
||||
</span>
|
||||
|
|
@ -1,37 +1,67 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load main_extras account_extras history_extras statement_extras %}
|
||||
{% load i18n %}
|
||||
{% load main_extras %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
{% css "main/css/table.css" %}
|
||||
{% css "main/css/plot.css" %}
|
||||
{% endblock link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/index.css' %}" type="text/css" />
|
||||
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" />
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<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 %}
|
||||
<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 %}
|
||||
<h1><img src="{% static 'main/svg/logo.svg' %}" alt="" />Nummi</h1>
|
||||
|
||||
{% if transactions %}
|
||||
<h2>Transactions</h2>
|
||||
{% transaction_table transactions %}
|
||||
{% endif %}
|
||||
|
||||
{% if snapshots %}
|
||||
<h2>Relevés</h2>
|
||||
<div id="snapshots" class="table col5">
|
||||
<div class="header">
|
||||
<strong class="date center">Date</strong>
|
||||
<strong class="value center">Valeur</strong>
|
||||
<strong class="diff center">Différence</strong>
|
||||
<strong class="diff center">Transactions</strong>
|
||||
<strong class="diff center">Valide</strong>
|
||||
</div>
|
||||
{% for snap in snapshots %}
|
||||
<div class="snapshot {% cycle 'w' 'g' %}">
|
||||
<span class="date num center">
|
||||
<a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a>
|
||||
</span>
|
||||
<span class="value num right">{{ snap.value|value }}</span>
|
||||
<span class="diff num right">
|
||||
{{ snap.diff|pmvalue }}
|
||||
</span>
|
||||
{% with sum=snap.sum %}
|
||||
<span class="sum num right">
|
||||
{{ sum|pmvalue }}
|
||||
</span>
|
||||
<span class="valid center">
|
||||
{% if snap.previous is not None %}
|
||||
{% if sum == snap.diff %}
|
||||
✓
|
||||
{% else %}
|
||||
✗
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</span>
|
||||
{% endwith %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if categories %}
|
||||
<h2>Catégories</h2>
|
||||
<div id="categories">
|
||||
{% for cat in categories %}
|
||||
{{ cat.icon }}
|
||||
<a href="{% url 'category' cat.id %}">{{ cat }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
{% block title %}
|
||||
{% block name %}{% endblock %}
|
||||
{% if account %}– {{ account }}{% endif %}
|
||||
{% if category %}– {{ category }}{% endif %}
|
||||
{% if search %}
|
||||
– {% translate "Search" %}
|
||||
{% endif %}
|
||||
– Nummi
|
||||
{% endblock %}
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
{% css "main/css/table.css" %}
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
<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>
|
||||
<a class="big-link" href="{{ category.get_absolute_url }}">{{ category.icon|remix }}{{ category }}</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if search %}
|
||||
<p>
|
||||
<a href="{% url "search" %}">{% translate "Search" %}</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include "main/pagination.html" %}
|
||||
{% block table %}{% endblock %}
|
||||
{% include "main/pagination.html" %}
|
||||
{% block body_more %}{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,16 +1,27 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load main_extras %}
|
||||
{% load static %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
{% css "main/css/table.css" %}
|
||||
{% css "main/css/form.css" %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" />
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h2>{% translate "Log in" %}</h2>
|
||||
<form action="{% url 'login' %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% include "main/form/login.html" %}
|
||||
</form>
|
||||
|
||||
<h1>Login</h1>
|
||||
|
||||
<form action="{% url 'login' %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for field in form %}
|
||||
{{ field.errors }}
|
||||
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
|
||||
{{ field }}
|
||||
{% endfor %}
|
||||
<div class="buttons">
|
||||
<input hidden value="{{ next }}" name="next" />
|
||||
<input type="reset" />
|
||||
<input type="submit" value="Log In" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
{% load i18n main_extras transaction_extras %}
|
||||
{% if page_obj %}
|
||||
<p class="pagination">{% pagination_links page_obj %}</p>
|
||||
{% endif %}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue