From d48818e4552aa6e4e194d6d06a368d63c398972b Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Wed, 3 Jan 2024 14:40:48 +0100 Subject: [PATCH] Create table for accounts --- nummi/main/locale/fr_FR/LC_MESSAGES/django.mo | Bin 1751 -> 1828 bytes nummi/main/locale/fr_FR/LC_MESSAGES/django.po | 20 +++++++--- nummi/main/static/main/css/table.css | 6 +-- nummi/main/templates/main/index.html | 37 ++++++++++++++---- .../locale/fr_FR/LC_MESSAGES/django.po | 18 ++++----- .../templates/statement/statement_table.html | 14 +++---- .../locale/fr_FR/LC_MESSAGES/django.po | 33 ++++++++-------- .../transaction/transaction_table.html | 14 +++---- 8 files changed, 86 insertions(+), 56 deletions(-) diff --git a/nummi/main/locale/fr_FR/LC_MESSAGES/django.mo b/nummi/main/locale/fr_FR/LC_MESSAGES/django.mo index 7f2a8f069af009197b2d2fc8c0ebda76e0fe89e9..c963419eca93ed0d64d1b1c6058b7de5609b7c13 100644 GIT binary patch delta 722 zcmYk)y-Px26vy$$n^(=$%Iw8nY_l37+G=RXp%;iC0;d+a2@RqSxdkraKOhZF6%-L| z88rnF4MDUOZH+-R)X>mi)c0qX=)mL0dwe|SdAX0_{Yd#K>fJI#g3-?id5jssIx2Q8 zWBj;>0X)JfJaO~y=;QelgZS;{gH6BrC`QP~u@#504JR;aOxeuyMFm#Siw>&cn)_UI ze=oWD4NUU;CaU2vw%{4sc!jESgQ|OnF}z33f58xbpqKu}!|WasJ{)4#gQ!2wQcVk4 z#1y7c4Yu9<4yy4XHe(I-zYEk3udx#!upM8q3%^kFV@&qb-z4~=l_izHanuSYQAaj| zW0-dH6;#10>Szy83pqvAxx`+)MP1o5s@@xFULE@|K(n&0nR{py)F~)5Sp~St#sWC0 zM(7>U%C#%S07DJbR7bAR4i(x+oWW)r(ZQ##f!_aP^zT7C(W=4>y@)!(ZiZHDrX8nH j%CA?8)|@|;$z}3Rwsvl%t*Xynu$K$D)og9au6TX`YfCye delta 662 zcmYk)y)Q#y6vy$?t5p~6rQYc#UN#nkM28Cg03i`;69x&DdPxj!B9U}4mBB(H78A)e zNDN{jv9U-KVKEr|0hJhhf9)Nd6+JQ{9gbfdV7x{6A@Yt{ z1FmBRcd#CBuo3Stj!)t97ffd*D!?g!C8YYZ|&nIw@ z_fx0|SFj1UFot_bAuFO9JHU24MCD&#GhUhYpI4BQs{rB#VE9EYS6N|+}h^qM!~YBz{vy^XWl8z#ioPP*nZ>> DdYClT diff --git a/nummi/main/locale/fr_FR/LC_MESSAGES/django.po b/nummi/main/locale/fr_FR/LC_MESSAGES/django.po index 378d5ba..32068a8 100644 --- a/nummi/main/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/main/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-02 15:52+0100\n" +"POT-Creation-Date: 2024-01-03 14:32+0100\n" "PO-Revision-Date: 2023-04-23 08:03+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -29,11 +29,11 @@ msgstr "Aller au contenu principal" msgid "Home" msgstr "Accueil" -#: .\main\templates\main\base.html:39 .\main\templates\main\index.html:43 +#: .\main\templates\main\base.html:39 .\main\templates\main\index.html:60 msgid "Statements" msgstr "Relevés" -#: .\main\templates\main\base.html:45 .\main\templates\main\index.html:23 +#: .\main\templates\main\base.html:45 .\main\templates\main\index.html:40 msgid "Transactions" msgstr "Transactions" @@ -113,15 +113,23 @@ msgstr "Comptes" msgid "No account" msgstr "Aucun compte" -#: .\main\templates\main\index.html:29 +#: .\main\templates\main\index.html:23 +msgid "Account" +msgstr "Compte" + +#: .\main\templates\main\index.html:24 +msgid "Balance" +msgstr "Solde" + +#: .\main\templates\main\index.html:46 msgid "Categories" msgstr "Catégories" -#: .\main\templates\main\index.html:35 +#: .\main\templates\main\index.html:52 msgid "No category" msgstr "Aucune catégorie" -#: .\main\templates\main\index.html:49 +#: .\main\templates\main\index.html:66 msgid "History" msgstr "Historique" diff --git a/nummi/main/static/main/css/table.css b/nummi/main/static/main/css/table.css index 155a75d..3e38ad6 100644 --- a/nummi/main/static/main/css/table.css +++ b/nummi/main/static/main/css/table.css @@ -26,11 +26,9 @@ table { tbody &:where(:nth-of-type(even)) { background: #eeeeff; } - tfoot &.more, - thead &.new { + &.more, + &.new { text-align: center; - } - tfoot &.more { border-style: dashed; } } diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html index 3f56a84..d3f1add 100644 --- a/nummi/main/templates/main/index.html +++ b/nummi/main/templates/main/index.html @@ -10,13 +10,36 @@ {% block body %}

{% translate "Accounts" %}

-

- {% for acc in accounts %} - {{ acc.icon|remix }}{{ acc }} - {% empty %} - {% translate "No account" %} - {% endfor %} -

+ + + + + + + + + {% for acc in accounts %} + + + + + + {% empty %} + + + + {% endfor %} + + + + + + +
{% translate "Account" %}{% translate "Balance" %}
{{ acc.icon|remix }} + {{ acc }} + {{ acc.statement_set.first.value|value }}
{% translate "No account" %}
+ {% translate "Create account" %} +
{% if transactions %}
diff --git a/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po b/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po index 69017a9..cd3180d 100644 --- a/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-02 15:52+0100\n" +"POT-Creation-Date: 2024-01-03 14:32+0100\n" "PO-Revision-Date: 2023-04-22 15:22+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -38,7 +38,7 @@ msgid "Start value" msgstr "Valeur initiale" #: .\statement\models.py:29 -#: .\statement\templates\statement\statement_table.html:28 +#: .\statement\templates\statement\statement_table.html:23 msgid "Difference" msgstr "Différence" @@ -66,7 +66,7 @@ msgid "Statements" msgstr "Relevés" #: .\statement\templates\statement\statement_form.html:4 -#: .\statement\templates\statement\statement_table.html:5 +#: .\statement\templates\statement\statement_table.html:29 msgid "Create statement" msgstr "Créer un relevé" @@ -79,27 +79,27 @@ msgid "Categories" msgstr "Catégories" #: .\statement\templates\statement\statement_form.html:27 -#: .\statement\templates\statement\statement_table.html:29 +#: .\statement\templates\statement\statement_table.html:24 msgid "Transactions" msgstr "Transactions" -#: .\statement\templates\statement\statement_table.html:23 +#: .\statement\templates\statement\statement_table.html:18 msgid "Date" msgstr "Date" -#: .\statement\templates\statement\statement_table.html:25 +#: .\statement\templates\statement\statement_table.html:20 msgid "Account" msgstr "Compte" -#: .\statement\templates\statement\statement_table.html:27 +#: .\statement\templates\statement\statement_table.html:22 msgid "Value" msgstr "Valeur" -#: .\statement\templates\statement\statement_table.html:60 +#: .\statement\templates\statement\statement_table.html:62 msgid "No statement" msgstr "Aucun relevé" -#: .\statement\templates\statement\statement_table.html:68 +#: .\statement\templates\statement\statement_table.html:70 msgid "View all statements" msgstr "Voir tous les relevés" diff --git a/nummi/statement/templates/statement/statement_table.html b/nummi/statement/templates/statement/statement_table.html index 34c87a6..514dc16 100644 --- a/nummi/statement/templates/statement/statement_table.html +++ b/nummi/statement/templates/statement/statement_table.html @@ -12,6 +12,13 @@ + {% if new_statement_url %} + + + {% translate "Create statement" %} + + + {% endif %} {{ "check"|remix }} {{ "attachment"|remix }} @@ -23,13 +30,6 @@ {% translate "Difference" %} {% translate "Transactions" %} - {% if new_statement_url %} - - - {% translate "Create statement" %} - - - {% endif %} {% for snap in statements %} diff --git a/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.po b/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.po index 3384c25..efd15fd 100644 --- a/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-02 15:52+0100\n" +"POT-Creation-Date: 2024-01-03 14:32+0100\n" "PO-Revision-Date: 2023-04-23 08:03+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -23,7 +23,7 @@ msgstr "Transaction" #: .\transaction\models.py:19 .\transaction\models.py:89 #: .\transaction\templates\transaction\invoice_table.html:10 -#: .\transaction\templates\transaction\transaction_table.html:29 +#: .\transaction\templates\transaction\transaction_table.html:24 msgid "Name" msgstr "Nom" @@ -32,12 +32,12 @@ msgid "Description" msgstr "Description" #: .\transaction\models.py:23 -#: .\transaction\templates\transaction\transaction_table.html:30 +#: .\transaction\templates\transaction\transaction_table.html:25 msgid "Value" msgstr "Valeur" #: .\transaction\models.py:25 -#: .\transaction\templates\transaction\transaction_table.html:28 +#: .\transaction\templates\transaction\transaction_table.html:23 msgid "Date" msgstr "Date" @@ -46,7 +46,7 @@ msgid "Real date" msgstr "Date réelle" #: .\transaction\models.py:28 -#: .\transaction\templates\transaction\transaction_table.html:31 +#: .\transaction\templates\transaction\transaction_table.html:26 msgid "Trader" msgstr "Commerçant" @@ -55,7 +55,7 @@ msgid "Payment" msgstr "Paiement" #: .\transaction\models.py:38 -#: .\transaction\templates\transaction\transaction_table.html:33 +#: .\transaction\templates\transaction\transaction_table.html:28 msgid "Category" msgstr "Catégorie" @@ -64,13 +64,13 @@ msgid "Statement" msgstr "Relevé" #: .\transaction\models.py:48 -#: .\transaction\templates\transaction\transaction_table.html:36 +#: .\transaction\templates\transaction\transaction_table.html:31 msgid "Account" msgstr "Compte" #: .\transaction\models.py:83 -#: .\transaction\templates\transaction\transaction_archive_month.html:24 -#: .\transaction\templates\transaction\transaction_archive_year.html:23 +#: .\transaction\templates\transaction\transaction_archive_month.html:27 +#: .\transaction\templates\transaction\transaction_archive_year.html:31 #: .\transaction\templates\transaction\transaction_list.html:4 #: .\transaction\templates\transaction\transaction_list.html:7 msgid "Transactions" @@ -109,21 +109,22 @@ msgstr "Supprimer" msgid "No invoice" msgstr "Aucune facture" -#: .\transaction\templates\transaction\transaction_archive_month.html:12 +#: .\transaction\templates\transaction\transaction_archive_month.html:14 +#: .\transaction\templates\transaction\transaction_archive_year.html:13 msgid "Back" msgstr "Retour" -#: .\transaction\templates\transaction\transaction_archive_month.html:19 -#: .\transaction\templates\transaction\transaction_archive_year.html:18 +#: .\transaction\templates\transaction\transaction_archive_month.html:22 +#: .\transaction\templates\transaction\transaction_archive_year.html:26 msgid "Categories" msgstr "Catégories" -#: .\transaction\templates\transaction\transaction_archive_year.html:12 +#: .\transaction\templates\transaction\transaction_archive_year.html:20 msgid "History" msgstr "Historique" #: .\transaction\templates\transaction\transaction_form.html:5 -#: .\transaction\templates\transaction\transaction_table.html:5 +#: .\transaction\templates\transaction\transaction_table.html:37 msgid "Create transaction" msgstr "Créer une transaction" @@ -131,10 +132,10 @@ msgstr "Créer une transaction" msgid "New transaction" msgstr "Nouvelle transaction" -#: .\transaction\templates\transaction\transaction_table.html:75 +#: .\transaction\templates\transaction\transaction_table.html:77 msgid "No transaction" msgstr "Aucune transaction" -#: .\transaction\templates\transaction\transaction_table.html:84 +#: .\transaction\templates\transaction\transaction_table.html:86 msgid "View all transactions" msgstr "Voir toutes les transactions" diff --git a/nummi/transaction/templates/transaction/transaction_table.html b/nummi/transaction/templates/transaction/transaction_table.html index ff31a73..a9a0ddf 100644 --- a/nummi/transaction/templates/transaction/transaction_table.html +++ b/nummi/transaction/templates/transaction/transaction_table.html @@ -18,6 +18,13 @@ {% endif %} + {% if new_transaction_url %} + + + {% translate "Create transaction" %} + + + {% endif %} {{ "attachment"|remix }} {% translate "Date" %} @@ -31,13 +38,6 @@ {% translate "Account" %} {% endif %} - {% if new_transaction_url %} - - - {% translate "Create transaction" %} - - - {% endif %} {% for trans in transactions %}