From ecc09ca6a64be53457604368005a65fc098b96d9 Mon Sep 17 00:00:00 2001 From: Herculino Trotta Date: Sun, 9 Feb 2025 17:14:25 -0300 Subject: [PATCH] feat(monthly): add quick-search field --- app/templates/cotton/transaction/item.html | 314 +++++++++--------- .../monthly_overview/fragments/list.html | 18 +- .../monthly_overview/pages/overview.html | 14 + 3 files changed, 184 insertions(+), 162 deletions(-) diff --git a/app/templates/cotton/transaction/item.html b/app/templates/cotton/transaction/item.html index efaed30..b2ddfdf 100644 --- a/app/templates/cotton/transaction/item.html +++ b/app/templates/cotton/transaction/item.html @@ -1,172 +1,174 @@ {% load markdown %} {% load i18n %} -
- {% if not disable_selection %} - - {% endif %} -
+
+ {% if not disable_selection %} + + {% endif %} +
-
-
- {% if not transaction.deleted %} - - {% if transaction.is_paid %}{% else %}{% endif %} - - {% else %} -
- {% if transaction.is_paid %}{% else %}{% endif %} +
+
+ {% if not transaction.deleted %} + + {% if transaction.is_paid %}{% else %}{% endif %} + + {% else %} +
+ {% if transaction.is_paid %}{% else %}{% endif %} +
+ {% endif %} +
+
+ {# Date#} +
+
+
{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}
- {% endif %} -
-
- {# Date#} -
-
-
{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}
-
- {# Description#} -
- {% spaceless %} - {{ transaction.description }} - {% if transaction.installment_plan and transaction.installment_id %} - {{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }} - {% endif %} - {% if transaction.recurring_transaction %} - - {% endif %} - {% endspaceless %} -
-
- {# Entities #} - {% with transaction.entities.all as entities %} - {% if entities %} + {# Description#} +
+ {% spaceless %} + {{ transaction.description }} + {% if transaction.installment_plan and transaction.installment_id %} + {{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }} + {% endif %} + {% if transaction.recurring_transaction %} + + {% endif %} + {% endspaceless %} +
+
+ {# Entities #} + {% with transaction.entities.all as entities %} + {% if entities %} +
+
+
{{ entities|join:", " }}
+
+ {% endif %} + {% endwith %} + {# Notes#} + {% if transaction.notes %}
-
-
{{ entities|join:", " }}
-
- {% endif %} - {% endwith %} - {# Notes#} - {% if transaction.notes %} -
-
-
{{ transaction.notes | limited_markdown | linebreaksbr }}
-
- {% endif %} - {# Category#} - {% if transaction.category %} -
-
-
{{ transaction.category.name }}
-
- {% endif %} - {# Tags#} - {% with transaction.tags.all as tags %} - {% if tags %} -
-
-
{{ tags|join:", " }}
+
+
{{ transaction.notes | limited_markdown | linebreaksbr }}
+
+ {% endif %} + {# Category#} + {% if transaction.category %} +
+
+
{{ transaction.category.name }}
+
+ {% endif %} + {# Tags#} + {% with transaction.tags.all as tags %} + {% if tags %} +
+
+
{{ tags|join:", " }}
+
+ {% endif %} + {% endwith %} +
+
+
+
+ +
+ {# Exchange Rate#} + {% with exchanged=transaction.exchanged_amount %} + {% if exchanged %} +
+
{% endif %} {% endwith %} +
+ {% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }} +
-
-
-
- -
- {# Exchange Rate#} - {% with exchanged=transaction.exchanged_amount %} - {% if exchanged %} -
- -
- {% endif %} - {% endwith %}
- {% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }} -
-
-
- {# Item actions#} -
-
- {% if not transaction.deleted %} - - - - - - - {% else %} - - - - {% endif %} + {# Item actions#} +
+
+ {% if not transaction.deleted %} + + + + + + + {% else %} + + + + {% endif %} +
diff --git a/app/templates/monthly_overview/fragments/list.html b/app/templates/monthly_overview/fragments/list.html index 2306687..0483e15 100644 --- a/app/templates/monthly_overview/fragments/list.html +++ b/app/templates/monthly_overview/fragments/list.html @@ -4,9 +4,9 @@