From 2991786444f1b57ba1a2d3a2c043d56a23692785 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Wed, 1 Jan 2025 19:01:35 +0100
Subject: [PATCH] Improve statement form

---
 .prettierrc.toml                     |  2 +-
 nummi/main/static/main/css/form.css  |  7 +++++--
 nummi/main/static/main/css/main.css  |  5 +++++
 nummi/main/static/main/css/table.css |  5 -----
 nummi/statement/forms.py             | 10 ++++++++++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.prettierrc.toml b/.prettierrc.toml
index 49b487b..eeb77a3 100644
--- a/.prettierrc.toml
+++ b/.prettierrc.toml
@@ -1 +1 @@
-end_of_line = "auto"
+endOfLine = "auto"
diff --git a/nummi/main/static/main/css/form.css b/nummi/main/static/main/css/form.css
index 3b83905..440f13d 100644
--- a/nummi/main/static/main/css/form.css
+++ b/nummi/main/static/main/css/form.css
@@ -54,9 +54,12 @@ form {
         background: none;
         z-index: 1;
 
-        &.value {
-          font-size: 1.5rem;
+        &[name*="value"] {
           text-align: right;
+          font-feature-settings: var(--num);
+        }
+        &[name*="date"] {
+          font-feature-settings: var(--num);
         }
 
         &:focus {
diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css
index 4ac95d7..dd87b3d 100644
--- a/nummi/main/static/main/css/main.css
+++ b/nummi/main/static/main/css/main.css
@@ -495,3 +495,8 @@ ul.statements {
     border-style: dashed;
   }
 }
+
+.date,
+.value {
+  font-feature-settings: var(--num);
+}
diff --git a/nummi/main/static/main/css/table.css b/nummi/main/static/main/css/table.css
index f663bad..c6284ec 100644
--- a/nummi/main/static/main/css/table.css
+++ b/nummi/main/static/main/css/table.css
@@ -60,8 +60,3 @@ table {
     text-align: center;
   }
 }
-
-.date,
-.value {
-  font-feature-settings: var(--num);
-}
diff --git a/nummi/statement/forms.py b/nummi/statement/forms.py
index 8467680..e7afbb3 100644
--- a/nummi/statement/forms.py
+++ b/nummi/statement/forms.py
@@ -15,6 +15,15 @@ class StatementForm(NummiForm):
             "file": NummiFileInput,
         }
 
+    meta_fieldsets = [
+        [
+            ["account"],
+            ["start_date", "start_value"],
+            ["date", "value"],
+            ["file"],
+        ],
+    ]
+
     def __init__(self, *args, **kwargs):
         _user = kwargs.get("user")
         _disable_account = kwargs.pop("disable_account", False)
@@ -30,6 +39,7 @@ class StatementForm(NummiForm):
             label=_("Add transactions"),
             required=False,
         )
+
         if _disable_account:
             self.fields["account"].disabled = True