Merge pull request #27

fix(transactions:action-bar): min and max calculations take into account if value is income or expense

.github/workflows/release.yml

@@ -5,7 +5,6 @@ on:
     types: [created]
 
 env:
-  REGISTRY: ghcr.io
   IMAGE_NAME: wygiwyh
 
 jobs:
@@ -13,20 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: write
-      attestations: write
-      id-token: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
+      - name: Log in to Docker Hub
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -34,14 +29,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
       - name: Build and push image
         uses: docker/build-push-action@v6
         with:
@@ -50,13 +37,8 @@ jobs:
           push: true
           provenance: false
           tags: |
-            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

app/apps/accounts/forms.py

@@ -53,6 +53,7 @@ class AccountGroupForm(forms.ModelForm):
 
 class AccountForm(forms.ModelForm):
     group = DynamicModelChoiceField(
+        create_field="name",
         label=_("Group"),
         model=AccountGroup,
         required=False,
@@ -112,6 +113,7 @@ class AccountBalanceForm(forms.Form):
         max_digits=42, decimal_places=30, required=False, label=_("New balance")
     )
     category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),

app/apps/api/fields/transactions.py

@@ -1,6 +1,7 @@
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
+from django.utils.translation import gettext_lazy as _
 
 from apps.transactions.models import (
     TransactionCategory,
@@ -25,13 +26,13 @@ class TransactionCategoryField(serializers.Field):
                 return TransactionCategory.objects.get(pk=data)
             except TransactionCategory.DoesNotExist:
                 raise serializers.ValidationError(
-                    "Category with this ID does not exist."
+                    _("Category with this ID does not exist.")
                 )
         elif isinstance(data, str):
             category, created = TransactionCategory.objects.get_or_create(name=data)
             return category
         raise serializers.ValidationError(
-            "Invalid category data. Provide an ID or name."
+            _("Invalid category data. Provide an ID or name.")
         )
 
     @staticmethod
@@ -61,13 +62,13 @@ class TransactionTagField(serializers.Field):
                     tag = TransactionTag.objects.get(pk=item)
                 except TransactionTag.DoesNotExist:
                     raise serializers.ValidationError(
-                        f"Tag with ID {item} does not exist."
+                        _("Tag with this ID does not exist.")
                     )
             elif isinstance(item, str):
                 tag, created = TransactionTag.objects.get_or_create(name=item)
             else:
                 raise serializers.ValidationError(
-                    "Invalid tag data. Provide an ID or name."
+                    _("Invalid tag data. Provide an ID or name.")
                 )
             tags.append(tag)
         return tags
@@ -85,13 +86,13 @@ class TransactionEntityField(serializers.Field):
                     entity = TransactionEntity.objects.get(pk=item)
                 except TransactionTag.DoesNotExist:
                     raise serializers.ValidationError(
-                        f"Entity with ID {item} does not exist."
+                        _("Entity with this ID does not exist.")
                     )
             elif isinstance(item, str):
                 entity, created = TransactionEntity.objects.get_or_create(name=item)
             else:
                 raise serializers.ValidationError(
-                    "Invalid entity data. Provide an ID or name."
+                    _("Invalid entity data. Provide an ID or name.")
                 )
             entities.append(entity)
         return entities

app/apps/api/serializers/__init__.py

@@ -1,3 +1,4 @@
 from .transactions import *
 from .accounts import *
 from .currencies import *
+from .dca import *

app/apps/api/serializers/accounts.py

@@ -1,4 +1,5 @@
 from rest_framework import serializers
+from rest_framework.permissions import IsAuthenticated
 
 from apps.api.serializers.currencies import CurrencySerializer
 from apps.accounts.models import AccountGroup, Account
@@ -6,6 +7,8 @@ from apps.currencies.models import Currency
 
 
 class AccountGroupSerializer(serializers.ModelSerializer):
+    permission_classes = [IsAuthenticated]
+
     class Meta:
         model = AccountGroup
         fields = "__all__"
@@ -31,6 +34,8 @@ class AccountSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
+    permission_classes = [IsAuthenticated]
+
     class Meta:
         model = Account
         fields = [

app/apps/api/serializers/currencies.py

@@ -1,8 +1,12 @@
 from rest_framework import serializers
+from rest_framework.permissions import IsAuthenticated
+
 from apps.currencies.models import Currency, ExchangeRate
 
 
 class CurrencySerializer(serializers.ModelSerializer):
+    permission_classes = [IsAuthenticated]
+
     class Meta:
         model = Currency
         fields = "__all__"
@@ -24,6 +28,8 @@ class ExchangeRateSerializer(serializers.ModelSerializer):
         queryset=Currency.objects.all(), source="to_currency", write_only=True
     )
 
+    permission_classes = [IsAuthenticated]
+
     class Meta:
         model = ExchangeRate
         fields = "__all__"

app/apps/api/serializers/dca.py

@@ -0,0 +1,85 @@
+from rest_framework import serializers
+from rest_framework.permissions import IsAuthenticated
+
+from apps.dca.models import DCAEntry, DCAStrategy
+
+
+class DCAEntrySerializer(serializers.ModelSerializer):
+    profit_loss = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    profit_loss_percentage = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    current_value = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    entry_price = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+
+    permission_classes = [IsAuthenticated]
+
+    class Meta:
+        model = DCAEntry
+        fields = [
+            "id",
+            "strategy",
+            "date",
+            "amount_paid",
+            "amount_received",
+            "notes",
+            "created_at",
+            "updated_at",
+            "profit_loss",
+            "profit_loss_percentage",
+            "current_value",
+            "entry_price",
+        ]
+        read_only_fields = ["created_at", "updated_at"]
+
+
+class DCAStrategySerializer(serializers.ModelSerializer):
+    entries = DCAEntrySerializer(many=True, read_only=True)
+    total_invested = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    total_received = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    average_entry_price = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    total_entries = serializers.IntegerField(read_only=True)
+    current_total_value = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    total_profit_loss = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+    total_profit_loss_percentage = serializers.DecimalField(
+        max_digits=42, decimal_places=30, read_only=True
+    )
+
+    permission_classes = [IsAuthenticated]
+
+    class Meta:
+        model = DCAStrategy
+        fields = [
+            "id",
+            "name",
+            "target_currency",
+            "payment_currency",
+            "notes",
+            "created_at",
+            "updated_at",
+            "entries",
+            "total_invested",
+            "total_received",
+            "average_entry_price",
+            "total_entries",
+            "current_total_value",
+            "total_profit_loss",
+            "total_profit_loss_percentage",
+        ]
+        read_only_fields = ["created_at", "updated_at"]

app/apps/api/serializers/transactions.py

@@ -19,6 +19,7 @@ from apps.transactions.models import (
     TransactionTag,
     InstallmentPlan,
     TransactionEntity,
+    RecurringTransaction,
 )
 
 
@@ -47,11 +48,77 @@ class TransactionEntitySerializer(serializers.ModelSerializer):
 
 
 class InstallmentPlanSerializer(serializers.ModelSerializer):
+    category = TransactionCategoryField(required=False)
+    tags = TransactionTagField(required=False)
+    entities = TransactionEntityField(required=False)
+
     permission_classes = [IsAuthenticated]
 
     class Meta:
         model = InstallmentPlan
-        fields = "__all__"
+        fields = [
+            "id",
+            "account",
+            "type",
+            "description",
+            "number_of_installments",
+            "installment_start",
+            "installment_total_number",
+            "start_date",
+            "reference_date",
+            "end_date",
+            "recurrence",
+            "installment_amount",
+            "category",
+            "tags",
+            "entities",
+            "notes",
+        ]
+        read_only_fields = ["installment_total_number", "end_date"]
+
+    def create(self, validated_data):
+        instance = super().create(validated_data)
+        instance.create_transactions()
+        return instance
+
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        instance.update_transactions()
+        return instance
+
+
+class RecurringTransactionSerializer(serializers.ModelSerializer):
+    category = TransactionCategoryField(required=False)
+    tags = TransactionTagField(required=False)
+    entities = TransactionEntityField(required=False)
+
+    class Meta:
+        model = RecurringTransaction
+        fields = [
+            "id",
+            "is_paused",
+            "account",
+            "type",
+            "amount",
+            "description",
+            "category",
+            "tags",
+            "entities",
+            "notes",
+            "reference_date",
+            "start_date",
+            "end_date",
+            "recurrence_type",
+            "recurrence_interval",
+            "last_generated_date",
+            "last_generated_reference_date",
+        ]
+        read_only_fields = ["last_generated_date", "last_generated_reference_date"]
+
+    def create(self, validated_data):
+        instance = super().create(validated_data)
+        instance.create_upcoming_transactions()
+        return instance
 
 
 class TransactionSerializer(serializers.ModelSerializer):

app/apps/api/urls.py

@@ -9,10 +9,13 @@ router.register(r"categories", views.TransactionCategoryViewSet)
 router.register(r"tags", views.TransactionTagViewSet)
 router.register(r"entities", views.TransactionEntityViewSet)
 router.register(r"installment-plans", views.InstallmentPlanViewSet)
+router.register(r"recurring-transactions", views.RecurringTransactionViewSet)
 router.register(r"account-groups", views.AccountGroupViewSet)
 router.register(r"accounts", views.AccountViewSet)
 router.register(r"currencies", views.CurrencyViewSet)
 router.register(r"exchange-rates", views.ExchangeRateViewSet)
+router.register(r"dca/strategies", views.DCAStrategyViewSet)
+router.register(r"dca/entries", views.DCAEntryViewSet)
 
 urlpatterns = [
     path("", include(router.urls)),

app/apps/api/views/__init__.py

@@ -1,3 +1,4 @@
 from .transactions import *
 from .accounts import *
 from .currencies import *
+from .dca import *

app/apps/api/views/dca.py

@@ -0,0 +1,41 @@
+from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from apps.dca.models import DCAStrategy, DCAEntry
+from apps.api.serializers import DCAStrategySerializer, DCAEntrySerializer
+
+
+class DCAStrategyViewSet(viewsets.ModelViewSet):
+    queryset = DCAStrategy.objects.all()
+    serializer_class = DCAStrategySerializer
+
+    @action(detail=True, methods=["get"])
+    def investment_frequency(self, request, pk=None):
+        strategy = self.get_object()
+        return Response(strategy.investment_frequency_data())
+
+    @action(detail=True, methods=["get"])
+    def price_comparison(self, request, pk=None):
+        strategy = self.get_object()
+        return Response(strategy.price_comparison_data())
+
+    @action(detail=True, methods=["get"])
+    def current_price(self, request, pk=None):
+        strategy = self.get_object()
+        price_data = strategy.current_price()
+        if price_data:
+            price, date = price_data
+            return Response({"price": price, "date": date})
+        return Response({"price": None, "date": None})
+
+
+class DCAEntryViewSet(viewsets.ModelViewSet):
+    queryset = DCAEntry.objects.all()
+    serializer_class = DCAEntrySerializer
+
+    def get_queryset(self):
+        queryset = DCAEntry.objects.all()
+        strategy_id = self.request.query_params.get("strategy", None)
+        if strategy_id is not None:
+            queryset = queryset.filter(strategy_id=strategy_id)
+        return queryset

app/apps/api/views/transactions.py

@@ -1,4 +1,4 @@
-from rest_framework import permissions, viewsets
+from rest_framework import viewsets
 
 from apps.api.serializers import (
     TransactionSerializer,
@@ -6,6 +6,7 @@ from apps.api.serializers import (
     TransactionTagSerializer,
     InstallmentPlanSerializer,
     TransactionEntitySerializer,
+    RecurringTransactionSerializer,
 )
 from apps.transactions.models import (
     Transaction,
@@ -13,6 +14,7 @@ from apps.transactions.models import (
     TransactionTag,
     InstallmentPlan,
     TransactionEntity,
+    RecurringTransaction,
 )
 from apps.rules.signals import transaction_updated, transaction_created
 
@@ -53,10 +55,7 @@ class InstallmentPlanViewSet(viewsets.ModelViewSet):
     queryset = InstallmentPlan.objects.all()
     serializer_class = InstallmentPlanSerializer
 
-    def perform_create(self, serializer):
-        instance = serializer.save()
-        instance.create_transactions()
 
-    def perform_update(self, serializer):
-        instance = serializer.save()
-        instance.create_transactions()
+class RecurringTransactionViewSet(viewsets.ModelViewSet):
+    queryset = RecurringTransaction.objects.all()
+    serializer_class = RecurringTransactionSerializer

app/apps/common/fields/forms/dynamic_select.py

@@ -1,6 +1,7 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db import transaction
+from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.tom_select import TomSelect, TomSelectMultiple
 
@@ -8,6 +9,12 @@ from apps.common.widgets.tom_select import TomSelect, TomSelectMultiple
 class DynamicModelChoiceField(forms.ModelChoiceField):
     def __init__(self, model, *args, **kwargs):
         self.model = model
+        self.to_field_name = kwargs.pop("to_field_name", "pk")
+
+        self.create_field = kwargs.pop("create_field", None)
+        if not self.create_field:
+            raise ValueError("The 'create_field' parameter is required.")
+
         self.queryset = kwargs.pop("queryset", model.objects.all())
         super().__init__(queryset=self.queryset, *args, **kwargs)
         self._created_instance = None
@@ -18,8 +25,7 @@ class DynamicModelChoiceField(forms.ModelChoiceField):
         if value in self.empty_values:
             return None
         try:
-            key = self.to_field_name or "pk"
-            return self.model.objects.get(**{key: value})
+            return self.model.objects.get(**{self.to_field_name: value})
         except (ValueError, TypeError, self.model.DoesNotExist):
             return value  # Return the raw value; we'll handle creation in clean()
 
@@ -49,10 +55,13 @@ class DynamicModelChoiceField(forms.ModelChoiceField):
             except self.model.DoesNotExist:
                 try:
                     with transaction.atomic():
-                        instance = self.model.objects.create(name=value)
+                        instance, _ = self.model.objects.update_or_create(
+                            **{self.create_field: value}
+                        )
                         self._created_instance = instance
                         return instance
                 except Exception as e:
+                    print(e)
                     raise ValidationError(
                         self.error_messages["invalid_choice"], code="invalid_choice"
                     )
@@ -111,12 +120,12 @@ class DynamicModelMultipleChoiceField(forms.ModelMultipleChoiceField):
         """
         try:
             with transaction.atomic():
-                new_instance = self.queryset.model(**{self.create_field: value})
-                new_instance.full_clean()
-                new_instance.save()
-            return new_instance
+                instance, _ = self.model.objects.update_or_create(
+                    **{self.create_field: value}
+                )
+            return instance
         except Exception as e:
-            raise ValidationError(f"Error creating new instance: {str(e)}")
+            raise ValidationError(_("Error creating new instance"))
 
     def clean(self, value):
         """
@@ -152,6 +161,6 @@ class DynamicModelMultipleChoiceField(forms.ModelMultipleChoiceField):
             try:
                 new_objects.append(self._create_new_instance(new_value))
             except ValidationError as e:
-                raise ValidationError(f"Error creating '{new_value}': {str(e)}")
+                raise ValidationError(_("Error creating new instance"))
 
         return existing_objects + new_objects

app/apps/common/fields/month_year.py

@@ -18,7 +18,7 @@ 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.")
+            raise ValidationError(_("Invalid date format. Use YYYY-MM."))
 
     def formfield(self, **kwargs):
         kwargs["widget"] = MonthYearWidget

app/apps/transactions/forms.py

@@ -8,6 +8,7 @@ from crispy_forms.layout import (
     Field,
 )
 from django import forms
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from apps.accounts.models import Account
@@ -32,9 +33,11 @@ from apps.rules.signals import transaction_created, transaction_updated
 
 class TransactionForm(forms.ModelForm):
     category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
     )
     tags = DynamicModelMultipleChoiceField(
         model=TransactionTag,
@@ -42,6 +45,7 @@ class TransactionForm(forms.ModelForm):
         create_field="name",
         required=False,
         label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
     )
     entities = DynamicModelMultipleChoiceField(
         model=TransactionEntity,
@@ -81,6 +85,24 @@ class TransactionForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        # if editing a transaction display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(transactions=self.instance.id)
+            ).distinct()
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            ).distinct()
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            ).distinct()
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(transactions=self.instance.id)
+            ).distinct()
+
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"
@@ -181,14 +203,18 @@ class TransferForm(forms.Form):
     )
 
     from_category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
     )
     to_category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
     )
 
     from_tags = DynamicModelMultipleChoiceField(
@@ -197,6 +223,7 @@ class TransferForm(forms.Form):
         create_field="name",
         required=False,
         label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
     )
     to_tags = DynamicModelMultipleChoiceField(
         model=TransactionTag,
@@ -204,6 +231,7 @@ class TransferForm(forms.Form):
         create_field="name",
         required=False,
         label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
     )
 
     date = forms.DateField(
@@ -299,7 +327,7 @@ class TransferForm(forms.Form):
         to_account = cleaned_data.get("to_account")
 
         if from_account == to_account:
-            raise forms.ValidationError("From and To accounts must be different.")
+            raise forms.ValidationError(_("From and To accounts must be different."))
 
         return cleaned_data
 
@@ -358,11 +386,14 @@ class InstallmentPlanForm(forms.ModelForm):
         create_field="name",
         required=False,
         label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
     )
     category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
     )
     entities = DynamicModelMultipleChoiceField(
         model=TransactionEntity,
@@ -370,6 +401,7 @@ class InstallmentPlanForm(forms.ModelForm):
         create_field="name",
         required=False,
         label=_("Entities"),
+        queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
     reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
@@ -401,6 +433,24 @@ class InstallmentPlanForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        # if editing display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(installmentplan=self.instance.id)
+            ).distinct()
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(installmentplan=self.instance.id)
+            ).distinct()
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(installmentplan=self.instance.id)
+            ).distinct()
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(installmentplan=self.instance.id)
+            ).distinct()
+
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"
@@ -470,7 +520,7 @@ class InstallmentPlanForm(forms.ModelForm):
 class TransactionTagForm(forms.ModelForm):
     class Meta:
         model = TransactionTag
-        fields = ["name"]
+        fields = ["name", "active"]
         labels = {"name": _("Tag name")}
 
     def __init__(self, *args, **kwargs):
@@ -479,7 +529,7 @@ class TransactionTagForm(forms.ModelForm):
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"
-        self.helper.layout = Layout(Field("name", css_class="mb-3"))
+        self.helper.layout = Layout(Field("name", css_class="mb-3"), Switch("active"))
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(
@@ -502,7 +552,7 @@ class TransactionTagForm(forms.ModelForm):
 class TransactionEntityForm(forms.ModelForm):
     class Meta:
         model = TransactionEntity
-        fields = ["name"]
+        fields = ["name", "active"]
         labels = {"name": _("Entity name")}
 
     def __init__(self, *args, **kwargs):
@@ -511,7 +561,7 @@ class TransactionEntityForm(forms.ModelForm):
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"
-        self.helper.layout = Layout(Field("name", css_class="mb-3"))
+        self.helper.layout = Layout(Field("name"), Switch("active"))
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(
@@ -534,7 +584,7 @@ class TransactionEntityForm(forms.ModelForm):
 class TransactionCategoryForm(forms.ModelForm):
     class Meta:
         model = TransactionCategory
-        fields = ["name", "mute"]
+        fields = ["name", "mute", "active"]
         labels = {"name": _("Category name")}
         help_texts = {
             "mute": _("Muted categories won't count towards your monthly total")
@@ -546,7 +596,7 @@ class TransactionCategoryForm(forms.ModelForm):
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"
-        self.helper.layout = Layout(Field("name", css_class="mb-3"), Switch("mute"))
+        self.helper.layout = Layout(Field("name"), Switch("mute"), Switch("active"))
 
         if self.instance and self.instance.pk:
             self.helper.layout.append(
@@ -578,11 +628,14 @@ class RecurringTransactionForm(forms.ModelForm):
         create_field="name",
         required=False,
         label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
     )
     category = DynamicModelChoiceField(
+        create_field="name",
         model=TransactionCategory,
         required=False,
         label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
     )
     entities = DynamicModelMultipleChoiceField(
         model=TransactionEntity,
@@ -590,6 +643,7 @@ class RecurringTransactionForm(forms.ModelForm):
         create_field="name",
         required=False,
         label=_("Entities"),
+        queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
     reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
@@ -624,6 +678,25 @@ class RecurringTransactionForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+
+        # if editing display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(recurringtransaction=self.instance.id)
+            ).distinct()
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(recurringtransaction=self.instance.id)
+            ).distinct()
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(recurringtransaction=self.instance.id)
+            ).distinct()
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(recurringtransaction=self.instance.id)
+            ).distinct()
+
         self.helper = FormHelper()
         self.helper.form_method = "post"
         self.helper.form_tag = False

app/apps/transactions/migrations/0025_transactioncategory_active_transactiontag_active.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.3 on 2025-01-04 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0024_installmentplan_entities_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transactioncategory',
+            name='active',
+            field=models.BooleanField(default=True, help_text="Deactivated categories won't be able to be selected when creating new transactions", verbose_name='Active'),
+        ),
+        migrations.AddField(
+            model_name='transactiontag',
+            name='active',
+            field=models.BooleanField(default=True, help_text="Deactivated tags won't be able to be selected when creating new transactions", verbose_name='Active'),
+        ),
+    ]

app/apps/transactions/migrations/0026_transactionentity_active.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2025-01-04 19:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0025_transactioncategory_active_transactiontag_active'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transactionentity',
+            name='active',
+            field=models.BooleanField(default=True, help_text="Deactivated entities won't be able to be selected when creating new transactions", verbose_name='Active'),
+        ),
+    ]

app/apps/transactions/models.py

@@ -18,6 +18,13 @@ logger = logging.getLogger()
 class TransactionCategory(models.Model):
     name = models.CharField(max_length=255, verbose_name=_("Name"), unique=True)
     mute = models.BooleanField(default=False, verbose_name=_("Mute"))
+    active = models.BooleanField(
+        default=True,
+        verbose_name=_("Active"),
+        help_text=_(
+            "Deactivated categories won't be able to be selected when creating new transactions"
+        ),
+    )
 
     class Meta:
         verbose_name = _("Transaction Category")
@@ -30,6 +37,13 @@ class TransactionCategory(models.Model):
 
 class TransactionTag(models.Model):
     name = models.CharField(max_length=255, verbose_name=_("Name"), unique=True)
+    active = models.BooleanField(
+        default=True,
+        verbose_name=_("Active"),
+        help_text=_(
+            "Deactivated tags won't be able to be selected when creating new transactions"
+        ),
+    )
 
     class Meta:
         verbose_name = _("Transaction Tags")
@@ -42,8 +56,13 @@ class TransactionTag(models.Model):
 
 class TransactionEntity(models.Model):
     name = models.CharField(max_length=255, verbose_name=_("Name"))
-
-    # Add any other fields you might want for entities
+    active = models.BooleanField(
+        default=True,
+        verbose_name=_("Active"),
+        help_text=_(
+            "Deactivated entities won't be able to be selected when creating new transactions"
+        ),
+    )
 
     class Meta:
         verbose_name = _("Entity")

app/apps/transactions/urls.py

@@ -53,6 +53,8 @@ urlpatterns = [
     ),
     path("tags/", views.tags_index, name="tags_index"),
     path("tags/list/", views.tags_list, name="tags_list"),
+    path("tags/table/active/", views.tags_table_active, name="tags_table_active"),
+    path("tags/table/archived/", views.tags_table_archived, name="tags_table_archived"),
     path("tags/add/", views.tag_add, name="tag_add"),
     path(
         "tags/<int:tag_id>/edit/",
@@ -66,6 +68,16 @@ urlpatterns = [
     ),
     path("entities/", views.entities_index, name="entities_index"),
     path("entities/list/", views.entities_list, name="entities_list"),
+    path(
+        "entities/table/active/",
+        views.entities_table_active,
+        name="entities_table_active",
+    ),
+    path(
+        "entities/table/archived/",
+        views.entities_table_archived,
+        name="entities_table_archived",
+    ),
     path("entities/add/", views.entity_add, name="entity_add"),
     path(
         "entities/<int:entity_id>/edit/",
@@ -79,6 +91,16 @@ urlpatterns = [
     ),
     path("categories/", views.categories_index, name="categories_index"),
     path("categories/list/", views.categories_list, name="categories_list"),
+    path(
+        "categories/table/active/",
+        views.categories_table_active,
+        name="categories_table_active",
+    ),
+    path(
+        "categories/table/archived/",
+        views.categories_table_archived,
+        name="categories_table_archived",
+    ),
     path("categories/add/", views.category_add, name="category_add"),
     path(
         "categories/<int:category_id>/edit/",

app/apps/transactions/views/categories.py

@@ -25,11 +25,33 @@ def categories_index(request):
 @login_required
 @require_http_methods(["GET"])
 def categories_list(request):
-    categories = TransactionCategory.objects.all().order_by("id")
     return render(
         request,
         "categories/fragments/list.html",
-        {"categories": categories},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def categories_table_active(request):
+    categories = TransactionCategory.objects.filter(active=True).order_by("id")
+    return render(
+        request,
+        "categories/fragments/table.html",
+        {"categories": categories, "active": True},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def categories_table_archived(request):
+    categories = TransactionCategory.objects.filter(active=False).order_by("id")
+    return render(
+        request,
+        "categories/fragments/table.html",
+        {"categories": categories, "active": False},
     )
 
 

app/apps/transactions/views/entities.py

@@ -24,11 +24,33 @@ def entities_index(request):
 @login_required
 @require_http_methods(["GET"])
 def entities_list(request):
-    entities = TransactionEntity.objects.all().order_by("id")
     return render(
         request,
         "entities/fragments/list.html",
-        {"entities": entities},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def entities_table_active(request):
+    entities = TransactionEntity.objects.filter(active=True).order_by("id")
+    return render(
+        request,
+        "entities/fragments/table.html",
+        {"entities": entities, "active": True},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def entities_table_archived(request):
+    entities = TransactionEntity.objects.filter(active=False).order_by("id")
+    return render(
+        request,
+        "entities/fragments/table.html",
+        {"entities": entities, "active": False},
     )
 
 

app/apps/transactions/views/tags.py

@@ -24,11 +24,33 @@ def tags_index(request):
 @login_required
 @require_http_methods(["GET"])
 def tags_list(request):
-    tags = TransactionTag.objects.all().order_by("id")
     return render(
         request,
         "tags/fragments/list.html",
-        {"tags": tags},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def tags_table_active(request):
+    tags = TransactionTag.objects.filter(active=True).order_by("id")
+    return render(
+        request,
+        "tags/fragments/table.html",
+        {"tags": tags, "active": True},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def tags_table_archived(request):
+    tags = TransactionTag.objects.filter(active=False).order_by("id")
+    return render(
+        request,
+        "tags/fragments/table.html",
+        {"tags": tags, "active": False},
     )
 
 

app/templates/categories/fragments/list.html

@@ -15,53 +15,18 @@
   </div>
 
   <div class="card">
-    <div class="card-body table-responsive">
-      {% if categories %}
-      <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 'Name' %}</th>
-            <th scope="col" class="col">{% translate 'Muted' %}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for category in categories %}
-          <tr class="category">
-            <td class="col-auto text-center">
-              <div class="btn-group" role="group" aria-label="{% translate 'Actions' %}">
-                <a class="btn btn-secondary btn-sm"
-                      role="button"
-                      data-bs-toggle="tooltip"
-                      data-bs-title="{% translate "Edit" %}"
-                      hx-get="{% url 'category_edit' category_id=category.id %}"
-                      hx-target="#generic-offcanvas">
-                  <i class="fa-solid fa-pencil fa-fw"></i></a>
-                <a class="btn btn-secondary btn-sm text-danger"
-                        role="button"
-                        data-bs-toggle="tooltip"
-                        data-bs-title="{% translate "Delete" %}"
-                        hx-delete="{% url 'category_delete' category_id=category.id %}"
-                        hx-trigger='confirmed'
-                        data-bypass-on-ctrl="true"
-                        data-title="{% translate "Are you sure?" %}"
-                        data-text="{% translate "You won't be able to revert this!" %}"
-                        data-confirm-text="{% translate "Yes, delete it!" %}"
-                        _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
-              </div>
-            </td>
-            <td class="col">{{ category.name }}</td>
-            <td class="col">
-              {% if category.mute %}<i class="fa-solid fa-check text-success"></i>{% endif %}
-            </td>
-          </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-      {% else %}
-      <c-msg.empty title="{% translate "No categories" %}" remove-padding></c-msg.empty>
-      {% endif %}
+    <div class="card-header">
+      <ul class="nav nav-pills card-header-pills" id="myTab" role="tablist">
+        <li class="nav-item" role="presentation">
+          <button class="nav-link active" data-bs-toggle="tab" type="button" role="tab" aria-selected="true" hx-get="{% url 'categories_table_active' %}" hx-trigger="load, click" hx-target="#categories-table">{% translate 'Active' %}</button>
+        </li>
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" hx-get="{% url 'categories_table_archived' %}" hx-target="#categories-table" data-bs-toggle="tab" type="button" role="tab" aria-selected="false">{% translate 'Archived' %}</button>
+        </li>
+      </ul>
+    </div>
+    <div class="card-body">
+      <div id="categories-table"></div>
     </div>
   </div>
 </div>

app/templates/categories/fragments/table.html

@@ -0,0 +1,59 @@
+{% load i18n %}
+{% if active %}
+  <div class="show-loading" hx-get="{% url 'categories_table_active' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% else %}
+  <div class="show-loading" hx-get="{% url 'categories_table_archived' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% endif %}
+  {% if categories %}
+  <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 'Name' %}</th>
+        <th scope="col" class="col">{% translate 'Muted' %}</th>
+      </tr>
+      </thead>
+      <tbody>
+      {% for category in categories %}
+        <tr class="category">
+          <td class="col-auto text-center">
+            <div class="btn-group" role="group" aria-label="{% translate 'Actions' %}">
+              <a class="btn btn-secondary btn-sm"
+                 role="button"
+                 data-bs-toggle="tooltip"
+                 hx-swap="innerHTML"
+                 data-bs-title="{% translate "Edit" %}"
+                 hx-get="{% url 'category_edit' category_id=category.id %}"
+                 hx-target="#generic-offcanvas">
+                <i class="fa-solid fa-pencil fa-fw"></i></a>
+              <a class="btn btn-secondary btn-sm text-danger"
+                 role="button"
+                 data-bs-toggle="tooltip"
+                 data-bs-title="{% translate "Delete" %}"
+                 hx-delete="{% url 'category_delete' category_id=category.id %}"
+                 hx-trigger='confirmed'
+                 hx-swap="innerHTML"
+                 data-bypass-on-ctrl="true"
+                 data-title="{% translate "Are you sure?" %}"
+                 data-text="{% translate "You won't be able to revert this!" %}"
+                 data-confirm-text="{% translate "Yes, delete it!" %}"
+                 _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
+            </div>
+          </td>
+          <td class="col">{{ category.name }}</td>
+          <td class="col">
+            {% if category.mute %}<i class="fa-solid fa-check text-success"></i>{% endif %}
+          </td>
+        </tr>
+      {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  {% else %}
+    <c-msg.empty title="{% translate "No categories" %}" remove-padding></c-msg.empty>
+  {% endif %}
+</div>

app/templates/categories/pages/index.html

@@ -4,5 +4,5 @@
 {% block title %}{% translate 'Categories' %}{% endblock %}
 
 {% block content %}
-<div hx-get="{% url 'categories_list' %}" hx-trigger="load, updated from:window" class="show-loading"></div>
+<div hx-get="{% url 'categories_list' %}" hx-trigger="load" class="show-loading"></div>
 {% endblock %}

app/templates/cotton/transaction/item.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="transaction d-flex my-1">
+<div class="transaction d-flex my-1 {% if transaction.type == "EX" %}expense{% else %}income{% endif %}">
   {% if not disable_selection %}
   <label class="px-3 d-flex align-items-center justify-content-center">
     <input class="form-check-input" type="checkbox" name="transactions" value="{{ transaction.id }}" id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>

app/templates/cotton/ui/transactions_action_bar.html

@@ -11,70 +11,227 @@
   <div class="card slide-in-left">
     <div class="card-body p-2">
       {% spaceless %}
-      <div class="btn-group" role="group">
+        <div class="btn-group" role="group">
+          <button class="btn btn-secondary btn-sm"
+                  data-bs-toggle="tooltip"
+                  data-bs-title="{% translate 'Select All' %}"
+                  _="on click set <#transactions-list input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
+            <i class="fa-regular fa-square-check tw-text-green-400"></i>
+          </button>
+          <button class="btn btn-secondary btn-sm"
+                  data-bs-toggle="tooltip"
+                  data-bs-title="{% translate 'Unselect All' %}"
+                  _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
+            <i class="fa-regular fa-square tw-text-red-400"></i>
+          </button>
+        </div>
+        <div class="vr mx-3 tw-align-middle"></div>
+        <div class="btn-group me-3" role="group">
+          <button class="btn btn-secondary btn-sm"
+                  hx-get="{% url 'transactions_bulk_pay' %}"
+                  hx-include=".transaction"
+                  data-bs-toggle="tooltip"
+                  data-bs-title="{% translate 'Mark as paid' %}">
+            <i class="fa-regular fa-circle-check tw-text-green-400"></i>
+          </button>
+          <button class="btn btn-secondary btn-sm"
+                  hx-get="{% url 'transactions_bulk_unpay' %}"
+                  hx-include=".transaction"
+                  data-bs-toggle="tooltip"
+                  data-bs-title="{% translate 'Mark as unpaid' %}">
+            <i class="fa-regular fa-circle tw-text-red-400"></i>
+          </button>
+        </div>
         <button class="btn btn-secondary btn-sm"
-                data-bs-toggle="tooltip"
-                data-bs-title="{% translate 'Select All' %}"
-                _="on click set <#transactions-list input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
-          <i class="fa-regular fa-square-check tw-text-green-400"></i>
-        </button>
-        <button class="btn btn-secondary btn-sm"
-                data-bs-toggle="tooltip"
-                data-bs-title="{% translate 'Unselect All' %}"
-                _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
-          <i class="fa-regular fa-square tw-text-red-400"></i>
-        </button>
-      </div>
-      <div class="vr mx-3 tw-align-middle"></div>
-      <div class="btn-group me-3" role="group">
-        <button class="btn btn-secondary btn-sm"
-              hx-get="{% url 'transactions_bulk_pay' %}"
-              hx-include=".transaction"
-              data-bs-toggle="tooltip"
-              data-bs-title="{% translate 'Mark as paid' %}">
-        <i class="fa-regular fa-circle-check tw-text-green-400"></i>
-        </button>
-        <button class="btn btn-secondary btn-sm"
-                hx-get="{% url 'transactions_bulk_unpay' %}"
+                hx-get="{% url 'transactions_bulk_delete' %}"
                 hx-include=".transaction"
+                hx-trigger="confirmed"
                 data-bs-toggle="tooltip"
-                data-bs-title="{% translate 'Mark as unpaid' %}">
-          <i class="fa-regular fa-circle tw-text-red-400"></i>
+                data-bs-title="{% translate 'Delete' %}"
+                data-bypass-on-ctrl="true"
+                data-title="{% translate "Are you sure?" %}"
+                data-text="{% translate "You won't be able to revert this!" %}"
+                data-confirm-text="{% translate "Yes, delete them!" %}"
+                _="install prompt_swal">
+          <i class="fa-solid fa-trash text-danger"></i>
         </button>
-      </div>
-      <button class="btn btn-secondary btn-sm"
-              hx-get="{% url 'transactions_bulk_delete' %}"
-              hx-include=".transaction"
-              hx-trigger="confirmed"
-              data-bs-toggle="tooltip"
-              data-bs-title="{% translate 'Delete' %}"
-              data-bypass-on-ctrl="true"
-              data-title="{% translate "Are you sure?" %}"
-              data-text="{% translate "You won't be able to revert this!" %}"
-              data-confirm-text="{% translate "Yes, delete them!" %}"
-              _="install prompt_swal">
-        <i class="fa-solid fa-trash text-danger"></i>
-      </button>
-      <div class="vr mx-3 tw-align-middle"></div>
-      <span _="on selected_transactions_updated from #actions-bar
-                set total to 0.0
-                for amt in <.transaction:has(input[name='transactions']:checked) .main-amount .amount/>
-                  set amountValue to parseFloat(amt.getAttribute('data-amount'))
-                  if not isNaN(amountValue)
-                    set total to total + (amountValue * 100)
+        <div class="vr mx-3 tw-align-middle"></div>
+        <div class="btn-group"
+              _="on selected_transactions_updated from #actions-bar
+                  set realTotal to 0.0
+                  set flatTotal to 0.0
+                  set transactions to <.transaction:has(input[name='transactions']:checked)/>
+                  set flatAmountValues to []
+                  set realAmountValues to []
+
+                  for transaction in transactions
+                    set amt to first <.main-amount .amount/> in transaction
+                    set amountValue to parseFloat(amt.getAttribute('data-amount'))
+                    append amountValue to flatAmountValues
+
+                    if not isNaN(amountValue)
+                      set flatTotal to flatTotal + (amountValue * 100)
+
+                      if transaction match .income
+                        append amountValue to realAmountValues
+                        set realTotal to realTotal + (amountValue * 100)
+                      else
+                        append -amountValue to realAmountValues
+                        set realTotal to realTotal - (amountValue * 100)
+                      end
+                    end
                   end
-                end
-                set total to total / 100
-                put total.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into me
-              end
-              on click
-                set original_value to my innerText
-                writeText(my innerText) on navigator.clipboard
-                put '{% translate "copied!" %}' into me
-                wait 1s
-                put original_value into me
-              end"
-            class="" role="button"></span>
+
+                  set realTotal to realTotal / 100
+                  set flatTotal to flatTotal / 100
+                  
+                  put realTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #real-total-front's innerText
+                  put realTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-real-total's innerText
+                  put flatTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-flat-total's innerText
+                  put Math.max.apply(Math, realAmountValues).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-max's innerText
+                  put Math.min.apply(Math, realAmountValues).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-min's innerText
+                  put (flatTotal / flatAmountValues.length).toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-mean's innerText
+                  put flatAmountValues.length.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-count's innerText
+                end"
+        >
+          <button class="btn btn-secondary btn-sm" _="on click
+                      set original_value to #real-total-front's innerText
+                      writeText(original_value) on navigator.clipboard
+                      put '{% translate "copied!" %}' into #real-total-front's innerText
+                      wait 1s
+                      put original_value into #real-total-front's innerText
+                    end">
+            <i class="fa-solid fa-plus fa-fw me-2 text-primary"></i>
+            <span id="real-total-front">0</span>
+          </button>
+          <button type="button" class="btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split"
+                  data-bs-toggle="dropdown" aria-expanded="false" data-bs-auto-close="outside">
+            <span class="visually-hidden">{% trans "Toggle Dropdown" %}</span>
+          </button>
+
+          <ul class="dropdown-menu">
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Flat Total" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-flat-total"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Real Total" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-real-total"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Mean" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-mean"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Max" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-max"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Min" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-min"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li>
+              <div class="dropdown-item-text p-0">
+                <div>
+                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                    {% trans "Count" %}
+                  </div>
+                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                       id="calc-menu-count"
+                       _="on click
+                            set original_value to my innerText
+                            writeText(my innerText) on navigator.clipboard
+                            put '{% translate "copied!" %}' into me
+                            wait 1s
+                            put original_value into me
+                          end">
+                    0
+                  </div>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </div>
       {% endspaceless %}
     </div>
   </div>

app/templates/entities/fragments/list.html

@@ -15,49 +15,18 @@
   </div>
 
   <div class="card">
-    <div class="card-body table-responsive">
-      {% if entities %}
-        <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 'Name' %}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for entity in entities %}
-            <tr class="entity">
-              <td class="col-auto">
-                <div class="btn-group" role="group" aria-label="{% translate 'Actions' %}">
-                  <a class="btn btn-secondary btn-sm"
-                        role="button"
-                        data-bs-toggle="tooltip"
-                        data-bs-title="{% translate "Edit" %}"
-                        hx-get="{% url 'entity_edit' entity_id=entity.id %}"
-                        hx-target="#generic-offcanvas">
-                    <i class="fa-solid fa-pencil fa-fw"></i></a>
-                  <a class="btn btn-secondary btn-sm text-danger"
-                          role="button"
-                          data-bs-toggle="tooltip"
-                          data-bs-title="{% translate "Delete" %}"
-                          hx-delete="{% url 'entity_delete' entity_id=entity.id %}"
-                          hx-trigger='confirmed'
-                          data-bypass-on-ctrl="true"
-                          data-title="{% translate "Are you sure?" %}"
-                          data-text="{% translate "You won't be able to revert this!" %}"
-                          data-confirm-text="{% translate "Yes, delete it!" %}"
-                          _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
-                </div>
-              </td>
-              <td class="col">{{ entity.name }}</td>
-            </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-        {% else %}
-        <c-msg.empty title="{% translate "No entities" %}" remove-padding></c-msg.empty>
-        {% endif %}
+    <div class="card-header">
+      <ul class="nav nav-pills card-header-pills" id="myTab" role="tablist">
+        <li class="nav-item" role="presentation">
+          <button class="nav-link active" data-bs-toggle="tab" type="button" role="tab" aria-selected="true" hx-get="{% url 'entities_table_active' %}" hx-trigger="load, click" hx-target="#entities-table">{% translate 'Active' %}</button>
+        </li>
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" hx-get="{% url 'entities_table_archived' %}" hx-target="#entities-table" data-bs-toggle="tab" type="button" role="tab" aria-selected="false">{% translate 'Archived' %}</button>
+        </li>
+      </ul>
+    </div>
+    <div class="card-body">
+      <div id="entities-table"></div>
     </div>
   </div>
 </div>

app/templates/entities/fragments/table.html

@@ -0,0 +1,55 @@
+{% load i18n %}
+{% if active %}
+  <div class="show-loading" hx-get="{% url 'entities_table_active' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% else %}
+  <div class="show-loading" hx-get="{% url 'entities_table_archived' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% endif %}
+    {% if entities %}
+    <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 'Name' %}</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entity in entities %}
+          <tr class="entity">
+            <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 'entity_edit' entity_id=entity.id %}"
+                   hx-target="#generic-offcanvas">
+                  <i class="fa-solid fa-pencil fa-fw"></i></a>
+                <a class="btn btn-secondary btn-sm text-danger"
+                   role="button"
+                   hx-swap="innerHTML"
+                   data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Delete" %}"
+                   hx-delete="{% url 'entity_delete' entity_id=entity.id %}"
+                   hx-trigger='confirmed'
+                   data-bypass-on-ctrl="true"
+                   data-title="{% translate "Are you sure?" %}"
+                   data-text="{% translate "You won't be able to revert this!" %}"
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
+              </div>
+            </td>
+            <td class="col">{{ entity.name }}</td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+    </div>
+    {% else %}
+      <c-msg.empty title="{% translate "No entities" %}" remove-padding></c-msg.empty>
+    {% endif %}
+</div>

app/templates/entities/pages/index.html

@@ -4,5 +4,5 @@
 {% block title %}{% translate 'Entities' %}{% endblock %}
 
 {% block content %}
-<div hx-get="{% url 'entities_list' %}" hx-trigger="load, updated from:window" class="show-loading"></div>
+<div hx-get="{% url 'entities_list' %}" hx-trigger="load" class="show-loading"></div>
 {% endblock %}

app/templates/mini_tools/currency_converter/currency_converter.html

@@ -13,7 +13,7 @@
       <div>{% translate 'Currency Converter' %}</div>
     </div>
     <div class="row">
-      <div class="col-5">
+      <div class="col-12 col-lg-5">
         <div>
           <input class="form-control form-control-lg mb-3"
                  type="text"
@@ -25,13 +25,14 @@
         </div>
         <div>{{ form.from_currency|as_crispy_field }}</div>
       </div>
-      <div class="col text-primary tw-flex tw-items-center tw-justify-center">
+      <div class="col text-primary tw-flex tw-items-center tw-justify-center my-3 my-lg-0">
         <i class="fa-solid fa-equals"></i>
       </div>
-      <div class="col-5">
+      <div class="col-12 col-lg-5">
         <div hx-get="{% url 'currency_converter_convert' %}"
-             hx-trigger="input from:#from_value, input from:#id_from_currency, input from:#id_to_currency"
-             hx-include="#from_value, #id_from_currency, #id_to_currency">
+             hx-trigger="input from:#from_value, input from:#id_from_currency, input from:#id_to_currency, updated"
+             hx-include="#from_value, #id_from_currency, #id_to_currency"
+             id="result">
           <input class="form-control form-control-lg mb-3"
                  type="text"
                  name="to_value"
@@ -41,5 +42,19 @@
         <div>{{ form.to_currency|as_crispy_field }}</div>
       </div>
     </div>
+    <div class="row">
+      <div class="tw-cursor-pointer text-primary text-end" 
+           _="on click
+                set from_value to #id_from_currency's value
+                set to_value to #id_to_currency's value
+                set #id_from_currency's value to to_value
+                set #id_to_currency's value to from_value
+                call #id_from_currency.tomselect.sync()
+                call #id_to_currency.tomselect.sync()
+                trigger updated on #result
+              end">
+        <i class="fa-solid fa-rotate me-2"></i><span>{% trans 'Invert' %}</span>
+      </div>
+    </div>
   </div>
 {% endblock %}

app/templates/net_worth/net_worth.html

@@ -9,7 +9,7 @@
 {% block title %}{% if type == "current" %}{% translate 'Current Net Worth' %}{% else %}{% translate 'Projected Net Worth' %}{% endif %}{% endblock %}
 
 {% block content %}
-  <div class="container px-md-3 py-3">
+  <div class="container px-md-3 py-3" _="on load call initializeAccountChart() then initializeCurrencyChart()">
     <div class="row gx-xl-4 gy-3 mb-4">
       <div class="col-12 col-xl-5">
         <div class="row row-cols-1 g-4">
@@ -52,7 +52,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relativo tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
           <canvas id="currencyBalanceChart"></canvas>
         </div>
       </div>
@@ -136,7 +136,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relativo tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
           <canvas id="accountBalanceChart"></canvas>
         </div>
       </div>
@@ -144,13 +144,19 @@
   </div>
 
   <script>
-      document.body.addEventListener('htmx:load', function (evt) {
+      var currencyChart;
+
+      function initializeCurrencyChart() {
+          // Destroy existing chart if it exists
+          if (currencyChart) {
+              currencyChart.destroy();
+          }
+
           var chartData = JSON.parse('{{ chart_data_currency_json|safe }}');
           var currencies = {{ currencies|safe }};
-
           var ctx = document.getElementById('currencyBalanceChart').getContext('2d');
 
-          new Chart(ctx, {
+          currencyChart = new Chart(ctx, {
               type: 'line',
               data: chartData,
               options: {
@@ -197,17 +203,23 @@
                   }
               }
           });
-      });
+      }
   </script>
 
-  <script>
-      document.body.addEventListener('htmx:load', function (evt) {
+  <script id="accountBalanceChartScript">
+      var accountChart;
+
+      function initializeAccountChart() {
+          // Destroy existing chart if it exists
+          if (accountChart) {
+              accountChart.destroy();
+          }
+
           var chartData = JSON.parse('{{ chart_data_accounts_json|safe }}');
           var accounts = {{ accounts|safe }};
-
           var ctx = document.getElementById('accountBalanceChart').getContext('2d');
 
-          new Chart(ctx, {
+          accountChart = new Chart(ctx, {
               type: 'line',
               data: chartData,
               options: {
@@ -256,43 +268,38 @@
                   }
               }
           });
-      });
-
+      }
   </script>
 
   <script type="text/hyperscript">
     def showOnlyAccountDataset(datasetName)
-      set chart to Chart.getChart('accountBalanceChart')
-      for dataset in chart.data.datasets
+      for dataset in accountChart.data.datasets
         set isMatch to dataset.label is datasetName
-        call chart.setDatasetVisibility(chart.data.datasets.indexOf(dataset), isMatch)
+        call accountChart.setDatasetVisibility(accountChart.data.datasets.indexOf(dataset), isMatch)
       end
-      call chart.update()
+      call accountChart.update()
     end
 
     def showOnlyCurrencyDataset(datasetName)
-      set chart to Chart.getChart('currencyBalanceChart')
-      for dataset in chart.data.datasets
+      for dataset in currencyChart.data.datasets
         set isMatch to dataset.label is datasetName
-        call chart.setDatasetVisibility(chart.data.datasets.indexOf(dataset), isMatch)
+        call currencyChart.setDatasetVisibility(currencyChart.data.datasets.indexOf(dataset), isMatch)
       end
-      call chart.update()
+      call currencyChart.update()
     end
 
     def showAllDatasetsAccount()
-      set chart to Chart.getChart('accountBalanceChart')
-      for dataset in chart.data.datasets
-        call chart.setDatasetVisibility(chart.data.datasets.indexOf(dataset), true)
+      for dataset in accountChart.data.datasets
+        call accountChart.setDatasetVisibility(accountChart.data.datasets.indexOf(dataset), true)
       end
-      call chart.update()
+      call accountChart.update()
     end
 
     def showAllDatasetsCurrency()
-      set chart to Chart.getChart('currencyBalanceChart')
-      for dataset in chart.data.datasets
-        call chart.setDatasetVisibility(chart.data.datasets.indexOf(dataset), true)
+      for dataset in currencyChart.data.datasets
+        call currencyChart.setDatasetVisibility(currencyChart.data.datasets.indexOf(dataset), true)
       end
-      call chart.update()
+      call currencyChart.update()
     end
   </script>
 

app/templates/tags/fragments/list.html

@@ -15,49 +15,18 @@
   </div>
 
   <div class="card">
-    <div class="card-body table-responsive">
-      {% if tags %}
-      <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 'Name' %}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for tag in tags %}
-          <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"
-                      data-bs-toggle="tooltip"
-                      data-bs-title="{% translate "Edit" %}"
-                      hx-get="{% url 'tag_edit' tag_id=tag.id %}"
-                      hx-target="#generic-offcanvas">
-                  <i class="fa-solid fa-pencil fa-fw"></i></a>
-                <a class="btn btn-secondary btn-sm text-danger"
-                        role="button"
-                        data-bs-toggle="tooltip"
-                        data-bs-title="{% translate "Delete" %}"
-                        hx-delete="{% url 'tag_delete' tag_id=tag.id %}"
-                        hx-trigger='confirmed'
-                        data-bypass-on-ctrl="true"
-                        data-title="{% translate "Are you sure?" %}"
-                        data-text="{% translate "You won't be able to revert this!" %}"
-                        data-confirm-text="{% translate "Yes, delete it!" %}"
-                        _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
-              </div>
-            </td>
-            <td class="col">{{ tag.name }}</td>
-          </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-      {% else %}
-      <c-msg.empty title="{% translate "No tags" %}" remove-padding></c-msg.empty>
-      {% endif %}
+    <div class="card-header">
+      <ul class="nav nav-pills card-header-pills" id="myTab" role="tablist">
+        <li class="nav-item" role="presentation">
+          <button class="nav-link active" data-bs-toggle="tab" type="button" role="tab" aria-selected="true" hx-get="{% url 'tags_table_active' %}" hx-trigger="load, click" hx-target="#tags-table">{% translate 'Active' %}</button>
+        </li>
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" hx-get="{% url 'tags_table_archived' %}" hx-target="#tags-table" data-bs-toggle="tab" type="button" role="tab" aria-selected="false">{% translate 'Archived' %}</button>
+        </li>
+      </ul>
+    </div>
+    <div class="card-body">
+      <div id="tags-table"></div>
     </div>
   </div>
 </div>

app/templates/tags/fragments/table.html

@@ -0,0 +1,55 @@
+{% load i18n %}
+{% if active %}
+  <div class="show-loading" hx-get="{% url 'tags_table_active' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% else %}
+  <div class="show-loading" hx-get="{% url 'tags_table_archived' %}" hx-trigger="updated from:window"
+       hx-swap="outerHTML">
+{% endif %}
+    {% if tags %}
+    <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 'Name' %}</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for tag in tags %}
+          <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 'tag_edit' tag_id=tag.id %}"
+                   hx-target="#generic-offcanvas">
+                  <i class="fa-solid fa-pencil fa-fw"></i></a>
+                <a class="btn btn-secondary btn-sm text-danger"
+                   role="button"
+                   data-bs-toggle="tooltip"
+                   hx-swap="innerHTML"
+                   data-bs-title="{% translate "Delete" %}"
+                   hx-delete="{% url 'tag_delete' tag_id=tag.id %}"
+                   hx-trigger='confirmed'
+                   data-bypass-on-ctrl="true"
+                   data-title="{% translate "Are you sure?" %}"
+                   data-text="{% translate "You won't be able to revert this!" %}"
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
+              </div>
+            </td>
+            <td class="col">{{ tag.name }}</td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+    </div>
+    {% else %}
+      <c-msg.empty title="{% translate "No tags" %}" remove-padding></c-msg.empty>
+    {% endif %}
+</div>

app/templates/tags/pages/index.html

@@ -4,5 +4,5 @@
 {% block title %}{% translate 'Tags' %}{% endblock %}
 
 {% block content %}
-<div hx-get="{% url 'tags_list' %}" hx-trigger="load, updated from:window" class="show-loading"></div>
+<div hx-get="{% url 'tags_list' %}" hx-trigger="load" class="show-loading"></div>
 {% endblock %}

docker-compose.prod.yml

@@ -1,6 +1,6 @@
 services:
   web: &django
-    image: ghcr.io/eitchtee/wygiwyh:latest
+    image: eitchtee/wygiwyh:latest
     container_name: ${SERVER_NAME}
     command: /start
     ports: