chore(locale): update translation files

[skip ci] Automatically generated by Django makemessages workflow

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: eitchtee
+custom: ["https://www.paypal.com/donate/?hosted_button_id=FFWM4W9NQDMM6"]

README.md

@@ -51,6 +51,17 @@ Frustrated by the lack of comprehensive options, I set out to build **WYGIWYH**
 * **Built-in Dollar-Cost Average (DCA) tracker**: Essential for tracking recurring investments, especially for crypto and stocks.
 * **API support for automation**: Seamlessly integrate with existing services to synchronize transactions.
 
+# Demo
+
+You can try WYGIWYH on [wygiwyh-demo.herculino.com](https://wygiwyh-demo.herculino.com/) with the credentials below:
+
+> [!NOTE]
+> E-mail: `demo@demo.com`
+> 
+> Password: `wygiwyhdemo`
+
+Keep in mind that **any data you add will be wiped in 24 hours or less**. And that **most automation features like the API, Rules, Automatic Exchange Rates and Import/Export are disabled**.
+
 # How To Use
 
 To run this application, you'll need [Docker](https://docs.docker.com/engine/install/) with [docker-compose](https://docs.docker.com/compose/install/).

app/WYGIWYH/settings.py

@@ -163,10 +163,105 @@ AUTH_USER_MODEL = "users.User"
 
 LANGUAGE_CODE = "en"
 LANGUAGES = (
+    ("af", "Afrikaans"),
+    ("ar", "العربية"),
+    ("ar-dz", "العربية (الجزائر)"),  # Algerian Arabic often uses the base name + region
+    ("ast", "Asturianu"),
+    ("az", "Azərbaycan"),
+    ("bg", "Български"),
+    ("be", "Беларуская"),
+    ("bn", "বাংলা"),
+    ("br", "Brezhoneg"),
+    ("bs", "Bosanski"),
+    ("ca", "Català"),
+    ("ckb", "کوردیی ناوەندی"),  # Central Kurdish (Sorani)
+    ("cs", "Čeština"),
+    ("cy", "Cymraeg"),
+    ("da", "Dansk"),
     ("de", "Deutsch"),
+    ("dsb", "Dolnoserbšćina"),
+    ("el", "Ελληνικά"),
     ("en", "English"),
+    ("en-au", "English (Australia)"),
+    ("en-gb", "English (UK)"),
+    ("eo", "Esperanto"),
+    ("es", "Español"),
+    ("es-ar", "Español (Argentina)"),
+    ("es-co", "Español (Colombia)"),
+    ("es-mx", "Español (México)"),
+    ("es-ni", "Español (Nicaragua)"),
+    ("es-ve", "Español (Venezuela)"),
+    ("et", "Eesti"),
+    ("eu", "Euskara"),
+    ("fa", "فارسی"),
+    ("fi", "Suomi"),
+    ("fr", "Français"),
+    ("fy", "Frysk"),
+    ("ga", "Gaeilge"),
+    ("gd", "Gàidhlig"),
+    ("gl", "Galego"),
+    ("he", "עברית"),
+    ("hi", "हिन्दी"),
+    ("hr", "Hrvatski"),
+    ("hsb", "Hornjoserbšćina"),
+    ("hu", "Magyar"),
+    ("hy", "Հայերեն"),
+    ("ia", "Interlingua"),
+    ("id", "Bahasa Indonesia"),
+    ("ig", "Igbo"),
+    ("io", "Ido"),
+    ("is", "Íslenska"),
+    ("it", "Italiano"),
+    ("ja", "日本語"),
+    ("ka", "ქართული"),
+    ("kab", "Taqbaylit"),
+    ("kk", "Қазақша"),
+    ("km", "ខ្មែរ"),
+    ("kn", "ಕನ್ನಡ"),
+    ("ko", "한국어"),
+    ("ky", "Кыргызча"),
+    ("lb", "Lëtzebuergesch"),
+    ("lt", "Lietuvių"),
+    ("lv", "Latviešu"),
+    ("mk", "Македонски"),
+    ("ml", "മലയാളം"),
+    ("mn", "Монгол"),
+    ("mr", "मराठी"),
+    ("ms", "Bahasa Melayu"),
+    ("my", "မြန်မာဘာသာ"),
+    ("nb", "Norsk (Bokmål)"),
+    ("ne", "नेपाली"),
     ("nl", "Nederlands"),
+    ("nn", "Norsk (Nynorsk)"),
+    ("os", "Ирон"),  # Ossetic
+    ("pa", "ਪੰਜਾਬੀ"),
+    ("pl", "Polski"),
+    ("pt", "Português"),
     ("pt-br", "Português (Brasil)"),
+    ("ro", "Română"),
+    ("ru", "Русский"),
+    ("sk", "Slovenčina"),
+    ("sl", "Slovenščina"),
+    ("sq", "Shqip"),
+    ("sr", "Српски"),
+    ("sr-latn", "Srpski (Latinica)"),
+    ("sv", "Svenska"),
+    ("sw", "Kiswahili"),
+    ("ta", "தமிழ்"),
+    ("te", "తెలుగు"),
+    ("tg", "Тоҷикӣ"),
+    ("th", "ไทย"),
+    ("tk", "Türkmençe"),
+    ("tr", "Türkçe"),
+    ("tt", "Татарча"),
+    ("udm", "Удмурт"),
+    ("ug", "ئۇيغۇرچە"),
+    ("uk", "Українська"),
+    ("ur", "اردو"),
+    ("uz", "Oʻzbekcha"),
+    ("vi", "Tiếng Việt"),
+    ("zh-hans", "简体中文"),
+    ("zh-hant", "繁體中文"),
 )
 
 TIME_ZONE = os.getenv("TZ", "UTC")

app/apps/accounts/urls.py

@@ -51,7 +51,7 @@ urlpatterns = [
     ),
     path(
         "account-groups/<int:pk>/share/",
-        views.account_share,
+        views.account_group_share,
         name="account_group_share_settings",
     ),
 ]

app/apps/accounts/views/account_groups.py

@@ -145,7 +145,7 @@ def account_group_take_ownership(request, pk):
 @only_htmx
 @login_required
 @require_http_methods(["GET", "POST"])
-def account_share(request, pk):
+def account_group_share(request, pk):
     obj = get_object_or_404(AccountGroup, id=pk)
 
     if obj.owner and obj.owner != request.user:

app/apps/api/fields/transactions.py

@@ -41,7 +41,10 @@ class TransactionCategoryField(serializers.Field):
     def get_schema():
         return {
             "type": "array",
-            "items": {"type": "string", "description": "TransactionTag ID or name"},
+            "items": {
+                "type": "string",
+                "description": "TransactionCategory ID or name",
+            },
         }
 
 

app/apps/api/serializers/accounts.py

@@ -1,3 +1,4 @@
+from django.db.models import Q
 from rest_framework import serializers
 from rest_framework.permissions import IsAuthenticated
 
@@ -22,6 +23,7 @@ class AccountSerializer(serializers.ModelSerializer):
         write_only=True,
         allow_null=True,
     )
+
     currency = CurrencySerializer(read_only=True)
     currency_id = serializers.PrimaryKeyRelatedField(
         queryset=Currency.objects.all(), source="currency", write_only=True
@@ -50,6 +52,13 @@ class AccountSerializer(serializers.ModelSerializer):
             "is_asset",
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        request = self.context.get("request")
+        if request and request.user.is_authenticated:
+            # Reload the queryset to get an updated version with the requesting user
+            self.fields["group_id"].queryset = AccountGroup.objects.all()
+
     def create(self, validated_data):
         return Account.objects.create(**validated_data)
 

app/apps/common/decorators/user.py

@@ -0,0 +1,78 @@
+from functools import wraps
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from django.http import HttpResponse
+from django.shortcuts import redirect
+from django.urls import reverse, NoReverseMatch
+
+
+def is_superuser(view):
+    @wraps(view)
+    def _view(request, *args, **kwargs):
+        if not request.user.is_superuser:
+            raise PermissionDenied
+
+        return view(request, *args, **kwargs)
+
+    return _view
+
+
+def htmx_login_required(function=None, login_url=None):
+    """
+    Decorator that checks if the user is logged in.
+
+    Allows overriding the default login URL.
+
+    If the user is not logged in:
+    - If "hx-request" is present in the request header, it returns a 200 response
+      with a "HX-Redirect" header containing the determined login URL (including the "next" parameter).
+    - If "hx-request" is not present, it redirects to the determined login page normally.
+
+    Args:
+        function: The view function to decorate.
+        login_url: Optional. The URL or URL name to redirect to for login.
+                   Defaults to settings.LOGIN_URL.
+    """
+
+    def decorator(view_func):
+        # Simplified @wraps usage - it handles necessary attribute assignments by default
+        @wraps(view_func)
+        def wrapped_view(request, *args, **kwargs):
+            if request.user.is_authenticated:
+                return view_func(request, *args, **kwargs)
+            else:
+                # Determine the login URL
+                resolved_login_url = login_url
+                if not resolved_login_url:
+                    resolved_login_url = settings.LOGIN_URL
+
+                # Try to reverse the URL name if it's not a path
+                try:
+                    # Check if it looks like a URL path already
+                    if "/" not in resolved_login_url and "." not in resolved_login_url:
+                        login_url_path = reverse(resolved_login_url)
+                    else:
+                        login_url_path = resolved_login_url
+                except NoReverseMatch:
+                    # If reverse fails, assume it's already a URL path
+                    login_url_path = resolved_login_url
+
+                # Construct the full redirect path with 'next' parameter
+                # Ensure request.path is URL-encoded if needed, though Django usually handles this
+                redirect_path = f"{login_url_path}?next={request.get_full_path()}"  # Use get_full_path() to include query params
+
+                if request.headers.get("hx-request"):
+                    # For HTMX requests, return a 200 with the HX-Redirect header.
+                    response = HttpResponse()
+                    response["HX-Redirect"] = login_url_path
+                    return response
+                else:
+                    # For regular requests, redirect to the login page.
+                    return redirect(redirect_path)
+
+        return wrapped_view
+
+    if function:
+        return decorator(function)
+    return decorator

app/apps/common/fields/month_year.py

@@ -20,7 +20,15 @@ class MonthYearModelField(models.DateField):
             # Set the day to 1
             return date.replace(day=1).date()
         except ValueError:
-            raise ValidationError(_("Invalid date format. Use YYYY-MM."))
+            try:
+                # Also accept YYYY-MM-DD format (for loaddata)
+                return (
+                    datetime.datetime.strptime(value, "%Y-%m-%d").replace(day=1).date()
+                )
+            except ValueError:
+                raise ValidationError(
+                    _("Invalid date format. Use YYYY-MM or YYYY-MM-DD.")
+                )
 
     def formfield(self, **kwargs):
         kwargs["widget"] = MonthYearWidget

app/apps/common/forms.py

@@ -2,6 +2,7 @@ from crispy_forms.bootstrap import FormActions
 from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field, Submit, Div, HTML
 
@@ -81,6 +82,23 @@ class SharedObjectForm(forms.Form):
             ),
         )
 
+    def clean(self):
+        cleaned_data = super().clean()
+        owner = cleaned_data.get("owner")
+        shared_with_users = cleaned_data.get("shared_with_users", [])
+
+        # Raise validation error if owner is in shared_with_users
+        if owner and owner in shared_with_users:
+            self.add_error(
+                "shared_with_users",
+                ValidationError(
+                    _("You cannot share this item with its owner."),
+                    code="invalid_share",
+                ),
+            )
+
+        return cleaned_data
+
     def save(self):
         instance = self.instance
 

app/apps/common/tasks.py

@@ -44,12 +44,12 @@ async def remove_expired_sessions(timestamp=None):
         )
 
 
-@app.periodic(cron="0 6 * * *")
+@app.periodic(cron="0 8 * * *")
 @app.task(name="reset_demo_data")
-def reset_demo_data():
+def reset_demo_data(timestamp=None):
     """
     Wipes the database and loads fresh demo data if DEMO mode is active.
-    Runs daily at 6:00 AM.
+    Runs daily at 8:00 AM.
     """
     if not settings.DEMO:
         return  # Exit if not in demo mode
@@ -59,13 +59,14 @@ def reset_demo_data():
     try:
         # 1. Flush the database (wipe all data)
         logger.info("Flushing the database...")
-        # Using --noinput prevents prompts. Specify database if not default.
+
         management.call_command(
             "flush", "--noinput", database=DEFAULT_DB_ALIAS, verbosity=1
         )
         logger.info("Database flushed successfully.")
 
         # 2. Load data from the fixture
+        # TO-DO: Roll dates over based on today's date
         fixture_name = "fixtures/demo_data.json"
         logger.info(f"Loading data from fixture: {fixture_name}...")
         management.call_command(

app/apps/common/views.py

@@ -15,10 +15,11 @@ from cachalot.api import invalidate
 
 from apps.common.decorators.htmx import only_htmx
 from apps.transactions.models import Transaction
+from apps.common.decorators.user import htmx_login_required
 
 
 @only_htmx
-@login_required
+@htmx_login_required
 @require_http_methods(["GET"])
 def toasts(request):
     return render(request, "common/fragments/toasts.html")

app/apps/insights/utils/category_overview.py

@@ -10,7 +10,7 @@ from apps.currencies.utils.convert import convert
 
 
 def get_categories_totals(transactions_queryset, ignore_empty=False):
-    # Get metrics for each category and currency in a single query
+    # First get the category totals as before
     category_currency_metrics = (
         transactions_queryset.values(
             "category",
@@ -74,9 +74,65 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
         .order_by("category__name")
     )
 
+    # Get tag totals within each category with currency details
+    tag_metrics = transactions_queryset.values(
+        "category",
+        "tags",
+        "tags__name",
+        "account__currency",
+        "account__currency__code",
+        "account__currency__name",
+        "account__currency__decimal_places",
+        "account__currency__prefix",
+        "account__currency__suffix",
+        "account__currency__exchange_currency",
+    ).annotate(
+        expense_current=Coalesce(
+            Sum(
+                Case(
+                    When(type=Transaction.Type.EXPENSE, is_paid=True, then="amount"),
+                    default=Value(0),
+                    output_field=models.DecimalField(),
+                )
+            ),
+            Decimal("0"),
+        ),
+        expense_projected=Coalesce(
+            Sum(
+                Case(
+                    When(type=Transaction.Type.EXPENSE, is_paid=False, then="amount"),
+                    default=Value(0),
+                    output_field=models.DecimalField(),
+                )
+            ),
+            Decimal("0"),
+        ),
+        income_current=Coalesce(
+            Sum(
+                Case(
+                    When(type=Transaction.Type.INCOME, is_paid=True, then="amount"),
+                    default=Value(0),
+                    output_field=models.DecimalField(),
+                )
+            ),
+            Decimal("0"),
+        ),
+        income_projected=Coalesce(
+            Sum(
+                Case(
+                    When(type=Transaction.Type.INCOME, is_paid=False, then="amount"),
+                    default=Value(0),
+                    output_field=models.DecimalField(),
+                )
+            ),
+            Decimal("0"),
+        ),
+    )
+
     # Process the results to structure by category
     result = {}
 
+    # Process category totals first
     for metric in category_currency_metrics:
         # Skip empty categories if ignore_empty is True
         if ignore_empty and all(
@@ -101,7 +157,11 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
         currency_id = metric["account__currency"]
 
         if category_id not in result:
-            result[category_id] = {"name": metric["category__name"], "currencies": {}}
+            result[category_id] = {
+                "name": metric["category__name"],
+                "currencies": {},
+                "tags": {},  # Add tags container
+            }
 
         # Add currency data
         currency_data = {
@@ -162,4 +222,101 @@ def get_categories_totals(transactions_queryset, ignore_empty=False):
 
         result[category_id]["currencies"][currency_id] = currency_data
 
+    # Process tag totals and add them to the result, including untagged
+    for tag_metric in tag_metrics:
+        category_id = tag_metric["category"]
+        tag_id = tag_metric["tags"]  # Will be None for untagged transactions
+
+        if category_id in result:
+            # Initialize the tag container if not exists
+            if "tags" not in result[category_id]:
+                result[category_id]["tags"] = {}
+
+            # Determine if this is a tagged or untagged transaction
+            tag_key = tag_id if tag_id is not None else "untagged"
+            tag_name = tag_metric["tags__name"] if tag_id is not None else None
+
+            if tag_key not in result[category_id]["tags"]:
+                result[category_id]["tags"][tag_key] = {
+                    "name": tag_name,
+                    "currencies": {},
+                }
+
+            currency_id = tag_metric["account__currency"]
+
+            # Calculate tag totals
+            tag_total_current = (
+                tag_metric["income_current"] - tag_metric["expense_current"]
+            )
+            tag_total_projected = (
+                tag_metric["income_projected"] - tag_metric["expense_projected"]
+            )
+            tag_total_income = (
+                tag_metric["income_current"] + tag_metric["income_projected"]
+            )
+            tag_total_expense = (
+                tag_metric["expense_current"] + tag_metric["expense_projected"]
+            )
+            tag_total_final = tag_total_current + tag_total_projected
+
+            tag_currency_data = {
+                "currency": {
+                    "code": tag_metric["account__currency__code"],
+                    "name": tag_metric["account__currency__name"],
+                    "decimal_places": tag_metric["account__currency__decimal_places"],
+                    "prefix": tag_metric["account__currency__prefix"],
+                    "suffix": tag_metric["account__currency__suffix"],
+                },
+                "expense_current": tag_metric["expense_current"],
+                "expense_projected": tag_metric["expense_projected"],
+                "total_expense": tag_total_expense,
+                "income_current": tag_metric["income_current"],
+                "income_projected": tag_metric["income_projected"],
+                "total_income": tag_total_income,
+                "total_current": tag_total_current,
+                "total_projected": tag_total_projected,
+                "total_final": tag_total_final,
+            }
+
+            # Add exchange currency support for tags
+            if tag_metric["account__currency__exchange_currency"]:
+                from_currency = Currency.objects.get(id=currency_id)
+                exchange_currency = Currency.objects.get(
+                    id=tag_metric["account__currency__exchange_currency"]
+                )
+
+                exchanged = {}
+                for field in [
+                    "expense_current",
+                    "expense_projected",
+                    "income_current",
+                    "income_projected",
+                    "total_income",
+                    "total_expense",
+                    "total_current",
+                    "total_projected",
+                    "total_final",
+                ]:
+                    amount, prefix, suffix, decimal_places = convert(
+                        amount=tag_currency_data[field],
+                        from_currency=from_currency,
+                        to_currency=exchange_currency,
+                    )
+                    if amount is not None:
+                        exchanged[field] = amount
+                        if "currency" not in exchanged:
+                            exchanged["currency"] = {
+                                "prefix": prefix,
+                                "suffix": suffix,
+                                "decimal_places": decimal_places,
+                                "code": exchange_currency.code,
+                                "name": exchange_currency.name,
+                            }
+                if exchanged:
+                    tag_currency_data["exchanged"] = exchanged
+
+            result[category_id]["tags"][tag_key]["currencies"][
+                currency_id
+            ] = tag_currency_data
+
     return result

app/apps/insights/views.py

@@ -1,10 +1,8 @@
-import decimal
-import json
 from collections import defaultdict
 
 from dateutil.relativedelta import relativedelta
 from django.contrib.auth.decorators import login_required
-from django.db.models import Sum, Avg, F
+from django.db.models import Sum
 from django.shortcuts import render
 from django.utils import timezone
 from django.views.decorators.http import require_http_methods
@@ -22,13 +20,13 @@ from apps.insights.utils.category_explorer import (
     get_category_sums_by_account,
     get_category_sums_by_currency,
 )
+from apps.insights.utils.category_overview import get_categories_totals
 from apps.insights.utils.sankey import (
     generate_sankey_data_by_account,
     generate_sankey_data_by_currency,
 )
 from apps.insights.utils.transactions import get_transactions
 from apps.transactions.models import TransactionCategory, Transaction
-from apps.insights.utils.category_overview import get_categories_totals
 from apps.transactions.utils.calculations import calculate_currency_totals
 
 
@@ -170,6 +168,24 @@ def category_sum_by_currency(request):
 @login_required
 @require_http_methods(["GET"])
 def category_overview(request):
+    if "view_type" in request.GET:
+        view_type = request.GET["view_type"]
+        request.session["insights_category_explorer_view_type"] = view_type
+    else:
+        view_type = request.session.get("insights_category_explorer_view_type", "table")
+
+    if "show_tags" in request.GET:
+        show_tags = request.GET["show_tags"] == "on"
+        request.session["insights_category_explorer_show_tags"] = show_tags
+    else:
+        show_tags = request.session.get("insights_category_explorer_show_tags", True)
+
+    if "showing" in request.GET:
+        showing = request.GET["showing"]
+        request.session["insights_category_explorer_showing"] = showing
+    else:
+        showing = request.session.get("insights_category_explorer_showing", "final")
+
     # Get filtered transactions
     transactions = get_transactions(request, include_silent=True)
 
@@ -180,7 +196,12 @@ def category_overview(request):
     return render(
         request,
         "insights/fragments/category_overview/index.html",
-        {"total_table": total_table},
+        {
+            "total_table": total_table,
+            "view_type": view_type,
+            "show_tags": show_tags,
+            "showing": showing,
+        },
     )
 
 

app/apps/transactions/forms.py

@@ -6,6 +6,7 @@ from crispy_forms.layout import (
     Row,
     Column,
     Field,
+    Div,
 )
 from django import forms
 from django.db.models import Q
@@ -206,10 +207,21 @@ class TransactionForm(forms.ModelForm):
         else:
             self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
             self.helper.layout.append(
-                FormActions(
+                Div(
                     NoClassSubmit(
-                        "submit", _("Add"), css_class="btn btn-outline-primary w-100"
+                        "submit", _("Add"), css_class="btn btn-outline-primary"
                     ),
+                    NoClassSubmit(
+                        "submit_and_similar",
+                        _("Save and add similar"),
+                        css_class="btn btn-outline-primary",
+                    ),
+                    NoClassSubmit(
+                        "submit_and_another",
+                        _("Save and add another"),
+                        css_class="btn btn-outline-primary",
+                    ),
+                    css_class="d-grid gap-2",
                 ),
             )
 

app/apps/transactions/models.py

@@ -118,13 +118,20 @@ class SoftDeleteManager(models.Manager):
         qs = SoftDeleteQuerySet(self.model, using=self._db)
         user = get_current_user()
         if user and not user.is_anonymous:
-            return qs.filter(
-                Q(account__visibility="public")
-                | Q(account__owner=user)
-                | Q(account__shared_with=user)
-                | Q(account__visibility="private", account__owner=None),
-                deleted=False,
-            ).distinct()
+            account_ids = (
+                qs.filter(
+                    Q(account__visibility="public")
+                    | Q(account__owner=user)
+                    | Q(account__shared_with=user)
+                    | Q(account__visibility="private", account__owner=None),
+                    deleted=False,
+                )
+                .values_list("account__id", flat=True)
+                .distinct()
+            )
+
+            return qs.filter(account_id__in=account_ids, deleted=False)
+
         else:
             return qs.filter(
                 deleted=False,
@@ -574,6 +581,7 @@ class InstallmentPlan(models.Model):
                 installment_plan=self,
                 installment_id=i,
                 notes=self.notes if self.add_notes_to_transaction else "",
+                owner=self.account.owner,
             )
             new_transaction.tags.set(self.tags.all())
             new_transaction.entities.set(self.entities.all())
@@ -640,6 +648,7 @@ class InstallmentPlan(models.Model):
                     installment_plan=self,
                     installment_id=i,
                     notes=self.notes if self.add_notes_to_transaction else "",
+                    owner=self.account.owner,
                 )
                 new_transaction.tags.set(self.tags.all())
                 new_transaction.entities.set(self.entities.all())
@@ -775,6 +784,7 @@ class RecurringTransaction(models.Model):
             is_paid=False,
             recurring_transaction=self,
             notes=self.notes if self.add_notes_to_transaction else "",
+            owner=self.account.owner,
         )
         if self.tags.exists():
             created_transaction.tags.set(self.tags.all())
@@ -797,12 +807,16 @@ class RecurringTransaction(models.Model):
     @classmethod
     def generate_upcoming_transactions(cls):
         today = timezone.now().date()
-        recurring_transactions = cls.objects.filter(
+        recurring_transactions = cls.all_objects.filter(
             Q(models.Q(end_date__isnull=True) | Q(end_date__gte=today))
             & Q(is_paused=False)
         )
 
         for recurring_transaction in recurring_transactions:
+            logger.info(
+                f"Processing recurring transaction: {recurring_transaction.description}..."
+            )
+
             if recurring_transaction.last_generated_date:
                 start_date = recurring_transaction.get_next_date(
                     recurring_transaction.last_generated_date
@@ -821,7 +835,10 @@ class RecurringTransaction(models.Model):
                 today + (recurring_transaction.get_recurrence_delta() * 6),
             )
 
+            logger.info(f"End date: {end_date}")
+
             while current_date <= end_date:
+                logger.info(f"Creating transaction for date: {current_date}")
                 recurring_transaction.create_transaction(current_date, reference_date)
                 current_date = recurring_transaction.get_next_date(current_date)
                 reference_date = recurring_transaction.get_next_date(reference_date)

app/apps/transactions/views/transactions.py

@@ -43,16 +43,71 @@ def transaction_add(request):
         year=year,
     ).date()
 
+    update = False
+
     if request.method == "POST":
         form = TransactionForm(request.POST)
         if form.is_valid():
-            form.save()
+            saved_instance = form.save()
             messages.success(request, _("Transaction added successfully"))
 
-            return HttpResponse(
-                status=204,
-                headers={"HX-Trigger": "updated, hide_offcanvas"},
-            )
+            if "submit" in request.POST:
+                return HttpResponse(
+                    status=204,
+                    headers={"HX-Trigger": "updated, hide_offcanvas"},
+                )
+            elif "submit_and_another" in request.POST:
+                form = TransactionForm(
+                    initial={
+                        "date": expected_date,
+                        "type": transaction_type,
+                    },
+                )
+                update = True
+            elif "submit_and_similar" in request.POST:
+                initial_data = {}
+
+                # Define fields to copy from the SAVED instance
+                direct_fields_to_copy = [
+                    "account",  # ForeignKey -> will copy the ID
+                    "type",  # ChoiceField -> will copy the value
+                    "is_paid",  # BooleanField -> will copy True/False
+                    "date",  # DateField -> will copy the date object
+                    "reference_date",  # DateField -> will copy the date object
+                    "amount",  # DecimalField -> will copy the decimal
+                    "description",  # CharField -> will copy the string
+                    "notes",  # TextField -> will copy the string
+                    "category",  # ForeignKey -> will copy the ID
+                ]
+                m2m_fields_to_copy = [
+                    "tags",  # ManyToManyField -> will copy list of IDs
+                    "entities",  # ManyToManyField -> will copy list of IDs
+                ]
+
+                # Copy direct fields from the saved instance
+                for field_name in direct_fields_to_copy:
+                    value = getattr(saved_instance, field_name, None)
+                    if value is not None:
+                        # Handle ForeignKey: use the pk
+                        if hasattr(value, "pk"):
+                            initial_data[field_name] = value.pk
+                        # Handle Date/DateTime/Decimal/Boolean/etc.: use the Python object directly
+                        else:
+                            initial_data[field_name] = (
+                                value  # This correctly handles date objects!
+                            )
+
+                # Copy M2M fields: provide a list of related object pks
+                for field_name in m2m_fields_to_copy:
+                    m2m_manager = getattr(saved_instance, field_name)
+                    initial_data[field_name] = list(
+                        m2m_manager.values_list("name", flat=True)
+                    )
+
+                # Create a new form instance pre-filled with the correctly typed initial data
+                form = TransactionForm(initial=initial_data)
+                update = True  # Signal HTMX to update the form area
+
     else:
         form = TransactionForm(
             initial={
@@ -61,11 +116,15 @@ def transaction_add(request):
             },
         )
 
-    return render(
+    response = render(
         request,
         "transactions/fragments/add.html",
         {"form": form},
     )
+    if update:
+        response["HX-Trigger"] = "updated"
+
+    return response
 
 
 @login_required

app/apps/users/forms.py

@@ -2,16 +2,20 @@ from crispy_forms.bootstrap import (
     FormActions,
 )
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Submit
+from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div
 from django import forms
+from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import (
     UsernameField,
     AuthenticationForm,
+    UserCreationForm,
 )
+from django.db import transaction
 from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.crispy.submit import NoClassSubmit
 from apps.users.models import UserSettings
+from apps.common.middleware.thread_local import get_current_user
 
 
 class LoginForm(AuthenticationForm):
@@ -132,3 +136,269 @@ class UserSettingsForm(forms.ModelForm):
                 ),
             ),
         )
+
+        self.fields["language"].help_text = _(
+            "This changes the language (if available) and how numbers and dates are displayed\n"
+            "Consider helping translate WYGIWYH to your language at %(translation_link)s"
+        ) % {
+            "translation_link": '<a href="https://translations.herculino.com" target="_blank">translations.herculino.com</a>'
+        }
+
+
+class UserUpdateForm(forms.ModelForm):
+    new_password1 = forms.CharField(
+        label=_("New Password"),
+        widget=forms.PasswordInput(attrs={"autocomplete": "new-password"}),
+        required=False,
+        help_text=_("Leave blank to keep the current password."),
+    )
+    new_password2 = forms.CharField(
+        label=_("Confirm New Password"),
+        widget=forms.PasswordInput(attrs={"autocomplete": "new-password"}),
+        required=False,
+    )
+
+    class Meta:
+        model = get_user_model()
+        # Add the administrative fields
+        fields = ["first_name", "last_name", "email", "is_active", "is_superuser"]
+        # Help texts can be defined here or directly in the layout/field definition
+        help_texts = {
+            "is_active": _(
+                "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+            ),
+            "is_superuser": _(
+                "Designates that this user has all permissions without explicitly assigning them."
+            ),
+        }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.instance = kwargs.get("instance")  # Store instance for validation/checks
+        self.requesting_user = get_current_user()
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+
+        # Define the layout using Crispy Forms, including the new fields
+        self.helper.layout = Layout(
+            Row(
+                Column("first_name", css_class="form-group col-md-6"),
+                Column("last_name", css_class="form-group col-md-6"),
+                css_class="row",
+            ),
+            Field("email"),
+            # Group password fields (optional visual grouping)
+            Div(
+                Field("new_password1"),
+                Field("new_password2"),
+                css_class="border p-3 rounded mb-3",
+            ),
+            # Group administrative status fields
+            Div(
+                Field("is_active"),
+                Field("is_superuser"),
+                css_class="border p-3 rounded mb-3 text-bg-secondary",  # Example visual separation
+            ),
+        )
+
+        if self.instance and self.instance.pk:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+
+        if (
+            self.requesting_user == self.instance
+            or not self.requesting_user.is_superuser
+        ):
+            self.fields["is_superuser"].disabled = True
+            self.fields["is_active"].disabled = True
+
+    # Keep existing clean methods
+    def clean_email(self):
+        email = self.cleaned_data.get("email")
+        # Use case-insensitive comparison for email uniqueness check
+        if (
+            self.instance
+            and get_user_model()
+            .objects.filter(email__iexact=email)
+            .exclude(pk=self.instance.pk)
+            .exists()
+        ):
+            raise forms.ValidationError(
+                _("This email address is already in use by another account.")
+            )
+        return email
+
+    def clean_new_password2(self):
+        new_password1 = self.cleaned_data.get("new_password1")
+        new_password2 = self.cleaned_data.get("new_password2")
+        if new_password1 and new_password1 != new_password2:
+            raise forms.ValidationError(_("The two password fields didn't match."))
+        if new_password1 and not new_password2:
+            raise forms.ValidationError(_("Please confirm your new password."))
+        if new_password2 and not new_password1:
+            raise forms.ValidationError(_("Please enter the new password first."))
+        return new_password2
+
+    def clean(self):
+        cleaned_data = super().clean()
+        is_active_val = cleaned_data.get("is_active")
+        is_superuser_val = cleaned_data.get("is_superuser")
+
+        # --- Crucial Security Check Example ---
+        # Prevent the requesting user from deactivating or removing superuser status
+        # from their *own* account via this form.
+        if (
+            self.requesting_user
+            and self.instance
+            and self.requesting_user.pk == self.instance.pk
+        ):
+            # Check if 'is_active' field exists and user is trying to set it to False
+            if "is_active" in self.fields and is_active_val is False:
+                self.add_error(
+                    "is_active",
+                    _("You cannot deactivate your own account using this form."),
+                )
+
+            # Check if 'is_superuser' field exists, the user *is* currently a superuser,
+            # and they are trying to set it to False
+            if (
+                "is_superuser" in self.fields
+                and self.instance.is_superuser
+                and is_superuser_val is False
+            ):
+                if get_user_model().objects.filter(is_superuser=True).count() <= 1:
+                    self.add_error(
+                        "is_superuser",
+                        _("Cannot remove status from the last superuser."),
+                    )
+                else:
+                    self.add_error(
+                        "is_superuser",
+                        _(
+                            "You cannot remove your own superuser status using this form."
+                        ),
+                    )
+
+        return cleaned_data
+
+    # Save method remains the same, ModelForm handles boolean fields correctly
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        new_password = self.cleaned_data.get("new_password1")
+        if new_password:
+            user.set_password(new_password)
+
+        if commit:
+            user.save()
+        return user
+
+
+class UserAddForm(UserCreationForm):
+    """
+    A form for administrators to create new users.
+    Includes fields for first name, last name, email, active status,
+    and superuser status. Uses email as the username field.
+    Inherits password handling from UserCreationForm.
+    """
+
+    class Meta(UserCreationForm.Meta):
+        model = get_user_model()
+        # Specify the fields to include. UserCreationForm automatically handles
+        # 'password1' and 'password2'. We replace 'username' with 'email'.
+        fields = ("email", "first_name", "last_name", "is_active", "is_superuser")
+        field_classes = {
+            "email": forms.EmailField
+        }  # Ensure email field uses EmailField validation
+        help_texts = {
+            "is_active": _(
+                "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+            ),
+            "is_superuser": _(
+                "Designates that this user has all permissions without explicitly assigning them."
+            ),
+        }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Set is_active to True by default for new users, can be overridden by admin
+        self.fields["is_active"].initial = True
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+
+        # Define the layout, including password fields from UserCreationForm
+        self.helper.layout = Layout(
+            Field("email"),
+            Row(
+                Column("first_name", css_class="form-group col-md-6"),
+                Column("last_name", css_class="form-group col-md-6"),
+                css_class="row",
+            ),
+            # UserCreationForm provides 'password1' and 'password2' fields
+            Div(
+                Field("password1", autocomplete="new-password"),
+                Field("password2", autocomplete="new-password"),
+                css_class="border p-3 rounded mb-3",
+            ),
+            # Administrative status fields
+            Div(
+                Field("is_active"),
+                Field("is_superuser"),
+                css_class="border p-3 rounded mb-3 text-bg-secondary",
+            ),
+        )
+
+        if self.instance and self.instance.pk:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+
+    def clean_email(self):
+        """Ensure email uniqueness (case-insensitive)."""
+        email = self.cleaned_data.get("email")
+        if email and get_user_model().objects.filter(email__iexact=email).exists():
+            raise forms.ValidationError(
+                _("A user with this email address already exists.")
+            )
+        return email
+
+    @transaction.atomic  # Ensure user creation is atomic
+    def save(self, commit=True):
+        """
+        Save the user instance. UserCreationForm's save handles password hashing.
+        Our Meta class ensures other fields are included.
+        """
+        user = super().save(commit=False)
+
+        if commit:
+            user.save()
+        return user

app/apps/users/migrations/0020_alter_usersettings_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.8 on 2025-04-13 03:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0019_alter_usersettings_language'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='usersettings',
+            name='language',
+            field=models.CharField(choices=[('auto', 'Auto'), ('af', 'Afrikaans'), ('ar', 'العربية'), ('ar-dz', 'العربية (الجزائر)'), ('ast', 'Asturianu'), ('az', 'Azərbaycan'), ('bg', 'Български'), ('be', 'Беларуская'), ('bn', 'বাংলা'), ('br', 'Brezhoneg'), ('bs', 'Bosanski'), ('ca', 'Català'), ('ckb', 'کوردیی ناوەندی'), ('cs', 'Čeština'), ('cy', 'Cymraeg'), ('da', 'Dansk'), ('de', 'Deutsch'), ('dsb', 'Dolnoserbšćina'), ('el', 'Ελληνικά'), ('en', 'English'), ('en-au', 'English (Australia)'), ('en-gb', 'English (UK)'), ('eo', 'Esperanto'), ('es', 'Español'), ('es-ar', 'Español (Argentina)'), ('es-co', 'Español (Colombia)'), ('es-mx', 'Español (México)'), ('es-ni', 'Español (Nicaragua)'), ('es-ve', 'Español (Venezuela)'), ('et', 'Eesti'), ('eu', 'Euskara'), ('fa', 'فارسی'), ('fi', 'Suomi'), ('fr', 'Français'), ('fy', 'Frysk'), ('ga', 'Gaeilge'), ('gd', 'Gàidhlig'), ('gl', 'Galego'), ('he', 'עברית'), ('hi', 'हिन्दी'), ('hr', 'Hrvatski'), ('hsb', 'Hornjoserbšćina'), ('hu', 'Magyar'), ('hy', 'Հայերեն'), ('ia', 'Interlingua'), ('id', 'Bahasa Indonesia'), ('ig', 'Igbo'), ('io', 'Ido'), ('is', 'Íslenska'), ('it', 'Italiano'), ('ja', '日本語'), ('ka', 'ქართული'), ('kab', 'Taqbaylit'), ('kk', 'Қазақша'), ('km', 'ខ្មែរ'), ('kn', 'ಕನ್ನಡ'), ('ko', '한국어'), ('ky', 'Кыргызча'), ('lb', 'Lëtzebuergesch'), ('lt', 'Lietuvių'), ('lv', 'Latviešu'), ('mk', 'Македонски'), ('ml', 'മലയാളം'), ('mn', 'Монгол'), ('mr', 'मराठी'), ('ms', 'Bahasa Melayu'), ('my', 'မြန်မာဘာသာ'), ('nb', 'Norsk (Bokmål)'), ('ne', 'नेपाली'), ('nl', 'Nederlands'), ('nn', 'Norsk (Nynorsk)'), ('os', 'Ирон'), ('pa', 'ਪੰਜਾਬੀ'), ('pl', 'Polski'), ('pt', 'Português'), ('pt-br', 'Português (Brasil)'), ('ro', 'Română'), ('ru', 'Русский'), ('sk', 'Slovenčina'), ('sl', 'Slovenščina'), ('sq', 'Shqip'), ('sr', 'Српски'), ('sr-latn', 'Srpski (Latinica)'), ('sv', 'Svenska'), ('sw', 'Kiswahili'), ('ta', 'தமிழ்'), ('te', 'తెలుగు'), ('tg', 'Тоҷикӣ'), ('th', 'ไทย'), ('tk', 'Türkmençe'), ('tr', 'Türkçe'), ('tt', 'Татарча'), ('udm', 'Удмурт'), ('ug', 'ئۇيغۇرچە'), ('uk', 'Українська'), ('ur', 'اردو'), ('uz', 'Oʻzbekcha'), ('vi', 'Tiếng Việt'), ('zh-hans', '简体中文'), ('zh-hant', '繁體中文')], default='auto', max_length=10, verbose_name='Language'),
+        ),
+    ]

app/apps/users/urls.py

@@ -22,4 +22,24 @@ urlpatterns = [
         views.update_settings,
         name="user_settings",
     ),
+    path(
+        "users/",
+        views.users_index,
+        name="users_index",
+    ),
+    path(
+        "users/list/",
+        views.users_list,
+        name="users_list",
+    ),
+    path(
+        "user/add/",
+        views.user_add,
+        name="user_add",
+    ),
+    path(
+        "user/<int:pk>/edit/",
+        views.user_edit,
+        name="user_edit",
+    ),
 ]

app/apps/users/views.py

@@ -1,20 +1,26 @@
 from django.contrib import messages
-from django.contrib.auth import logout
+from django.contrib.auth import logout, get_user_model
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.views import (
     LoginView,
 )
+from django.core.exceptions import PermissionDenied
 from django.http import HttpResponse
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect, render, get_object_or_404
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from django.views.decorators.http import require_http_methods
 
+from apps.common.decorators.htmx import only_htmx
+from apps.common.decorators.user import is_superuser, htmx_login_required
 from apps.users.forms import (
     LoginForm,
     UserSettingsForm,
+    UserUpdateForm,
+    UserAddForm,
 )
-from apps.common.decorators.htmx import only_htmx
 from apps.users.models import UserSettings
+from apps.common.decorators.demo import disabled_on_demo
 
 
 def logout_view(request):
@@ -22,7 +28,7 @@ def logout_view(request):
     return redirect(reverse("login"))
 
 
-@login_required
+@htmx_login_required
 def index(request):
     if request.user.settings.start_page == UserSettings.StartPage.MONTHLY:
         return redirect(reverse("monthly_index"))
@@ -49,7 +55,7 @@ class UserLoginView(LoginView):
 
 
 @only_htmx
-@login_required
+@htmx_login_required
 def toggle_amount_visibility(request):
     user_settings, created = UserSettings.objects.get_or_create(user=request.user)
     current_hide_amounts = user_settings.hide_amounts
@@ -70,7 +76,7 @@ def toggle_amount_visibility(request):
 
 
 @only_htmx
-@login_required
+@htmx_login_required
 def toggle_sound_playing(request):
     user_settings, created = UserSettings.objects.get_or_create(user=request.user)
     current_mute_sounds = user_settings.mute_sounds
@@ -91,7 +97,7 @@ def toggle_sound_playing(request):
 
 
 @only_htmx
-@login_required
+@htmx_login_required
 def update_settings(request):
     user_settings = request.user.settings
 
@@ -108,3 +114,86 @@ def update_settings(request):
         form = UserSettingsForm(instance=user_settings)
 
     return render(request, "users/fragments/user_settings.html", {"form": form})
+
+
+@htmx_login_required
+@is_superuser
+@require_http_methods(["GET"])
+def users_index(request):
+    return render(
+        request,
+        "users/pages/index.html",
+    )
+
+
+@only_htmx
+@htmx_login_required
+@is_superuser
+@require_http_methods(["GET"])
+def users_list(request):
+    users = get_user_model().objects.all().order_by("id")
+
+    return render(
+        request,
+        "users/fragments/list.html",
+        {"users": users},
+    )
+
+
+@only_htmx
+@htmx_login_required
+@is_superuser
+@require_http_methods(["GET", "POST"])
+def user_add(request):
+    if request.method == "POST":
+        form = UserAddForm(request.POST)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item added successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = UserAddForm()
+
+    return render(
+        request,
+        "users/fragments/add.html",
+        {"form": form},
+    )
+
+
+@only_htmx
+@htmx_login_required
+@disabled_on_demo
+@require_http_methods(["GET", "POST"])
+def user_edit(request, pk):
+    user = get_object_or_404(get_user_model(), id=pk)
+
+    if not request.user.is_superuser and user != request.user:
+        raise PermissionDenied
+
+    if request.method == "POST":
+        form = UserUpdateForm(request.POST, instance=user)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item updated successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = UserUpdateForm(instance=user)
+
+    return render(
+        request,
+        "users/fragments/edit.html",
+        {"form": form, "user": user},
+    )

app/templates/cotton/ui/help_icon.html

@@ -1,7 +1,8 @@
 {% spaceless %}
+{% load i18n %}
 <span class="tw-text-xs text-white-50 mx-1"
       data-bs-toggle="tooltip"
       data-bs-title="{{ content }}">
-  <i class="fa-solid fa-circle-question fa-fw"></i>
+  <i class="{% if not icon %}fa-solid fa-circle-question{% else %}{{ icon }}{% endif %} fa-fw"></i>
 </span>
 {% endspaceless %}

app/templates/cotton/ui/info_card.html

@@ -3,7 +3,7 @@
     {% if icon %}<i class="{{ icon }}"></i>{% else %}<span class="fw-bold">{{ title.0 }}</span>{% endif %}
   </div>
   <div class="card-body">
-    <h5 class="tw-text-{{ color }}-400 fw-bold tw-mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}{% include 'includes/help_icon.html' with content=help_text %}{% endif %}</h5>
+    <h5 class="tw-text-{{ color }}-400 fw-bold tw-mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}<c-ui.help-icon :content="help_text" icon=""></c-ui.help-icon>{% endif %}</h5>
     {{ slot }}
   </div>
 </div>

app/templates/cotton/ui/percentage_distribution.html

@@ -1,27 +1,27 @@
 {% load i18n %}
 <div class="progress-stacked">
-  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_projected|floatformat:0 }}%">
+  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_projected|floatformat:"2u" }}%">
     <div class="progress-bar progress-bar-striped !tw-bg-green-300"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)">
     </div>
   </div>
-  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Income' %} ({{ percentage.percentages.income_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_current|floatformat:0 }}%">
+  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Income' %} ({{ percentage.percentages.income_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_current|floatformat:"2u" }}%">
     <div class="progress-bar !tw-bg-green-400"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Current Income' %} ({{ p.percentages.income_current|floatformat:2 }}%)">
     </div>
   </div>
-  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_projected|floatformat:0 }}%">
+  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_projected|floatformat:"2u" }}%">
     <div class="progress-bar progress-bar-striped !tw-bg-red-300"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)">
     </div>
   </div>
-  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_current|floatformat:0 }}%">
+  <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_current|floatformat:"2u" }}%">
     <div class="progress-bar !tw-bg-red-400"
          data-bs-toggle="tooltip"
          data-bs-placement="top"

app/templates/includes/navbar.html

@@ -94,7 +94,7 @@
           </ul>
         </li>
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index' %}"
+          <a class="nav-link dropdown-toggle {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' %}"
              href="#" role="button"
              data-bs-toggle="dropdown"
              aria-expanded="false">
@@ -138,9 +138,13 @@
             {% endif %}
             <li><a class="dropdown-item {% active_link views='automatic_exchange_rates_index' %}"
                    href="{% url 'automatic_exchange_rates_index' %}">{% translate 'Automatic Exchange Rates' %}</a></li>
+            {% if user.is_superuser %}
             <li>
               <hr class="dropdown-divider">
             </li>
+            <li><h6 class="dropdown-header">{% trans 'Admin' %}</h6></li>
+            <li><a class="dropdown-item {% active_link views='users_index' %}"
+                    href="{% url 'users_index' %}">{% translate 'Users' %}</a></li>
             <li>
               <a class="dropdown-item"
                  href="{% url 'admin:index' %}"
@@ -151,6 +155,7 @@
                 {% translate 'Django Admin' %}
               </a>
             </li>
+            {% endif %}
           </ul>
         </li>
       </ul>

app/templates/includes/navbar/user_menu.html

@@ -12,6 +12,11 @@
            hx-target="#generic-offcanvas"
            role="button">
       <i class="fa-solid fa-gear me-2 fa-fw"></i>{% translate 'Settings' %}</a></li>
+    <li><a class="dropdown-item"
+           hx-get="{% url 'user_edit' pk=request.user.id %}"
+           hx-target="#generic-offcanvas"
+           role="button">
+      <i class="fa-solid fa-user me-2 fa-fw"></i>{% translate 'Edit profile' %}</a></li>
     <li><hr class="dropdown-divider"></li>
     {% spaceless %}
     <li>

app/templates/insights/fragments/category_overview/index.html

@@ -1,68 +1,431 @@
 {% load i18n %}
 
-<div hx-get="{% url 'category_overview' %}" hx-trigger="updated from:window" class="show-loading" hx-swap="outerHTML" hx-include="#picker-form, #picker-type">
-  {% if total_table %}
-  <div class="table-responsive">
-    <table class="table table-striped table-hover">
-      <thead>
-      <tr>
-        <th scope="col">{% trans 'Category' %}</th>
-        <th scope="col">{% trans 'Income' %}</th>
-        <th scope="col">{% trans 'Expense' %}</th>
-        <th scope="col">{% trans 'Total' %}</th>
-      </tr>
-      </thead>
-      <tbody>
-      {% for category in total_table.values %}
-        <tr>
-          <th>{% if category.name %}{{ category.name }}{% else %}{% trans 'Uncategorized' %}{% endif %}</th>
-          <td>
-            {% for currency in category.currencies.values %}
-              {% if currency.total_income != 0 %}
-              <c-amount.display
-                  :amount="currency.total_income"
-                  :prefix="currency.currency.prefix"
-                  :suffix="currency.currency.suffix"
-                  :decimal_places="currency.currency.decimal_places"
-                  color="green"></c-amount.display>
-              {% else %}
-                <div>-</div>
-              {% endif %}
-            {% endfor %}
-          </td>
-          <td>
-            {% for currency in category.currencies.values %}
-              {% if currency.total_expense != 0 %}
-              <c-amount.display
-                  :amount="currency.total_expense"
-                  :prefix="currency.currency.prefix"
-                  :suffix="currency.currency.suffix"
-                  :decimal_places="currency.currency.decimal_places"
-                  color="red"></c-amount.display>
-              {% else %}
-                <div>-</div>
-              {% endif %}
-            {% endfor %}
-          </td>
-          <td>
-            {% for currency in category.currencies.values %}
-              {% if currency.total_final != 0 %}
-              <c-amount.display
-                  :amount="currency.total_final"
-                  :prefix="currency.currency.prefix"
-                  :suffix="currency.currency.suffix"
-                  :decimal_places="currency.currency.decimal_places"
-                  color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
-              {% else %}
-                <div>-</div>
-              {% endif %}
-            {% endfor %}
-          </td>
-        </tr>
-      {% endfor %}
-      </tbody>
-    </table>
+<div hx-get="{% url 'category_overview' %}" hx-trigger="updated from:window" class="show-loading" hx-swap="outerHTML"
+     hx-include="#picker-form, #picker-type, #view-type, #show-tags, #showing">
+  <div class="h-100 text-center mb-4">
+    <div class="btn-group gap-3" role="group" id="view-type" _="on change trigger updated">
+      <input type="radio" class="btn-check"
+             name="view_type"
+             id="table-view"
+             autocomplete="off"
+             value="table"
+             {% if view_type == "table" %}checked{% endif %}>
+      <label class="btn btn-outline-primary rounded-5" for="table-view"><i
+          class="fa-solid fa-table fa-fw me-2"></i>{% trans 'Table' %}</label>
+
+      <input type="radio"
+             class="btn-check"
+             name="view_type"
+             id="bars-view"
+             autocomplete="off"
+             value="bars"
+             {% if view_type == "bars" %}checked{% endif %}>
+      <label class="btn btn-outline-primary rounded-5" for="bars-view"><i
+          class="fa-solid fa-chart-bar fa-fw me-2"></i>{% trans 'Bars' %}</label>
+    </div>
   </div>
+  <div class="mt-3 mb-1 d-flex flex-column flex-md-row justify-content-between">
+    <div class="form-check form-switch" id="show-tags">
+      {% if view_type == 'table' %}
+        <input type="hidden" name="show_tags" value="off">
+        <input class="form-check-input" type="checkbox" role="switch" id="show-tags-switch" name="show_tags"
+               _="on change trigger updated" {% if show_tags %}checked{% endif %}>
+        {% spaceless %}
+          <label class="form-check-label" for="show-tags-switch">
+            {% trans 'Tags' %}
+          </label>
+          <c-ui.help-icon
+              content="{% trans 'Transaction amounts associated with multiple tags will be counted once for each tag' %}"
+              icon="fa-solid fa-circle-exclamation"></c-ui.help-icon>
+        {% endspaceless %}
+      {% endif %}
+    </div>
+    <div class="btn-group btn-group-sm" role="group" id="showing" _="on change trigger updated">
+      <input type="radio" class="btn-check" name="showing" id="showing-projected" autocomplete="off"
+             value="projected" {% if showing == 'projected' %}checked{% endif %}>
+      <label class="btn btn-outline-primary" for="showing-projected">{% trans "Projected" %}</label>
+
+      <input type="radio" class="btn-check" name="showing" id="showing-current" autocomplete="off" value="current"
+             {% if showing == 'current' %}checked{% endif %}>
+      <label class="btn btn-outline-primary" for="showing-current">{% trans "Current" %}</label>
+
+      <input type="radio" class="btn-check" name="showing" id="showing-final" autocomplete="off" value="final"
+             {% if showing == 'final' %}checked{% endif %}>
+      <label class="btn btn-outline-primary" for="showing-final">{% trans "Final total" %}</label>
+    </div>
+  </div>
+  {% if total_table %}
+    {% if view_type == "table" %}
+      <div class="table-responsive">
+        <table class="table table-striped table-hover table-bordered align-middle">
+          <thead>
+          <tr>
+            <th scope="col">{% trans 'Category' %}</th>
+            <th scope="col">{% trans 'Income' %}</th>
+            <th scope="col">{% trans 'Expense' %}</th>
+            <th scope="col">{% trans 'Total' %}</th>
+          </tr>
+          </thead>
+          <tbody class="table-group-divider">
+          {% for category in total_table.values %}
+            <!-- Category row -->
+            <tr class="table-group-header">
+              <th>{% if category.name %}{{ category.name }}{% else %}{% trans 'Uncategorized' %}{% endif %}</th>
+              <td> {# income #}
+                {% for currency in category.currencies.values %}
+                  {% if showing == 'current' and currency.income_current != 0 %}
+                    <c-amount.display
+                        :amount="currency.income_current"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="green"></c-amount.display>
+                  {% elif showing == 'projected' and currency.income_projected != 0 %}
+                    <c-amount.display
+                        :amount="currency.income_projected"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="green"></c-amount.display>
+                  {% elif showing == 'final' and currency.total_income != 0 %}
+                    <c-amount.display
+                        :amount="currency.total_income"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="green"></c-amount.display>
+                  {% else %}
+                    <div>-</div>
+                  {% endif %}
+                {% endfor %}
+              </td>
+              <td>  {# expenses #}
+                {% for currency in category.currencies.values %}
+                  {% if showing == 'current' and currency.expense_current != 0 %}
+                    <c-amount.display
+                        :amount="currency.expense_current"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="red"></c-amount.display>
+                  {% elif showing == 'projected' and currency.expense_projected != 0 %}
+                    <c-amount.display
+                        :amount="currency.expense_projected"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="red"></c-amount.display>
+                  {% elif showing == 'final' and currency.total_expense != 0 %}
+                    <c-amount.display
+                        :amount="currency.total_expense"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="red"></c-amount.display>
+                  {% else %}
+                    <div>-</div>
+                  {% endif %}
+                {% endfor %}
+              </td>
+              <td>  {# total #}
+                {% for currency in category.currencies.values %}
+                  {% if showing == 'current' and currency.total_current != 0 %}
+                    <c-amount.display
+                        :amount="currency.total_current"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                  {% elif showing == 'projected' and currency.total_projected != 0 %}
+                    <c-amount.display
+                        :amount="currency.total_projected"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                  {% elif showing == 'final' and currency.total_final != 0 %}
+                    <c-amount.display
+                        :amount="currency.total_final"
+                        :prefix="currency.currency.prefix"
+                        :suffix="currency.currency.suffix"
+                        :decimal_places="currency.currency.decimal_places"
+                        color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                  {% else %}
+                    <div>-</div>
+                  {% endif %}
+                {% endfor %}
+              </td>
+            </tr>
+
+            <!-- Tag rows -->
+            {% if show_tags %}
+              {% for tag_id, tag in category.tags.items %}
+                {% if tag.name or not tag.name and category.tags.values|length > 1 %}
+                  <tr class="table-row-nested">
+                    <td class="ps-4">
+                      <i class="fa-solid fa-hashtag fa-fw me-2 text-muted"></i>{% if tag.name %}{{ tag.name }}{% else %}{% trans 'Untagged' %}{% endif %}
+                    </td>
+                    <td>
+                      {% for currency in tag.currencies.values %}
+                        {% if showing == 'current' and currency.income_current != 0 %}
+                          <c-amount.display
+                              :amount="currency.income_current"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="green"></c-amount.display>
+                        {% elif showing == 'projected' and currency.income_projected != 0 %}
+                          <c-amount.display
+                              :amount="currency.income_projected"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="green"></c-amount.display>
+                        {% elif showing == 'final' and currency.total_income != 0 %}
+                          <c-amount.display
+                              :amount="currency.total_income"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="green"></c-amount.display>
+                        {% else %}
+                          <div>-</div>
+                        {% endif %}
+                      {% endfor %}
+                    </td>
+                    <td>
+                      {% for currency in tag.currencies.values %}
+                        {% if showing == 'current' and currency.expense_current != 0 %}
+                          <c-amount.display
+                              :amount="currency.expense_current"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="red"></c-amount.display>
+                        {% elif showing == 'projected' and currency.expense_projected != 0 %}
+                          <c-amount.display
+                              :amount="currency.expense_projected"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="red"></c-amount.display>
+                        {% elif showing == 'final' and currency.total_expense != 0 %}
+                          <c-amount.display
+                              :amount="currency.total_expense"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="red"></c-amount.display>
+                        {% else %}
+                          <div>-</div>
+                        {% endif %}
+                      {% endfor %}
+                    </td>
+                    <td>
+                      {% for currency in tag.currencies.values %}
+                        {% if showing == 'current' and currency.total_current != 0 %}
+                          <c-amount.display
+                              :amount="currency.total_current"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                        {% elif showing == 'projected' and currency.total_projected != 0 %}
+                          <c-amount.display
+                              :amount="currency.total_projected"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                        {% elif showing == 'final' and currency.total_final != 0 %}
+                          <c-amount.display
+                              :amount="currency.total_final"
+                              :prefix="currency.currency.prefix"
+                              :suffix="currency.currency.suffix"
+                              :decimal_places="currency.currency.decimal_places"
+                              color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
+                        {% else %}
+                          <div>-</div>
+                        {% endif %}
+                      {% endfor %}
+                    </td>
+                  </tr>
+                {% endif %}
+              {% endfor %}
+            {% endif %}
+          {% endfor %}
+          </tbody>
+        </table>
+      </div>
+
+
+    {% elif view_type == "bars" %}
+      <div>
+        <div class="chart-container" _="init call setupChart() end" style="position: relative; height:78vh; width:100%">
+          <canvas id="categoryChart"></canvas>
+        </div>
+      </div>
+
+      {{ total_table|json_script:"categoryOverviewData" }}
+      {{ showing|json_script:"showingString" }}
+
+      <script>
+          function setupChart() {
+              var rawData = JSON.parse(document.getElementById('categoryOverviewData').textContent);
+              var showing_string = JSON.parse(document.getElementById('showingString').textContent);
+              console.log(showing_string)
+
+              // --- Dynamic Data Processing ---
+              var categories = [];
+              var currencyDetails = {}; // Stores details like { BRL: {code: 'BRL', name: 'Real', ...}, ... }
+              var currencyData = {};    // Stores data arrays like { BRL: [val1, null, val3,...], ... }
+
+              // Pass 1: Collect categories and currency details
+              Object.values(rawData).forEach(cat => {
+                  var categoryName = cat.name === null ? "{% trans 'Uncategorized' %}" : cat.name;
+                  if (!categories.includes(categoryName)) {
+                      categories.push(categoryName);
+                  }
+                  if (cat.currencies) {
+                      Object.values(cat.currencies).forEach(curr => {
+                          var details = curr.currency;
+                          if (details && details.code && !currencyDetails[details.code]) {
+                              var decimals = parseInt(details.decimal_places, 10);
+                              currencyDetails[details.code] = {
+                                  code: details.code,
+                                  name: details.name || details.code,
+                                  prefix: details.prefix || '',
+                                  suffix: details.suffix || '',
+                                  // Ensure decimal_places is a non-negative integer
+                                  decimal_places: !isNaN(decimals) && decimals >= 0 ? decimals : 2
+                              };
+                          }
+                      });
+                  }
+              });
+
+              // Initialize data structure for each currency with nulls
+              Object.keys(currencyDetails).forEach(code => {
+                  currencyData[code] = new Array(categories.length).fill(null);
+              });
+
+              // Pass 2: Populate data arrays (store all valid numbers now)
+              Object.values(rawData).forEach(cat => {
+                  var categoryName = cat.name === null ? "{% trans 'Uncategorized' %}" : cat.name;
+                  var catIndex = categories.indexOf(categoryName);
+                  if (catIndex === -1) return;
+
+                  if (cat.currencies) {
+                      Object.values(cat.currencies).forEach(curr => {
+                          var code = curr.currency?.code;
+                          if (code && currencyData[code]) {
+                              if (showing_string == 'current') {
+                                  var value = parseFloat(curr.total_current);
+                              } else if (showing_string == 'projected') {
+                                  var value = parseFloat(curr.total_projected);
+                              } else {
+                                  var value = parseFloat(curr.total_final);
+                              }
+
+                              // Store the number if it's valid, otherwise keep null
+                              currencyData[code][catIndex] = !isNaN(value) ? value : null;
+                          }
+                      });
+                  }
+              });
+
+              // --- Dynamic Chart Configuration ---
+              var datasets = Object.keys(currencyDetails).map((code, index) => {
+                  return {
+                      label: currencyDetails[code].name, // Use currency name for the legend label
+                      data: currencyData[code],
+                      currencyCode: code, // Store code for easy lookup in tooltip
+                      borderWidth: 1
+                  };
+              });
+
+              new Chart(document.getElementById('categoryChart'),
+                  {
+                      type: 'bar',
+                      data: {
+                          labels: categories,
+                          datasets: datasets
+                      },
+                      options: {
+                          indexAxis: 'y',
+                          responsive: true,
+                          interaction: {
+                              intersect: false,
+                              mode: 'nearest',
+                              axis: "y"
+                          },
+                          maintainAspectRatio: false,
+                          plugins: {
+                              title: {
+                                  display: false
+                              },
+                              tooltip: {
+                                  callbacks: {
+                                      label: function (context) {
+                                          const dataset = context.dataset;
+                                          const currencyCode = dataset.currencyCode;
+                                          const details = currencyDetails[currencyCode];
+                                          const value = context.parsed.x; // Use 'x' because indexAxis is 'y'
+
+                                          if (value === null || value === undefined || !details) {
+                                              // Display the category name if the value is null/undefined
+                                              return null;
+                                          }
+
+                                          let formattedValue = '';
+                                          try {
+                                              // Use Intl.NumberFormat for ALL values, configured with locale and exact decimal places
+                                              formattedValue = new Intl.NumberFormat(undefined, {
+                                                  minimumFractionDigits: details.decimal_places,
+                                                  maximumFractionDigits: details.decimal_places,
+                                                  // Do NOT use style: 'currency' here, as we add prefix/suffix manually
+                                              }).format(value);
+                                          } catch (e) {
+                                              formattedValue = value.toFixed(details.decimal_places);
+                                          }
+
+                                          // Return label with currency name and formatted value including prefix/suffix
+                                          return `${details.prefix}${formattedValue}${details.suffix}`;
+                                      }
+                                  }
+                              },
+                              legend: {
+                                  position: 'top',
+                              }
+                          },
+                          scales: {
+                              x: {
+                                  stacked: true,
+                                  type: 'linear',
+                                  title: {
+                                      display: true,
+                                      text: '{% trans 'Final Total' %}'
+                                  },
+                                  ticks: {
+                                      // Format ticks using the detected locale
+                                      callback: function (value, index, ticks) {
+                                          return value.toLocaleString();
+                                      }
+                                  }
+                              },
+                              y: {
+                                  stacked: true,
+                                  title: {
+                                      display: false,
+                                      text: '{% trans 'Category' %}'
+                                  }
+                              }
+                          }
+                      }
+                  });
+          }
+      </script>
+    {% endif %}
   {% else %}
     <c-msg.empty title="{% translate "No categories" %}"></c-msg.empty>
   {% endif %}

app/templates/insights/pages/index.html

@@ -2,6 +2,8 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
+{% block title %}{% translate 'Insights' %}{% endblock %}
+
 {% block content %}
   <div class="container-fluid">
     <div class="row my-3 h-100">

app/templates/users/fragments/add.html

@@ -0,0 +1,11 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Add user' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'user_add' %}" hx-target="#generic-offcanvas" novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}

app/templates/users/fragments/edit.html

@@ -0,0 +1,11 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Edit user' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'user_edit' pk=user.id %}" hx-target="#generic-offcanvas" novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}

app/templates/users/fragments/list.html

@@ -0,0 +1,85 @@
+{% load hijack %}
+{% load i18n %}
+<div class="container px-md-3 py-3 column-gap-5">
+  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+    {% spaceless %}
+      <div>{% translate 'Users' %}<span>
+      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+         role="button"
+         data-bs-toggle="tooltip"
+         data-bs-title="{% translate "Add" %}"
+         hx-get="{% url 'user_add' %}"
+         hx-target="#generic-offcanvas">
+            <i class="fa-solid fa-circle-plus fa-fw"></i></a>
+    </span></div>
+    {% endspaceless %}
+  </div>
+
+  <div class="card">
+    <div class="card-body">
+      <div id="tags-table">
+        {% if users %}
+          <div class="table-responsive">
+            <c-config.search></c-config.search>
+            <table class="table table-hover">
+              <thead>
+              <tr>
+                <th scope="col" class="col-auto"></th>
+                <th scope="col" class="col">{% translate 'Active' %}</th>
+                <th scope="col" class="col">{% translate 'Name' %}</th>
+                <th scope="col" class="col">{% translate 'Email' %}</th>
+                <th scope="col" class="col">{% translate 'Superuser' %}</th>
+              </tr>
+              </thead>
+              <tbody>
+              {% for user in users %}
+                <tr class="tag">
+                  <td class="col-auto">
+                    <div class="btn-group" role="group" aria-label="{% translate 'Actions' %}">
+                      <a class="btn btn-secondary btn-sm"
+                         role="button"
+                         hx-swap="innerHTML"
+                         data-bs-toggle="tooltip"
+                         data-bs-title="{% translate "Edit" %}"
+                         hx-get="{% url 'user_edit' pk=user.id %}"
+                         hx-target="#generic-offcanvas">
+                        <i class="fa-solid fa-pencil fa-fw"></i></a>
+                      {% if request.user|can_hijack:user and request.user != user %}
+                        <a class="btn btn-info btn-sm"
+                           role="button"
+                           data-bs-toggle="tooltip"
+                           data-bs-title="{% translate "Impersonate" %}"
+                           hx-post="{% url 'hijack:acquire' %}"
+                           hx-vals='{"user_pk":"{{user.id}}"}'
+                           hx-swap="none"
+                           _="on htmx:afterRequest(event) from me
+                               if event.detail.successful
+                                 go to url '/'">
+                          <i class="fa-solid fa-mask fa-fw"></i></a>
+                      {% endif %}
+                    </div>
+                  </td>
+                  <td class="col">
+                    {% if user.is_active %}
+                      <i class="fa-solid fa-solid fa-check text-success"></i>
+                    {% endif %}
+                  </td>
+                  <td class="col">{{ user.first_name }} {{ user.last_name }}</td>
+                  <td class="col">{{ user.email }}</td>
+                  <td class="col">
+                    {% if user.is_superuser %}
+                      <i class="fa-solid fa-solid fa-check text-success"></i>
+                    {% endif %}
+                  </td>
+                </tr>
+              {% endfor %}
+              </tbody>
+            </table>
+          </div>
+        {% else %}
+          <c-msg.empty title="{% translate "No users" %}" remove-padding></c-msg.empty>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>

app/templates/users/pages/index.html

@@ -0,0 +1,8 @@
+{% extends "layouts/base.html" %}
+{% load i18n %}
+
+{% block title %}{% translate 'Users' %}{% endblock %}
+
+{% block content %}
+<div hx-get="{% url 'users_list' %}" hx-trigger="load, updated from:window" class="show-loading"></div>
+{% endblock %}

frontend/src/application/select.js

@@ -6,6 +6,7 @@ window.TomSelect = function createDynamicTomSelect(element) {
     // Basic configuration
     const config = {
         plugins: {},
+        maxOptions: null,
 
         // Extract 'create' option from data attribute
         create: element.dataset.create === 'true',

requirements.txt

@@ -1,32 +1,32 @@
 Django~=5.1
-psycopg[binary]==3.2.3
-python-webpack-boilerplate==1.0.3
+psycopg[binary]==3.2.6
+python-webpack-boilerplate==1.0.4
 django-crispy-forms==2.3
-crispy-bootstrap5==2024.10
-django-browser-reload==1.12.1
-django-hijack==3.4.5
-django-filter==24.3
-django-debug-toolbar==4.3.0
-django-cachalot~=2.6.3
-django-cotton~=1.2.1
+crispy-bootstrap5==2025.4
+django-browser-reload==1.18.0
+django-hijack==3.7.1
+django-filter==25.1
+django-debug-toolbar==4.4.6
+django-cachalot~=2.7.0
+django-cotton~=1.5.2
 django-pwa~=2.0.1
-djangorestframework~=3.15.2
-drf-spectacular~=0.27.2
-django-import-export~=4.3.5
+djangorestframework~=3.16.0
+drf-spectacular~=0.28.0
+django-import-export~=4.3.7
 
 gunicorn==23.0.0
-whitenoise[brotli]==6.6.0
+whitenoise[brotli]==6.9.0
 
 watchfiles==0.24.0  # https://github.com/samuelcolvin/watchfiles
-procrastinate[django]~=2.14
+procrastinate[django]~=2.15.1
 
 requests~=2.32.3
 
-pytz~=2024.2
+pytz
 python-dateutil~=2.9.0.post0
-simpleeval~=1.0.0
-pydantic~=2.10.5
+simpleeval~=1.0.3
+pydantic~=2.11.3
 PyYAML~=6.0.2
-mistune~=3.1.1
-openpyxl~=3.1
-xlrd~=2.0
+mistune~=3.1.3
+openpyxl~=3.1.5
+xlrd~=2.0.1