Improve forms

nummi/main/forms.py

@@ -10,3 +10,9 @@ class NummiForm(forms.ModelForm):
 
     def __init__(self, *args, user, **kwargs):
         super().__init__(*args, **kwargs)
+
+    def get_context(self):
+        context = super().get_context()
+        context["fieldsets"] = [[[field] for field in self]]
+
+        return context

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

@@ -6,42 +6,101 @@ form ul.errorlist {
 }
 
 form {
-  max-width: 32rem;
   display: grid;
   grid-gap: var(--gap);
+  grid-template-columns: repeat(auto-fill, 32rem);
+  @media (width < 1024px) {
+    grid-template-columns: 1fr;
+  }
 
-  p.field {
+  .column {
     display: grid;
-    grid-auto-rows: min-content;
-    border: 1px solid var(--gray);
-    padding: 0.5rem;
-    margin: 0;
+    grid-gap: var(--gap);
 
-    &:has(> input, > select, > textarea) > label {
-      font-size: 0.8rem;
-      line-height: 0.8rem;
-      z-index: 10;
+    .fieldset {
+      display: grid;
+      grid-auto-columns: 1fr;
+      grid-auto-flow: column;
+      grid-gap: var(--gap);
+      padding: 0;
+      margin: 0;
+      border: none;
     }
 
-    > input,
-    > select,
-    > textarea {
+    p.field {
+      display: grid;
+      grid-auto-rows: min-content;
+      border: 1px solid var(--gray);
+      padding: 0.5rem;
+      margin: 0;
+
+      &:has(> textarea) {
+        grid-template-rows: min-content 1fr;
+      }
+
+      &:has(> input, > select, > textarea) > label {
+        font-size: 0.8rem;
+        line-height: 0.8rem;
+        z-index: 10;
+      }
+
+      > input,
+      > select,
+      > textarea {
+        font: inherit;
+        line-height: initial;
+        border: none;
+        border-bottom: 1px solid var(--gray);
+        background: none;
+        z-index: 1;
+
+        &[name="value"] {
+          font-size: 1.5rem;
+          text-align: right;
+        }
+
+        &:focus {
+          outline: none;
+          background: var(--bg-01);
+        }
+      }
+    }
+  }
+  .buttons {
+    grid-column: 1 / -1;
+    display: grid;
+    grid-auto-columns: min-content;
+    grid-gap: var(--gap);
+    align-items: baseline;
+
+    & > * {
+      grid-row: 1;
+    }
+
+    input {
       font: inherit;
-      line-height: initial;
-      border: none;
-      border-bottom: 1px solid var(--gray);
-      background: none;
-      z-index: 1;
+      line-height: 1.5;
+      border-radius: var(--radius);
+      padding: 0 var(--gap);
+      cursor: pointer;
 
-      &[name="value"] {
-        font-size: 1.5rem;
-        text-align: right;
+      &:hover {
+        text-decoration: underline;
       }
-
-      &:focus {
-        outline: none;
-        background: var(--bg-01);
+      &[type="submit"] {
+        border: 0.1rem solid var(--green);
+        background: var(--green-1);
+        grid-column: 1;
       }
+      &[type="reset"] {
+        border: 0.1rem solid var(--red);
+        background: var(--red-1);
+        grid-column: 2;
+      }
+    }
+    a.del {
+      color: var(--red);
+      grid-column: 3;
     }
   }
 }
@@ -60,40 +119,3 @@ table.file-input {
     text-align: left;
   }
 }
-
-.buttons {
-  display: grid;
-  grid-auto-columns: min-content;
-  grid-gap: var(--gap);
-  align-items: baseline;
-
-  & > * {
-    grid-row: 1;
-  }
-
-  input {
-    font: inherit;
-    line-height: 1.5;
-    border-radius: var(--radius);
-    padding: 0 var(--gap);
-    cursor: pointer;
-
-    &:hover {
-      text-decoration: underline;
-    }
-    &[type="submit"] {
-      border: 0.1rem solid var(--green);
-      background: var(--green-1);
-      grid-column: 1;
-    }
-    &[type="reset"] {
-      border: 0.1rem solid var(--red);
-      background: var(--red-1);
-      grid-column: 2;
-    }
-  }
-  a.del {
-    color: var(--red);
-    grid-column: 3;
-  }
-}

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

@@ -6,12 +6,30 @@
       {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
     </ul>
   {% endif %}
-  {% for field in form %}
-    {% if field.errors %}<p class="error">{{ field.errors }}</p>{% endif %}
-    <p class="field">
-      <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-      {{ field }}
-    </p>
+  {% for group in fieldsets %}
+    <div class="column">
+      {% for fieldset in group %}
+        {% if fieldset|length > 1 %}
+          <div class="fieldset">
+            {% for field in fieldset %}
+              {% if field.errors %}<p class="error">{{ field.errors }}</p>{% endif %}
+              <p class="field">
+                <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+                {{ field }}
+              </p>
+            {% endfor %}
+          </div>
+        {% else %}
+          {% with fieldset.0 as field %}
+            {% if field.errors %}<p class="error">{{ field.errors }}</p>{% endif %}
+            <p class="field">
+              <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+              {{ field }}
+            </p>
+          {% endwith %}
+        {% endif %}
+      {% endfor %}
+    </div>
   {% endfor %}
   <div class="buttons">
     {% block buttons %}

nummi/transaction/forms.py

@@ -35,9 +35,28 @@ class TransactionForm(NummiForm):
         self.fields["payment"].widget = DatalistInput(
             options=get_datalist(_user, "payment")
         )
+
         if _disable_statement:
             self.fields["statement"].disabled = True
 
+    def get_context(self):
+        context = super().get_context()
+        context["fieldsets"] = [
+            [
+                [self["statement"]],
+                [self["name"]],
+                [self["value"]],
+                [self["date"], self["real_date"]],
+                [self["category"]],
+                [self["trader"], self["payment"]],
+            ],
+            [
+                [self["description"]],
+            ],
+        ]
+
+        return context
+
 
 class InvoiceForm(NummiForm):
     prefix = "invoice"