accrete 0.0.54__py3-none-any.whl → 0.0.55__py3-none-any.whl

accrete/contrib/ui/static/css/accrete.scss

@@ -456,6 +456,31 @@ select:focus {
 
 }
 
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type=number] {
+  -moz-appearance: textfield;
+}
+
+/* Fix CKEditor List Display */
+.ck-editor__editable_inline {
+    padding: 0 30px !important;
+}
+
+//ul {
+//    list-style-type: disc;
+//    padding: 10px 0 !important;
+//    padding-left: 20px !important;
+//}
+
+
+
 @media screen and (max-width: 1407px) {
     #list-customization * .dropdown-menu {
         width: auto;

accrete/contrib/ui/templates/ui/dashboard.html

@@ -0,0 +1,7 @@
+{% extends 'ui/layout.html' %}
+
+{% block header %}
+    <div class="is-hidden-fullhd">
+        {% include 'ui/partials/header.html' %}
+    </div>
+{% endblock %}

accrete/contrib/ui/templates/ui/detail.html

@@ -21,79 +21,6 @@
 {% endblock %}
 
 {% block content %}
-{#     <div class="tile is-ancestor">#}
-{#        <div class="tile is-vertical is-8">#}
-{#            <div class="tile is-vertical">#}
-{#                <div class="tile is-parent is-vertical">#}
-{#                    <article class="tile is-child notification">#}
-{#                        <p class="title is-4 mb-1">{{ title }}</p>#}
-{#                        {% block detail_content %}{% endblock %}#}
-{#                    </article>#}
-{#                </div>#}
-{#            </div>#}
-{#            <div class="tile is-parent">#}
-{#                <article class="tile is-child notification is-danger">#}
-{#                    <p class="title is-4">Budgets</p>#}
-{#                    <p class="subtitle">Aligned with the right tile</p>#}
-{#                    <div class="content">#}
-{#                    </div>#}
-{#                </article>#}
-{#            </div>#}
-{#        </div>#}
-{#        <div class="tile is-vertical">#}
-{#            <div class="tile is-parent">#}
-{#                <article class="tile is-child notification">#}
-{#                    <div class="content">#}
-{#                        <p class="title is-4">Info</p>#}
-{#                        <p class="subtitle">With even more content</p>#}
-{#                        <div class="content">#}
-{#                            <!-- Content -->#}
-{#                        </div>#}
-{#                    </div>#}
-{#                </article>#}
-{#            </div>#}
-{#            <div class="tile is-parent">#}
-{#                <article class="tile is-child notification">#}
-{#                    <div class="content">#}
-{#                        <p class="title is-4">Änderungsprotokoll</p>#}
-{#                        <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                    <p>Änderung</p>#}
-{#                        <div class="content">#}
-{#                            {% for expense in future_expenses %}#}
-{#                                <div class="list-column column is-12" style="min-height: 4rem">#}
-{#                                    <div class="box p-3 is-flex is-flex-direction-row is-justify-content-space-between is-flex-wrap-wrap" style="word-break: break-word; height: 100%; border: solid #ccc 1px; overflow-y: auto">#}
-{#                                        <a class="is-underlined is-flex-grow-5" href="{{ expense.get_absolute_url }}">{{ expense }}</a>#}
-{#                                        <div class="is-flex is-flex-wrap-nowrap is-justify-content-space-between is-flex-grow-1">#}
-{#                                            <span>{{ expense.amount }}</span>#}
-{#                                            <span>{{ expense.next_book_date }}</span>#}
-{#                                        </div>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                            {% endfor %}#}
-{#                        </div>#}
-{#                    </div>#}
-{#                </article>#}
-{#            </div>#}
-{#        </div>#}
-{#    </div>#}
-
     <div class="columns is-desktop m-0">
         <div class="column p-0 is-8-desktop">
             <div class="box mt-2">
@@ -107,17 +34,4 @@
             </nav>
         </div>
     </div>
-
-
-{#    <div class="columns is-desktop m-0">#}
-{#        <div class="column p-0 is-8-desktop">#}
-{#            {% block detail_content %}{% endblock %}#}
-{#        </div>#}
-{#        <div class="info-panel column is-4">#}
-{#            <nav class="panel">#}
-{#                {% block info_panel %}#}
-{#                {% endblock %}#}
-{#            </nav>#}
-{#        </div>#}
-{#    </div>#}
 {% endblock %}

accrete/contrib/ui/templates/ui/form.html

@@ -3,28 +3,19 @@
 
 {% block content %}
     <div class="columns is-desktop m-0">
-        <div class="column p-0 is-8-desktop">
+        <div id="form-content" class="column p-0 is-8-desktop">
             <div class="box mt-2">
-                {% include 'ui/partials/form_errors.html' with show_field_errors=True %}
+                {% if form.is_saved is False %}
+                    {% include 'ui/partials/form_errors.html' with show_field_errors=True %}
+                {% endif %}
                 {% block form %}{% endblock %}
             </div>
         </div>
-        <div class="column is-4">
-            <nav class="">
+        <div id="form-info" class="column is-4">
+            <nav>
                 {% block info_panel %}
                 {% endblock %}
             </nav>
         </div>
     </div>
-
-
-{#    <div class="columns is-desktop m-0">#}
-{#        <div class="column p-0 is-8-desktop">#}
-{#            <div>#}
-{#                {% include 'ui/partials/form_errors.html' with show_field_errors=True %}#}
-{#                {% block form %}{% endblock %}#}
-{#            </div>#}
-{#        </div>#}
-{#        <div class="column is-4"></div>#}
-{#    </div>#}
 {% endblock %}

accrete/contrib/ui/templates/ui/layout.html

@@ -18,6 +18,8 @@
     {% block htmx %}
         <script src="{% static "js/htmx.min.js" %}" defer type="text/javascript"></script>
     {% endblock %}
+    <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/sort@3.x.x/dist/cdn.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/alpinejs@3.13.10/dist/cdn.min.js" defer type="text/javascript"></script>
     {% block script %}
         <script src="{% static "js/ui.js" %}" defer type="text/javascript"></script>
     {% endblock %}
@@ -62,7 +64,7 @@
                             <div class="navbar-item has-dropdown is-hoverable" onclick="this.classList.toggle('is-active');">
                                 <a class="navbar-link is-arrowless {% if request.member.name %}is-size-7 has-text-centered-desktop{% endif %}">
                                     {% if request.member.name %}
-                                        {{ request.member }}<br>{{ user }}
+                                        {{ request.member }}
                                     {% else %}
                                         {{ user }}
                                     {% endif %}

accrete/contrib/ui/templates/ui/partials/filter.html

@@ -56,8 +56,8 @@
     </div>
 
     <div id="list-customization" style="display: flex; flex-direction: column; flex-wrap: nowrap">
-        <div class="is-flex-grow-1 mt-2">
-            <div class="field has-addons is-fullwidth">
+        <div class="mt-2">
+            <div class="field has-addons">
                 {% if field_selection %}
                     <div class="control is-expanded">
                         <button id="list-customization-fields-trigger"

accrete/contrib/ui/templates/ui/partials/form_errors.html

@@ -1,23 +1,36 @@
-{% if form.non_field_errors or form.save_error or form.errors and show_field_errors %}
-    <div class="columns py-0">
-        <div class="column is-12">
-            <div class="notification is-danger is-light">
-                <p>{{ form.non_field_errors }}</p>
-                {% if form.save_error %}
-                    <p>{{ form.save_error|safe }}</p>
-                    <p>Error ID: {{ form.save_error_id }}</p>
-                {% endif %}
-                {% if show_field_errors %}
-                    {% for f in form %}
-                        {% if f.errors %}
-                            <label class="label has-text-danger">
-                                <span class="is-underlined">{{ f.label_tag }}</span>
-                                <span class="is-size-7">{{ f.errors }}</span>
-                            </label>
-                        {% endif %}
+<div class="columns py-0">
+    <div class="column is-12">
+        <div class="notification is-danger is-light">
+            <p>{{ form.non_field_errors }}</p>
+            {% for inline_form in form.inline_forms %}
+                <p>{{ inline_form.non_field_errors }}</p>
+            {% endfor %}
+            {% if form.save_error %}
+                <p>{{ form.save_error|safe }}</p>
+                <p>Error ID: {{ form.save_error_id }}</p>
+            {% endif %}
+            {% if show_field_errors %}
+                {% for f in form %}
+                    {% if f.errors %}
+                        <label>
+                            <span class="is-underlined">{{ f.label_tag }}</span>
+                            <span class="is-size-7">{{ f.errors }}</span>
+                        </label>
+                    {% endif %}
+                {% endfor %}
+                {% for formset in form.inline_forms %}
+                    {% for inline_form in formset %}
+                        {% for field in inline_form %}
+                            {% if field.errors %}
+                                <label>
+                                    <span class="is-underlined">{{ field.label_tag }}</span>
+                                    <span class="is-size-7">{{ field.errors }}</span>
+                                </label>
+                            {% endif %}
+                        {% endfor %}
                     {% endfor %}
-                {% endif %}
-            </div>
+                {% endfor %}
+            {% endif %}
         </div>
     </div>
-{% endif %}
+</div>

accrete/contrib/ui/templates/ui/partials/header.html

@@ -29,7 +29,7 @@
         {% endif %}
     </div>
 
-    <div class="is-flex is-hidden-fullhd is-justify-content-space-between mb-2 pt-3">
+    <div class="is-flex is-hidden-fullhd is-justify-content-space-between mb-2">
         <div id="header-actions" class="is-flex py-1 px-1 ml-2" style="overflow-x: auto">
             {% for action in actions %}
                 {% if action.actions %}

accrete/forms.py

@@ -1,250 +1,12 @@
 import logging
-from uuid import uuid4
-from functools import partial
-
 from django import forms
 from django.contrib.auth import get_user_model
-from django.db import transaction
 from accrete.tenant import get_tenant
 
 _logger = logging.getLogger(__name__)
 User = get_user_model()
 
 
-class One2ManyModelForm(forms.ModelForm):
-    """
-    Template Access:
-    In Templates/Forms the generated fields can be accessed via
-    form.get_>>related_name<< e.g. form.get_items returns
-    a list of dictionaries containing the fields.
-
-    Cleaning:
-    For every One2Many field, clean_>>related_name<< is called.
-    To clean all entries together, self.cleaned_data[>>related_name<<] is
-    available in clean() containing a list of all entries
-
-    Initial data can be supplied by creating a form method called
-    get_initial_>>related_name<<_>>field_name<< which takes the
-    related instance as a parameter
-    or by setting an attribute on the model which can be a callable
-
-
-    One2Many field configuration:
-    o2m_fields = {
-        # related_name
-        'items': {
-            # field that holds the key to self.model
-            'fk_field': 'pricelist',
-            # Order by the given fields value, can be prefixed by '-' to
-            # control ascending/descending order
-            'order': '-pk'
-            # fields of the related model that are needed in the form
-            'fields': {
-                # pk field must be present for updating existing rows.
-                # Otherwise, all related objects will be deleted and recreated
-                # upon saving.
-                'pk': {
-                    'field_class': partial(
-                        forms.IntegerField,
-                        required=False,
-                        widget=forms.HiddenInput
-                    ),
-                    # if only data is sent with fields that have
-                    # "count_as_empty" set to true, the whole fieldset is
-                    # ignored and won't be added to self.fields
-                    'count_as_empty': True
-                },
-                'product': {
-                    'field_class': partial(
-                        forms.ModelChoiceField,
-                        Product.objects.all(),
-                        label=_('Product')
-                    )
-                },
-                'price': {
-                    'field_class': partial(
-                        forms.FloatField,
-                        label=_('Price')
-                    )
-                }
-            }
-        }
-    }
-    """
-    o2m_fields = {}
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.o2m_keys = None
-        if self.instance and self.instance.pk and not kwargs.get('data'):
-            self.add_instance_o2m_objects()
-        else:
-            self.add_o2m_fields(**kwargs)
-        self.add_o2m_getter()
-
-    def add_instance_o2m_objects(self):
-        self.o2m_keys = set()
-        for field in self.o2m_fields.keys():
-            related_objects = getattr(self.instance, field)
-            for o in related_objects.all():
-                field_key = f'{field}_{str(uuid4())[:8]}'
-                for k, v in self.o2m_fields[field]['fields'].items():
-                    func_name = f'get_initial_{field}_{k}'
-                    field_name = f'{field_key}-{k}'
-                    self.fields[field_name] = v['field_class']()
-                    if hasattr(self, func_name):
-                        initial = getattr(self, func_name)(o)
-                    else:
-                        initial = getattr(o, k) if hasattr(o, k) else False
-                    if callable(self.fields[field_name].initial):
-                        initial = initial()
-                    self.fields[field_name].initial = initial
-                self.o2m_keys.add(field_key)
-
-    def add_o2m_fields(self, **kwargs):
-        self.o2m_keys = set()
-        data = kwargs.get('data', {})
-        for field, config in self.o2m_fields.items():
-            fields = config['fields']
-            field_keys = set(
-                k.split('-')[0] for k in data.keys() if k.startswith(field)
-            )
-            if not field_keys:
-                field_keys = set(
-                    f'{k}_1' for k in self.o2m_fields.keys()
-                )
-            for field_key in field_keys:
-                to_add = any([
-                    data.get(f'{field_key}-{name}')
-                    for name in list(fields.keys())
-                    if not fields.get(f'{name}', {}).get('count_as_empty')
-                ])
-                if to_add:
-                    for k, v in fields.items():
-                        fname = f'{field_key}-{k}'
-                        self.fields[fname] = v['field_class']()
-                        self.fields[fname].initial = kwargs.get(fname)
-                    self.o2m_keys.add(field_key)
-
-    def add_o2m_getter(self):
-        for k in self.o2m_fields.keys():
-            func_name = f'get_{k}'
-            setattr(self, func_name, partial(self.get_o2m_fields, k))
-
-    def get_o2m_fields(self, prefix):
-        fields = []
-        for k in self.o2m_keys:
-            if k.startswith(prefix):
-                fnames = list(
-                    self.o2m_fields.get(prefix, {}).get('fields', [])
-                )
-                fields.append({
-                    fname: self[f'{k}-{fname}']
-                    for fname in fnames
-                })
-
-        order = self.o2m_fields.get(prefix, {}).get('order')
-        reverse = False
-        if order and order.startswith('-'):
-            order = order[1:]
-            reverse = True
-        if order and fields:
-            fields = sorted(
-                fields, key=lambda x: x[order].value(), reverse=reverse
-            )
-        return fields
-
-    def _clean_fields(self):
-        super()._clean_fields()
-        self._clean_o2m_fields()
-
-    def _clean_o2m_fields(self):
-        for related_name, related_field_config in self.o2m_fields.items():
-            self.cleaned_data[related_name] = []
-            fields = related_field_config['fields'].keys()
-            entries = filter(
-                lambda x: x.startswith(related_name), self.o2m_keys
-            )
-            for entry in entries:
-                value = {
-                    fname: self.cleaned_data.get(f'{entry}-{fname}')
-                    for fname in fields
-                }
-                try:
-                    self.cleaned_data[related_name].append(
-                        getattr(self, f'clean_{related_name}')(value)
-                    )
-                except AttributeError:
-                    self.cleaned_data[related_name].append(value)
-                except forms.ValidationError as error:
-                    self.add_error(entry, error)
-
-    def save_o2m(self):
-        for field in self.o2m_fields.keys():
-            fk_field = self.o2m_fields[field].get('fk_field')
-            if not fk_field:
-                raise KeyError(
-                    'One2Many Form definition is missing the '
-                    f'"fk_field" attribute on field {field}'
-                )
-
-            related_objects = getattr(self.instance, field)
-            if not self.cleaned_data.get(field, []):
-                related_objects.all().delete()
-
-            related_object_fields = [
-                field.name for field
-                in related_objects.model._meta.get_fields()
-            ]
-            update_pks, to_update, to_create = [], [], []
-
-            for item in self.cleaned_data.get(field, []):
-                item.update({fk_field: self.instance})
-                if pk := item.get('pk'):
-                    update_pks.append(pk)
-                    to_update.append(item)
-                else:
-                    to_create.append(item)
-
-            qs = related_objects.filter(pk__in=update_pks).order_by('pk')
-            related_objects.exclude(pk__in=update_pks).delete()
-            to_update = sorted(to_update, key=lambda x: x['pk'])
-            if qs.count() != len(to_update):
-                raise ValueError(
-                    'Mismatching length of found objects and update data'
-                )
-            updated = []
-            for obj, update in zip(qs, to_update):
-                for k, v in update.items():
-                    if k not in related_object_fields:
-                        continue
-                    setattr(obj, k, v)
-                    updated.append(obj)
-            objects_to_create = []
-            for c in to_create:
-                values = {}
-                for k, v in c.items():
-                    if k in related_object_fields:
-                        values.update({k: v})
-                objects_to_create.append(related_objects.model(**values))
-            if updated:
-                field_list = [
-                    f for f in to_update[0].keys()
-                    if f in related_object_fields
-                ]
-                related_objects.bulk_update(
-                    updated, fields=field_list
-                )
-            if to_create:
-                related_objects.bulk_create(objects_to_create)
-
-    def save(self, commit=True):
-        super().save(commit=commit)
-        if commit:
-            self.save_o2m()
-        return self.instance
-
-
 class TenantForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
@@ -259,7 +21,7 @@ class TenantForm(forms.Form):
             field.queryset = field.queryset.filter(tenant=self.tenant)
 
 
-class TenantModelForm(One2ManyModelForm):
+class TenantModelForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.tenant = get_tenant()
@@ -272,13 +34,6 @@ class TenantModelForm(One2ManyModelForm):
         for field in fields_to_filter:
             field.queryset = field.queryset.filter(tenant=self.tenant)
 
-    def save_o2m(self):
-        o2m_fields = self.o2m_fields.keys()
-        for field in o2m_fields:
-            for item in self.cleaned_data.get(field, []):
-                item.update({'tenant': self.tenant})
-        return super().save_o2m()
-
     def save(self, commit=True):
         super().save(commit=False)
         if not self.instance.pk or not self.instance.tenant:
@@ -287,6 +42,4 @@ class TenantModelForm(One2ManyModelForm):
         if commit:
             self.instance.save()
             self.save_m2m()
-            self.save_o2m()
-
         return self.instance

accrete/managers.py

@@ -7,8 +7,7 @@ class TenantManager(models.Manager, AnnotationManagerMixin):
 
     def get_queryset(self):
         queryset = super().get_queryset()
-        tenant = get_tenant()
-        if tenant:
+        if tenant := get_tenant():
             queryset = queryset.filter(tenant=tenant)
         return queryset.annotate(**self.get_annotations())
 

accrete/utils/__init__.py

@@ -1,4 +1,4 @@
 from . import dates
-from .forms import save_form
-from .http import filter_from_querystring
+from .forms import save_form, save_forms, inline_vals_from_post, extend_formset
+from .http import filter_from_querystring, cast_param
 from .models import get_related_model

accrete/utils/forms.py

@@ -1,6 +1,9 @@
+import re
 import logging
 from uuid import uuid4
+from typing import Type
 from django.db import transaction
+from django.forms import BaseFormSet
 
 _logger = logging.getLogger(__name__)
 
@@ -22,3 +25,79 @@ def save_form(form, reraise=False):
         if reraise:
             raise e
     return form
+
+
+def save_forms(form, inline_formsets: list = None, reraise: bool = False):
+
+    def handle_error(error):
+        form.save_error = repr(error)
+        error_id = str(uuid4())[:8]
+        _logger.exception(f'{error_id}: {error}')
+        form.save_error_id = error_id
+
+    form.is_saved = False
+    form.save_error = None
+    form.save_error_id = None
+    form.inline_forms = inline_formsets
+
+    try:
+        form.is_valid()
+        inlines_valid = all([
+            inline_formset.is_valid() for inline_formset in inline_formsets
+        ])
+    except Exception as e:
+        handle_error(e)
+        if reraise:
+            raise e
+        return form
+
+    if not form.is_valid() or not inlines_valid:
+        return form
+
+    try:
+        with transaction.atomic():
+            form.save()
+            for inline_formset in inline_formsets:
+                inline_formset.save()
+    except Exception as e:
+        handle_error(e)
+        if reraise:
+            raise e
+        return form
+
+    form.is_saved = True
+    return form
+
+
+def inline_vals_from_post(post: dict, prefix: str) -> list[dict]:
+    post_keys = set(re.findall(f'{prefix}-[0-9]+', ', '.join(post.keys())))
+    initial_data = {
+        post_key: {}
+        for post_key in post_keys if not post.get(f'{post_key}-DELETE')
+    }
+    for key, val in post.items():
+        post_key = '-'.join(key.split('-')[:-1])
+        if post_key not in initial_data:
+            continue
+        field_name = key.split('-')[-1]
+        initial_data[post_key].update({field_name: val})
+    return [val for val in initial_data.values()]
+
+
+def extend_formset(formset_class, post: dict, data: list[dict]|dict, **formset_kwargs) -> Type[BaseFormSet]:
+    formset = formset_class(post, **formset_kwargs)
+    if not formset.is_valid():
+        return formset
+    form_data = post.copy()
+    if isinstance(data, dict):
+        data = [data]
+    prefix = formset_kwargs.get('prefix', 'form')
+    total = int(form_data[f'{prefix}-TOTAL_FORMS']) - 1
+    for item in data:
+        total += 1
+        form_data.update({f'{prefix}-{total}-{key}': value for key, value in item.items()})
+    form_data[f'{prefix}-TOTAL_FORMS'] = total + 1
+    formset = formset_class(form_data, **formset_kwargs)
+    for form in formset:
+        form._errors = {}
+    return formset