diff --git a/app/apps/common/templatetags/crispy_extra.py b/app/apps/common/templatetags/crispy_extra.py new file mode 100644 index 0000000..eb54776 --- /dev/null +++ b/app/apps/common/templatetags/crispy_extra.py @@ -0,0 +1,13 @@ +from django import forms, template + +register = template.Library() + + +@register.filter +def is_input(field): + return isinstance(field.field.widget, forms.TextInput) + + +@register.filter +def is_textarea(field): + return isinstance(field.field.widget, forms.Textarea) diff --git a/app/apps/dca/forms.py b/app/apps/dca/forms.py index 31f25b2..39b73ac 100644 --- a/app/apps/dca/forms.py +++ b/app/apps/dca/forms.py @@ -10,8 +10,7 @@ from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput from apps.common.widgets.tom_select import TomSelect, TransactionSelect from apps.dca.models import DCAEntry, DCAStrategy from apps.transactions.models import Transaction, TransactionCategory, TransactionTag -from crispy_bootstrap5.bootstrap5 import BS5Accordion -from crispy_forms.bootstrap import AccordionGroup, FormActions +from crispy_forms.bootstrap import AccordionGroup, FormActions, Accordion from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Column, Layout, Row from django import forms @@ -154,7 +153,7 @@ class DCAEntryForm(forms.ModelForm): Column("amount_received"), ), "notes", - BS5Accordion( + Accordion( AccordionGroup( _("Create transaction"), Switch("create_transaction"), diff --git a/app/apps/rules/forms.py b/app/apps/rules/forms.py index a12da0f..c4e06af 100644 --- a/app/apps/rules/forms.py +++ b/app/apps/rules/forms.py @@ -9,8 +9,7 @@ from apps.rules.models import ( ) from apps.transactions.forms import BulkEditTransactionForm from apps.transactions.models import Transaction -from crispy_bootstrap5.bootstrap5 import BS5Accordion -from crispy_forms.bootstrap import AccordionGroup, FormActions +from crispy_forms.bootstrap import AccordionGroup, FormActions, Accordion from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Column, Field, Layout, Row from django import forms @@ -208,7 +207,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): self.helper.layout = Layout( "order", - BS5Accordion( + Accordion( AccordionGroup( _("Search Criteria"), Field("filter", rows=1), @@ -219,7 +218,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): ), Column( Field("search_type", rows=1), - css_class="form-group col-md-8", + css_class="col-span-12 md:col-span-8", ), ), Row( @@ -229,7 +228,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): ), Column( Field("search_is_paid", rows=1), - css_class="form-group col-md-8", + css_class="col-span-12 md:col-span-8", ), ), Row( @@ -239,7 +238,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): ), Column( Field("search_mute", rows=1), - css_class="form-group col-md-8", + css_class="col-span-12 md:col-span-8", ), ), Row( @@ -249,7 +248,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): ), Column( Field("search_account", rows=1), - css_class="form-group col-md-8", + css_class="col-span-12 md:col-span-8", ), ), Row( @@ -259,7 +258,7 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm): ), Column( Field("search_entities", rows=1), - css_class="form-group col-md-8", + css_class="col-span-12 md:col-span-8", ), ), Row( @@ -482,7 +481,7 @@ class DryRunUpdatedTransactionForm(BulkEditTransactionForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper.layout.insert(0, "transaction") - self.helper.layout.insert(1, HTML("
")) + self.helper.layout.insert(1, HTML('
')) # Change submit button self.helper.layout[-1] = FormActions( diff --git a/app/apps/rules/views.py b/app/apps/rules/views.py index da49954..1fb44a6 100644 --- a/app/apps/rules/views.py +++ b/app/apps/rules/views.py @@ -564,7 +564,7 @@ def dry_run_rule_updated(request, pk): response = render( request, - "rules/fragments/transaction_rule/dry_run/created.html", + "rules/fragments/transaction_rule/dry_run/updated.html", {"form": form, "rule": rule, "logs": logs, "results": results}, ) diff --git a/app/apps/transactions/forms.py b/app/apps/transactions/forms.py index 11acd1b..f6f9b70 100644 --- a/app/apps/transactions/forms.py +++ b/app/apps/transactions/forms.py @@ -20,8 +20,7 @@ from apps.transactions.models import ( TransactionEntity, TransactionTag, ) -from crispy_bootstrap5.bootstrap5 import BS5Accordion -from crispy_forms.bootstrap import AccordionGroup, AppendedText, FormActions +from crispy_forms.bootstrap import AccordionGroup, AppendedText, FormActions, Accordion from crispy_forms.helper import FormHelper from crispy_forms.layout import ( HTML, @@ -166,7 +165,7 @@ class TransactionForm(forms.ModelForm): ), "description", Field("amount", inputmode="decimal"), - BS5Accordion( + Accordion( AccordionGroup( _("More"), "entities", diff --git a/app/templates/accounts/fragments/account_reconciliation.html b/app/templates/accounts/fragments/account_reconciliation.html index 53e5297..8ad2656 100644 --- a/app/templates/accounts/fragments/account_reconciliation.html +++ b/app/templates/accounts/fragments/account_reconciliation.html @@ -9,14 +9,13 @@
{% csrf_token %} {{ form.management_form }} -
+
{% for form in form.forms %} -
- -
+ + {% if form.account_group %}{{ form.account_group.name }}{% endif %}{{ form.account_name }} -
-
+ +
{% translate 'Current balance' %}
-
+ then put formatted_string into me if diff else put '-' into me">-
-
-
+ + {% endfor %}
diff --git a/app/templates/cotton/transaction/item.html b/app/templates/cotton/transaction/item.html index 655c905..a61a9a2 100644 --- a/app/templates/cotton/transaction/item.html +++ b/app/templates/cotton/transaction/item.html @@ -1,7 +1,7 @@ {% load markdown %} {% load i18n %}
+ class="transaction {% if transaction.type == "EX" %}expense{% else %}income{% endif %} group/transaction">
{% if not disable_selection or not dummy %}