Merge pull request #39 from eitchtee/dev

feat(transactions): make description optional

README.md

@@ -6,13 +6,15 @@
   <br>
 </h1>
 
-<h4 align="center">An optionated and powerful finance tracker.</h4>
+<h4 align="center">An opinionated and powerful finance tracker.</h4>
 
 <p align="center">
   <a href="#why-wygiwyh">Why</a> •
   <a href="#key-features">Features</a> •
   <a href="#how-to-use">Usage</a> •
-  <a href="#how-it-works">How</a>
+  <a href="#how-it-works">How</a> •
+  <a href="#caveats-and-warnings">Caveats and Warnings</a> •
+  <a href="#built-with">Built with</a>
 </p>
 
 **WYGIWYH** (_What You Get Is What You Have_) is a powerful, principles-first finance tracker designed for people who prefer a no-budget, straightforward approach to managing their money. With features like multi-currency support, customizable transactions, and a built-in dollar-cost averaging tracker, WYGIWYH helps you take control of your finances with simplicity and flexibility.
@@ -210,35 +212,61 @@ A Recurring Transaction is a helper model that generates recurring transactions
 
 ### Account
 
-TO-DO
+Accounts represent different financial entities where transactions occur. They have the following attributes:
+
+- **Name**: A unique identifier for the account.
+- **Group**: An optional [account group](#account-groups) the account belongs to for organizational purposes.
+- **Currency**: The primary [currency](#currency) of the account.
+- **Exchange Currency**: An optional currency used for exchange rate calculations.
+- **Is Asset**: A boolean indicating if the account is considered an asset (counts towards net worth).
+- **Is Archived**: A boolean indicating if the account is archived (doesn't show up in active lists or count towards net worth).
 
 ### Account Groups
 
-TO-DO
+Account Groups are used to organize accounts into logical categories. They consist of:
+
+- **Name**: A unique identifier for the group.
 
 ### Currency
 
-TO-DO
+Currencies represent different monetary units. They include:
+
+* **Code**: A unique identifier for the currency (e.g., USD, EUR).
+* **Name**: The full name of the currency.
+* **Decimal Place**: The number of decimal places used for the currency.
+* **Prefix**: An optional symbol or text that comes before the amount.
+* **Suffix**: An optional symbol or text that comes after the amount.
 
 ### Exchange Rate
 
-TO-DO
+Exchange Rates store conversion rates between currencies:
+
+* **From Currency**: The source currency.
+* **To Currency**: The target currency.
+* **Rate**: The conversion rate.
+* **Date**: The date the rate was recorded or is valid for.
 
 ### Category
 
-TO-DO
+Categories are used to classify transactions:
+
+* **Name**: A unique identifier for the category.
+* **Muted**: Muted categories won't count towards your monthly total.
+* **Active**: A boolean indicating if the category is currently in use. This will disable its use on new transactions.
 
 ### Tag
 
-TO-DO
+Tags provide additional labeling for transactions:
+
+* **Name**: A unique identifier for the tag.
+* **Active**: A boolean indicating if the category is currently in use. This will disable its use on new transactions.
 
 ### Entity
 
-TO-DO
+Entities represent parties involved in transactions:
 
-### Rule
-
-TO-DO
+* **Name**: A unique identifier for the entity.
+* **Active**: A boolean indicating if the entity is currently in use. This will disable its use on new transactions.
 
 ---
 
@@ -264,37 +292,98 @@ This can be useful for savings accounts or other interest accruing investments.!
 
 ### Monthly
 
-TO-DO
+The Monthly view provides an overview of your financial activity for a specific month. It includes:
+
+* Total income and expenses for the month
+* Daily spending allowance calculation
+* List of transactions for the month
+
+> [!NOTE]
+> Reference dates are taken into account here.
 
 ### Yearly by currency
 
-TO-DO
+This view gives you a yearly summary of your finances grouped by currency. It shows:
+
+* Total income and expenses for each currency
+* Monthly breakdown of income and expenses
 
 ### Yearly by account
 
-TO-DO
+Similar to the [yearly by currency](#yearly-by-currency) view, but groups the data by account instead.
 
 ### Calendar
 
-TO-DO
+The Calendar view presents your transactions in a monthly calendar format, allowing you to see your financial activity day by day. It includes:
+
+* Visual representation of daily transaction totals
+* Ability to view details of transactions for each day
+
+> [!NOTE]
+> Reference dates are **not** taken into account here.
 
 ### Networh
 
 #### Current
 
-TO-DO
+The Current Net Worth view shows your present financial standing, including:
+
+* Total value of all asset accounts
+* Breakdown of assets by account and currency
+* Historical net worth trend
 
 #### Projected
 
-TO-DO
+The Projected Net Worth view estimates your future financial position based on current data and recurring transactions. It includes:
+
+* Your total net worth with projected and current transactions
+* Breakdown of assets by account and currency
+* Historical and future net worth trend
 
 ### All Transactions
 
-TO-DO
+This view provides a comprehensive list of all transactions across all accounts. Features include:
+
+* Advanced filtering and sorting options
+* Detailed information
+
+You can use this to see how much you spent on a given category, or a given day, etc..
 
 ### Configuration and Management
 
-TO-DO
+#### Management
+The Management section in the navbar allows you to add and edit most elements of WYGIWYH, including:
+
+* Accounts and Groups
+* Currencies and Exchange Rates
+* Categories, Tags and Entities
+* Rules
+
+#### User Settings
+
+WYGIWYH allows users to personalize their experience through customizable settings. Each user can configure:
+
+* **Language**: Choose your preferred interface language.
+* **Timezone**: Set your local timezone for accurate date and time display.
+* **Start Page**: Select which page you want to see first when you log in.
+* **Sound Preferences**: Toggle sound effects on or off.
+* **Amount Display**: Choose to show or hide monetary amounts by default.
+
+To access and modify these settings:
+
+1. Click on your username in the top-right corner of the page.
+2. Select "Settings" from the dropdown menu.
+3. Adjust your preferences as desired.
+4. Click "Save" to apply your changes.
+
+These settings ensure that WYGIWYH adapts to your personal preferences and working style.
+
+#### Django Admin
+From here you can also access Django's own admin site.
+
+> [!WARNING]
+> Most side effects aren't triggered from the admin.
+> Only use it if you know what you're doing or were told by a developer to do so.
 
 ---
 
@@ -302,7 +391,7 @@ TO-DO
 
 ### Calculator
 
-The calculator is a floating widget that can be toggled by clicking the calculator icon on the navbar.
+The calculator is a floating widget that can be toggled by clicking the calculator icon on the navbar or by pressing <kbd>Alt</kbd> + <kbd>C</kbd> on any page.
 
 It allows for any math expression supported by [math.js](https://mathjs.org).
 
@@ -336,16 +425,109 @@ You can add additional items by clicking the _Add_ button at the end of the page
 
 ### Currency Converter
 
-TO-DO
+The Currency Converter is a tool that allows you to quickly convert amounts between different currencies.
+
+> [!NOTE]
+> There's no external Exchange Rate fetching. This uses the Exchange Rates configured in the [Management](#configuration-and-management) page for [Exchange Rates](#exchange-rate)
+
+## Automation
+
+### API
+
+WYGIWYH has a comprehensive API, it's documentation can be accessed on `<your-wygiwyh-url>/api/docs/`
+
+> [!NOTE]
+> While the API works, there's still much to be added to it to equipare functionality with the main web app.
+
+### Transaction Rules
+
+Transaction Rules are a powerful feature in WYGIWYH that allow for automatic modification of transactions based on specified criteria. This can save time and ensure consistency in your financial tracking.
+
+Key Aspects of Transaction Rules:
+
+* **Conditions**: Set specific criteria that a transaction must meet for the rule to apply. This can include attributes like description, amount, account, etc.
+* **Actions**: Define what changes should be made to a transaction when the conditions are met. This can include setting categories, tags, or modifying other fields.
+* **Activation Options**: Rules can be set to apply when transactions are created, updated, or both.
+
+#### Actions and Conditions
+
+When creating a new rule, you will need to add a Condition and, later, Actions.
+
+Both use a limited subset of Python, via [SimpleEval](https://github.com/danthedeckie/simpleeval).
+
+The Condition must evaluate to True or False, and the Action must evaluate to a value that will be set on the selected field.
+
+You may use any of the available [variables](#available-variables) and [functions](#available-functions).
+
+#### Available variables
+
+* `account_name`
+* `account_id`
+* `account_group_name`
+* `account_group_id`
+* `is_asset_account`
+* `is_archived_account`
+* `category_name`
+* `category_id`
+* `tag_names`
+* `tag_ids`
+* `entities_names`
+* `entities_ids`
+* `is_expense`
+* `is_income`
+* `is_paid`
+* `description`
+* `amount`
+* `notes`
+* `date`
+* `reference_date`
+
+#### Available functions
+
+* `relativedelta`
+
+#### Examples
+
+Add a tag to an income transaction if it happens in a specific account
+
+```
+If...
+account_name == "My Investing Account" and is_income
+
+Then...
+Set Tags to
+tag_names + ["Yield"]
+```
+
+---
+
+Move credit card transactions to next month when they happen at a cutoff date
+
+```
+If...
+account_name == "My credit card" and date.day >= 26 and reference_date.month == date.month
+
+Then...
+Set Reference Date to
+reference_date + relativedelta(months=1)).replace(day=1)
+```
+# Caveats and Warnings
+
+- I'm not an accountant, some terms and even calculations might be wrong. Make sure to open an issue if you see anything that could be improved.
+- Pretty much all calculations are done at run time, this can lead to some performance degradation. On my personal instance, I have 3000+ transactions over 4+ years and 4000+ exchange rates, and load times average at around 500ms for each page, not bad overall.
+- This isn't a budgeting or double-entry-accounting application, if you need those features there's a lot of options out there, if you really need them in WYGIWYH, open a discussion.
 
 # Built with
 
 WYGIWYH is possible thanks to a lot of amazing open source tools, to name a few:
 
-- Django
-- HTMX
-- _hyperscript
-- Procrastinate
-- Bootstrap
-- Tailwind
-- Webpack
+* Django
+* HTMX
+* _hyperscript
+* Procrastinate
+* Bootstrap
+* Tailwind
+* Webpack
+* PostgreSQL
+* Django REST framework
+* Alpine.js

app/apps/api/serializers/transactions.py

@@ -120,6 +120,11 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
         instance.create_upcoming_transactions()
         return instance
 
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        instance.update_unpaid_transactions()
+        return instance
+
 
 class TransactionSerializer(serializers.ModelSerializer):
     category = TransactionCategoryField(required=False)

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

@@ -61,7 +61,6 @@ class DynamicModelChoiceField(forms.ModelChoiceField):
                         self._created_instance = instance
                         return instance
                 except Exception as e:
-                    print(e)
                     raise ValidationError(
                         self.error_messages["invalid_choice"], code="invalid_choice"
                     )

app/apps/common/fields/month_year.py

@@ -1,9 +1,11 @@
 import datetime
 
 from django import forms
-from django.db import models
 from django.core.exceptions import ValidationError
+from django.db import models
+from django.utils.translation import gettext_lazy as _
 
+from apps.common.widgets.datepicker import AirMonthYearPickerInput
 from apps.common.widgets.month_year import MonthYearWidget
 
 
@@ -27,7 +29,7 @@ class MonthYearModelField(models.DateField):
 
 
 class MonthYearFormField(forms.DateField):
-    widget = MonthYearWidget
+    widget = AirMonthYearPickerInput
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -42,7 +44,11 @@ class MonthYearFormField(forms.DateField):
             date = datetime.datetime.strptime(value, "%Y-%m")
             return date.replace(day=1).date()
         except ValueError:
-            raise ValidationError(_("Invalid date format. Use YYYY-MM."))
+            try:
+                date = datetime.datetime.strptime(value, "%Y-%m-%d")
+                return date.replace(day=1).date()
+            except ValueError:
+                raise ValidationError(_("Invalid date format. Use YYYY-MM."))
 
     def prepare_value(self, value):
         if isinstance(value, datetime.date):

app/apps/common/utils/django.py

@@ -0,0 +1,32 @@
+def django_to_python_datetime(django_format):
+    mapping = {
+        # Day
+        "j": "%d",  # Day of the month without leading zeros
+        "d": "%d",  # Day of the month with leading zeros
+        "D": "%a",  # Day of the week, short version
+        "l": "%A",  # Day of the week, full version
+        # Month
+        "n": "%m",  # Month without leading zeros
+        "m": "%m",  # Month with leading zeros
+        "M": "%b",  # Month, short version
+        "F": "%B",  # Month, full version
+        # Year
+        "y": "%y",  # Year, 2 digits
+        "Y": "%Y",  # Year, 4 digits
+        # Time
+        "g": "%I",  # Hour (12-hour), without leading zeros
+        "G": "%H",  # Hour (24-hour), without leading zeros
+        "h": "%I",  # Hour (12-hour), with leading zeros
+        "H": "%H",  # Hour (24-hour), with leading zeros
+        "i": "%M",  # Minutes
+        "s": "%S",  # Seconds
+        "a": "%p",  # am/pm
+        "A": "%p",  # AM/PM
+        "P": "%I:%M %p",
+    }
+
+    python_format = django_format
+    for django_code, python_code in mapping.items():
+        python_format = python_format.replace(django_code, python_code)
+
+    return python_format

app/apps/common/widgets/datepicker.py

@@ -0,0 +1,185 @@
+import datetime
+
+from django.forms import widgets
+from django.utils import formats, translation, dates
+from django.utils.formats import get_format
+
+from apps.common.utils.django import django_to_python_datetime
+
+
+class AirDatePickerInput(widgets.DateInput):
+    def __init__(
+        self,
+        attrs=None,
+        format=None,
+        clear_button=True,
+        auto_close=True,
+        *args,
+        **kwargs,
+    ):
+        attrs = attrs or {}
+
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+
+        self.clear_button = clear_button
+        self.auto_close = auto_close
+
+    def _get_current_language(self):
+        """Get current language code in format compatible with AirDatepicker"""
+        lang_code = translation.get_language()
+        # AirDatepicker uses simple language codes
+        return lang_code.split("-")[0]
+
+    def build_attrs(self, base_attrs, extra_attrs=None):
+        attrs = super().build_attrs(base_attrs, extra_attrs)
+
+        # Add data attributes for AirDatepicker configuration
+        attrs["data-auto-close"] = str(self.auto_close).lower()
+        attrs["data-clear-button"] = str(self.clear_button).lower()
+        attrs["data-language"] = self._get_current_language()
+        attrs["data-date-format"] = self.format or get_format(
+            "SHORT_DATE_FORMAT", use_l10n=True
+        )
+
+        return attrs
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value:
+            self.attrs["data-value"] = (
+                value  # We use this to dynamically select the initial date on AirDatePicker
+            )
+
+        if value is None:
+            return ""
+        if isinstance(value, (datetime.date, datetime.datetime)):
+            return formats.date_format(
+                value, format=self.format or "SHORT_DATE_FORMAT", use_l10n=True
+            )
+
+        return str(value)
+
+
+class AirDateTimePickerInput(widgets.DateTimeInput):
+    def __init__(
+        self,
+        attrs=None,
+        format=None,
+        timepicker=True,
+        clear_button=True,
+        auto_close=True,
+        *args,
+        **kwargs,
+    ):
+        attrs = attrs or {}
+
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+
+        self.timepicker = timepicker
+        self.clear_button = clear_button
+        self.auto_close = auto_close
+
+    def _get_current_language(self):
+        """Get current language code in format compatible with AirDatepicker"""
+        lang_code = translation.get_language()
+        # AirDatepicker uses simple language codes
+        return lang_code.split("-")[0]
+
+    def build_attrs(self, base_attrs, extra_attrs=None):
+        attrs = super().build_attrs(base_attrs, extra_attrs)
+
+        # Add data attributes for AirDatepicker configuration
+        attrs["data-timepicker"] = str(self.timepicker).lower()
+        attrs["data-auto-close"] = str(self.auto_close).lower()
+        attrs["data-clear-button"] = str(self.clear_button).lower()
+        attrs["data-language"] = self._get_current_language()
+        attrs["data-date-format"] = self.format or get_format(
+            "SHORT_DATETIME_FORMAT", use_l10n=True
+        )
+
+        return attrs
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value:
+            self.attrs["data-value"] = (
+                value  # We use this to dynamically select the initial date on AirDatePicker
+            )
+
+        if value is None:
+            return ""
+        if isinstance(value, (datetime.date, datetime.datetime)):
+            return formats.date_format(
+                value, format=self.format or "SHORT_DATETIME_FORMAT", use_l10n=True
+            )
+
+        return str(value)
+
+    def value_from_datadict(self, data, files, name):
+        """Parse the datetime string from the form data."""
+        value = super().value_from_datadict(data, files, name)
+        if value:
+            try:
+                # This does it's best to convert Django's PHP-Style date format to a datetime format and reformat the
+                # value to be read by Django. Probably could be improved
+                return datetime.datetime.strptime(
+                    value,
+                    self.format
+                    or django_to_python_datetime(get_format("SHORT_DATETIME_FORMAT")),
+                ).strftime("%Y-%m-%d %H:%M:%S")
+            except (ValueError, TypeError) as e:
+                return value
+        return None
+
+
+class AirMonthYearPickerInput(AirDatePickerInput):
+    def __init__(self, attrs=None, format=None, *args, **kwargs):
+        super().__init__(attrs=attrs, format=format, *args, **kwargs)
+        # Store the display format for AirDatepicker
+        self.display_format = "MMMM yyyy"
+        # Store the Python format for internal use
+        self.python_format = "%B %Y"
+
+    def _get_month_names(self):
+        """Get month names using Django's date translation"""
+        return {dates.MONTHS[i]: i for i in range(1, 13)}
+
+    def format_value(self, value):
+        """Format the value for display in the widget."""
+        if value:
+            self.attrs["data-value"] = (
+                value  # We use this to dynamically select the initial date on AirDatePicker
+            )
+
+        if value is None:
+            return ""
+        if isinstance(value, str):
+            try:
+                value = datetime.datetime.strptime(value, "%Y-%m-%d").date()
+            except ValueError:
+                return value
+        if isinstance(value, (datetime.datetime, datetime.date)):
+            # Use Django's date translation
+            month_name = dates.MONTHS[value.month]
+            return f"{month_name} {value.year}"
+        return value
+
+    def value_from_datadict(self, data, files, name):
+        """Convert the value from the widget format back to a format Django can handle."""
+        value = super().value_from_datadict(data, files, name)
+        if value:
+            try:
+                # Split the value into month name and year
+                month_str, year_str = value.rsplit(" ", 1)
+                year = int(year_str)
+
+                # Get month number from translated month name
+                month_names = self._get_month_names()
+                month = month_names.get(month_str)
+
+                if month and year:
+                    # Return the first day of the month in Django's expected format
+                    return datetime.date(year, month, 1).strftime("%Y-%m-%d")
+            except (ValueError, KeyError):
+                return None
+        return None

app/apps/currencies/forms.py

@@ -6,9 +6,10 @@ from django.forms import CharField
 from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDateTimePickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
-from apps.currencies.models import Currency, ExchangeRate
 from apps.common.widgets.tom_select import TomSelect
+from apps.currencies.models import Currency, ExchangeRate
 
 
 class CurrencyForm(forms.ModelForm):
@@ -64,9 +65,10 @@ class CurrencyForm(forms.ModelForm):
 
 class ExchangeRateForm(forms.ModelForm):
     date = forms.DateTimeField(
-        widget=forms.DateTimeInput(
-            attrs={"type": "datetime-local"}, format="%Y-%m-%dT%H:%M"
-        )
+        widget=AirDateTimePickerInput(
+            clear_button=False,
+        ),
+        label=_("Date"),
     )
 
     class Meta:

app/apps/dca/forms.py

@@ -1,13 +1,14 @@
 from crispy_forms.bootstrap import FormActions
-from django import forms
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Row, Column
+from django import forms
 from django.utils.translation import gettext_lazy as _
 
+from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDatePickerInput
+from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelect
 from apps.dca.models import DCAStrategy, DCAEntry
-from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
-from apps.common.widgets.crispy.submit import NoClassSubmit
 
 
 class DCAStrategyForm(forms.ModelForm):
@@ -61,7 +62,7 @@ class DCAEntryForm(forms.ModelForm):
             "notes",
         ]
         widgets = {
-            "date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+            "date": AirDatePickerInput(clear_button=False),
             "notes": forms.Textarea(attrs={"rows": 3}),
         }
 

app/apps/transactions/filters.py

@@ -8,6 +8,7 @@ from django_filters import Filter
 
 from apps.accounts.models import Account
 from apps.common.fields.month_year import MonthYearFormField
+from apps.common.widgets.datepicker import AirDatePickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelectMultiple
 from apps.currencies.models import Currency
@@ -87,13 +88,13 @@ class TransactionsFilter(django_filters.FilterSet):
     date_start = django_filters.DateFilter(
         field_name="date",
         lookup_expr="gte",
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+        widget=AirDatePickerInput(),
         label=_("Date from"),
     )
     date_end = django_filters.DateFilter(
         field_name="date",
         lookup_expr="lte",
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+        widget=AirDatePickerInput(),
         label=_("Until"),
     )
     reference_date_start = MonthYearFilter(

app/apps/transactions/forms.py

@@ -16,10 +16,11 @@ from apps.common.fields.forms.dynamic_select import (
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
 )
-from apps.common.fields.month_year import MonthYearFormField
 from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.datepicker import AirDatePickerInput, AirMonthYearPickerInput
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
 from apps.common.widgets.tom_select import TomSelect
+from apps.rules.signals import transaction_created, transaction_updated
 from apps.transactions.models import (
     Transaction,
     TransactionCategory,
@@ -28,7 +29,6 @@ from apps.transactions.models import (
     RecurringTransaction,
     TransactionEntity,
 )
-from apps.rules.signals import transaction_created, transaction_updated
 
 
 class TransactionForm(forms.ModelForm):
@@ -59,7 +59,14 @@ class TransactionForm(forms.ModelForm):
         label=_("Account"),
         widget=TomSelect(clear_button=False, group_by="group"),
     )
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
+    date = forms.DateField(
+        widget=AirDatePickerInput(clear_button=False), label=_("Date")
+    )
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
+    )
 
     class Meta:
         model = Transaction
@@ -77,7 +84,6 @@ class TransactionForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
             "notes": forms.Textarea(attrs={"rows": 3}),
             "account": TomSelect(clear_button=False, group_by="group"),
         }
@@ -118,8 +124,8 @@ class TransactionForm(forms.ModelForm):
                 css_class="form-row",
             ),
             Row(
-                Column("date", css_class="form-group col-md-6 mb-0"),
-                Column("reference_date", css_class="form-group col-md-6 mb-0"),
+                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
+                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
                 css_class="form-row",
             ),
             "description",
@@ -235,10 +241,13 @@ class TransferForm(forms.Form):
     )
 
     date = forms.DateField(
-        label=_("Date"),
-        widget=forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+        widget=AirDatePickerInput(clear_button=False), label=_("Date")
     )
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
+    )
+
     description = forms.CharField(max_length=500, label=_("Description"))
     notes = forms.CharField(
         required=False,
@@ -404,7 +413,10 @@ class InstallmentPlanForm(forms.ModelForm):
         queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
+
+    reference_date = forms.DateField(
+        widget=AirMonthYearPickerInput(), label=_("Reference Date"), required=False
+    )
 
     class Meta:
         model = InstallmentPlan
@@ -424,10 +436,10 @@ class InstallmentPlanForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "start_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
             "account": TomSelect(),
             "recurrence": TomSelect(clear_button=False),
             "notes": forms.Textarea(attrs={"rows": 3}),
+            "start_date": AirDatePickerInput(clear_button=False),
         }
 
     def __init__(self, *args, **kwargs):
@@ -646,7 +658,6 @@ class RecurringTransactionForm(forms.ModelForm):
         queryset=TransactionEntity.objects.filter(active=True),
     )
     type = forms.ChoiceField(choices=Transaction.Type.choices)
-    reference_date = MonthYearFormField(label=_("Reference Date"), required=False)
 
     class Meta:
         model = RecurringTransaction
@@ -666,8 +677,9 @@ class RecurringTransactionForm(forms.ModelForm):
             "entities",
         ]
         widgets = {
-            "start_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
-            "end_date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
+            "start_date": AirDatePickerInput(clear_button=False),
+            "end_date": AirDatePickerInput(),
+            "reference_date": AirMonthYearPickerInput(),
             "recurrence_type": TomSelect(clear_button=False),
             "notes": forms.Textarea(
                 attrs={
@@ -767,5 +779,7 @@ class RecurringTransactionForm(forms.ModelForm):
         instance = super().save(**kwargs)
         if is_new:
             instance.create_upcoming_transactions()
+        else:
+            instance.update_unpaid_transactions()
 
         return instance

app/apps/transactions/migrations/0027_alter_transaction_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-01-14 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0026_transactionentity_active'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transaction',
+            name='description',
+            field=models.CharField(blank=True, max_length=500, verbose_name='Description'),
+        ),
+    ]

app/apps/transactions/models.py

@@ -101,7 +101,9 @@ class Transaction(models.Model):
         validators=[validate_non_negative, validate_decimal_places],
     )
 
-    description = models.CharField(max_length=500, verbose_name=_("Description"))
+    description = models.CharField(
+        max_length=500, verbose_name=_("Description"), blank=True
+    )
     notes = models.TextField(blank=True, verbose_name=_("Notes"))
     category = models.ForeignKey(
         TransactionCategory,
@@ -334,10 +336,15 @@ class InstallmentPlan(models.Model):
                 existing_transaction.type = self.type
                 existing_transaction.date = transaction_date
                 existing_transaction.reference_date = transaction_reference_date
-                existing_transaction.amount = self.installment_amount
                 existing_transaction.description = self.description
                 existing_transaction.category = self.category
                 existing_transaction.notes = self.notes
+
+                if (
+                    not existing_transaction.is_paid
+                ):  # Don't update value for paid transactions
+                    existing_transaction.amount = self.installment_amount
+
                 existing_transaction.save()
 
                 # Update tags
@@ -540,3 +547,33 @@ class RecurringTransaction(models.Model):
             recurring_transaction.save(
                 update_fields=["last_generated_date", "last_generated_reference_date"]
             )
+
+    def update_unpaid_transactions(self):
+        """
+        Updates all unpaid transactions associated with this RecurringTransaction.
+
+        Only unpaid transactions (`is_paid=False`) are modified. Updates fields like
+        amount, description, category, notes, and many-to-many relationships (tags, entities).
+        """
+        unpaid_transactions = self.transactions.filter(is_paid=False)
+
+        for existing_transaction in unpaid_transactions:
+            # Update fields based on RecurringTransaction
+            existing_transaction.amount = self.amount
+            existing_transaction.description = self.description
+            existing_transaction.category = self.category
+            existing_transaction.notes = self.notes
+
+            # Update many-to-many relationships
+            existing_transaction.tags.set(self.tags.all())
+            existing_transaction.entities.set(self.entities.all())
+
+            # Save updated transaction
+            existing_transaction.save()
+
+    def delete_unpaid_transactions(self):
+        """
+        Deletes all unpaid transactions associated with this RecurringTransaction.
+        """
+        today = timezone.localdate(timezone.now())
+        self.transactions.filter(is_paid=False, date__gt=today).delete()

app/apps/transactions/views/recurring_transactions.py

@@ -168,12 +168,26 @@ def recurring_transaction_toggle_pause(request, recurring_transaction_id):
     )
     current_paused = recurring_transaction.is_paused
     recurring_transaction.is_paused = not current_paused
-    recurring_transaction.save(update_fields=["is_paused"])
 
     if current_paused:
-        messages.success(request, _("Recurring transaction unpaused successfully"))
+        today = timezone.localdate(timezone.now())
+        recurring_transaction.last_generated_date = max(
+            recurring_transaction.last_generated_date, today
+        )
+        recurring_transaction.last_generated_reference_date = max(
+            recurring_transaction.last_generated_reference_date, today
+        )
+        recurring_transaction.save(
+            update_fields=[
+                "last_generated_date",
+                "last_generated_reference_date",
+                "is_paused",
+            ]
+        )
         generate_recurring_transactions.defer()
+        messages.success(request, _("Recurring transaction unpaused successfully"))
     else:
+        recurring_transaction.save(update_fields=["is_paused"])
         messages.success(request, _("Recurring transaction paused successfully"))
 
     return HttpResponse(
@@ -188,7 +202,7 @@ def recurring_transaction_toggle_pause(request, recurring_transaction_id):
 @login_required
 @require_http_methods(["GET"])
 def recurring_transaction_finish(request, recurring_transaction_id):
-    recurring_transaction = get_object_or_404(
+    recurring_transaction: RecurringTransaction = get_object_or_404(
         RecurringTransaction, id=recurring_transaction_id
     )
     today = timezone.localdate(timezone.now()) - relativedelta(days=1)
@@ -197,6 +211,9 @@ def recurring_transaction_finish(request, recurring_transaction_id):
     recurring_transaction.is_paused = True
     recurring_transaction.save(update_fields=["end_date", "is_paused"])
 
+    # Delete all unpaid transactions associated with this RecurringTransaction
+    recurring_transaction.delete_unpaid_transactions()
+
     messages.success(request, _("Recurring transaction finished successfully"))
 
     return HttpResponse(

app/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-05 17:33+0000\n"
-"PO-Revision-Date: 2025-01-05 14:35-0300\n"
+"POT-Creation-Date: 2025-01-11 16:40+0000\n"
+"PO-Revision-Date: 2025-01-11 13:41-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -66,7 +66,7 @@ msgstr "Novo saldo"
 #: apps/transactions/forms.py:39 apps/transactions/forms.py:209
 #: apps/transactions/forms.py:216 apps/transactions/forms.py:395
 #: apps/transactions/forms.py:637 apps/transactions/models.py:109
-#: apps/transactions/models.py:228 apps/transactions/models.py:403
+#: apps/transactions/models.py:228 apps/transactions/models.py:408
 msgid "Category"
 msgstr "Categoria"
 
@@ -75,7 +75,7 @@ msgstr "Categoria"
 #: apps/transactions/forms.py:225 apps/transactions/forms.py:233
 #: apps/transactions/forms.py:388 apps/transactions/forms.py:630
 #: apps/transactions/models.py:115 apps/transactions/models.py:230
-#: apps/transactions/models.py:407 templates/includes/navbar.html:98
+#: apps/transactions/models.py:412 templates/includes/navbar.html:98
 #: templates/tags/fragments/list.html:5 templates/tags/pages/index.html:4
 msgid "Tags"
 msgstr "Tags"
@@ -145,7 +145,7 @@ msgstr ""
 #: apps/accounts/models.py:59 apps/rules/models.py:19
 #: apps/transactions/forms.py:59 apps/transactions/forms.py:380
 #: apps/transactions/forms.py:622 apps/transactions/models.py:84
-#: apps/transactions/models.py:188 apps/transactions/models.py:385
+#: apps/transactions/models.py:188 apps/transactions/models.py:390
 msgid "Account"
 msgstr "Conta"
 
@@ -217,7 +217,7 @@ msgstr "Entidade com esse ID não existe."
 msgid "Invalid entity data. Provide an ID or name."
 msgstr "Dados da entidade inválidos. Forneça um ID ou nome."
 
-#: apps/api/serializers/transactions.py:163
+#: apps/api/serializers/transactions.py:168
 msgid "Either 'date' or 'reference_date' must be provided."
 msgstr "É necessário fornecer “date” ou “reference_date”."
 
@@ -420,7 +420,7 @@ msgstr "Moeda de pagamento"
 
 #: apps/dca/models.py:27 apps/dca/models.py:179 apps/rules/models.py:26
 #: apps/transactions/forms.py:250 apps/transactions/models.py:105
-#: apps/transactions/models.py:237 apps/transactions/models.py:413
+#: apps/transactions/models.py:237 apps/transactions/models.py:418
 msgid "Notes"
 msgstr "Notas"
 
@@ -517,7 +517,7 @@ msgstr "Já existe um valor para esse campo na regra."
 
 #: apps/rules/models.py:10 apps/rules/models.py:25
 #: apps/transactions/forms.py:242 apps/transactions/models.py:104
-#: apps/transactions/models.py:195 apps/transactions/models.py:399
+#: apps/transactions/models.py:195 apps/transactions/models.py:404
 msgid "Description"
 msgstr "Descrição"
 
@@ -526,7 +526,7 @@ msgid "Trigger"
 msgstr "Gatilho"
 
 #: apps/rules/models.py:20 apps/transactions/models.py:91
-#: apps/transactions/models.py:193 apps/transactions/models.py:391
+#: apps/transactions/models.py:193 apps/transactions/models.py:396
 msgid "Type"
 msgstr "Tipo"
 
@@ -538,12 +538,12 @@ msgstr "Pago"
 #: apps/rules/models.py:23 apps/transactions/forms.py:62
 #: apps/transactions/forms.py:241 apps/transactions/forms.py:407
 #: apps/transactions/forms.py:649 apps/transactions/models.py:95
-#: apps/transactions/models.py:211 apps/transactions/models.py:415
+#: apps/transactions/models.py:211 apps/transactions/models.py:420
 msgid "Reference Date"
 msgstr "Data de Referência"
 
 #: apps/rules/models.py:24 apps/transactions/models.py:100
-#: apps/transactions/models.py:396
+#: apps/transactions/models.py:401
 msgid "Amount"
 msgstr "Quantia"
 
@@ -551,7 +551,7 @@ msgstr "Quantia"
 #: apps/transactions/forms.py:55 apps/transactions/forms.py:403
 #: apps/transactions/forms.py:645 apps/transactions/models.py:69
 #: apps/transactions/models.py:120 apps/transactions/models.py:233
-#: apps/transactions/models.py:410 templates/entities/fragments/list.html:5
+#: apps/transactions/models.py:415 templates/entities/fragments/list.html:5
 #: templates/entities/pages/index.html:4 templates/includes/navbar.html:100
 msgid "Entities"
 msgstr "Entidades"
@@ -753,7 +753,7 @@ msgstr "Despesa"
 msgid "Installment Plan"
 msgstr "Parcelamento"
 
-#: apps/transactions/models.py:140 apps/transactions/models.py:436
+#: apps/transactions/models.py:140 apps/transactions/models.py:441
 msgid "Recurring Transaction"
 msgstr "Transação Recorrente"
 
@@ -798,11 +798,11 @@ msgstr "Parcela inicial"
 msgid "The installment number to start counting from"
 msgstr "O número da parcela a partir do qual se inicia a contagem"
 
-#: apps/transactions/models.py:209 apps/transactions/models.py:419
+#: apps/transactions/models.py:209 apps/transactions/models.py:424
 msgid "Start Date"
 msgstr "Data de Início"
 
-#: apps/transactions/models.py:213 apps/transactions/models.py:420
+#: apps/transactions/models.py:213 apps/transactions/models.py:425
 msgid "End Date"
 msgstr "Data Final"
 
@@ -820,44 +820,44 @@ msgstr "Valor da Parcela"
 msgid "Installment Plans"
 msgstr "Parcelamentos"
 
-#: apps/transactions/models.py:378
+#: apps/transactions/models.py:383
 msgid "day(s)"
 msgstr "dia(s)"
 
-#: apps/transactions/models.py:379
+#: apps/transactions/models.py:384
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: apps/transactions/models.py:380
+#: apps/transactions/models.py:385
 msgid "month(s)"
 msgstr "mês(es)"
 
-#: apps/transactions/models.py:381
+#: apps/transactions/models.py:386
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: apps/transactions/models.py:383
+#: apps/transactions/models.py:388
 #: templates/recurring_transactions/fragments/list.html:24
 msgid "Paused"
 msgstr "Pausado"
 
-#: apps/transactions/models.py:422
+#: apps/transactions/models.py:427
 msgid "Recurrence Type"
 msgstr "Tipo de recorrência"
 
-#: apps/transactions/models.py:425
+#: apps/transactions/models.py:430
 msgid "Recurrence Interval"
 msgstr "Intervalo de recorrência"
 
-#: apps/transactions/models.py:429
+#: apps/transactions/models.py:434
 msgid "Last Generated Date"
 msgstr "Última data gerada"
 
-#: apps/transactions/models.py:432
+#: apps/transactions/models.py:437
 msgid "Last Generated Reference Date"
 msgstr "Última data de referência gerada"
 
-#: apps/transactions/models.py:437 templates/includes/navbar.html:64
+#: apps/transactions/models.py:442 templates/includes/navbar.html:64
 #: templates/recurring_transactions/fragments/list.html:5
 #: templates/recurring_transactions/pages/index.html:4
 msgid "Recurring Transactions"
@@ -921,19 +921,19 @@ msgstr "Transação Recorrente adicionada com sucesso"
 msgid "Recurring Transaction updated successfully"
 msgstr "Transação Recorrente atualizada com sucesso"
 
-#: apps/transactions/views/recurring_transactions.py:174
+#: apps/transactions/views/recurring_transactions.py:188
 msgid "Recurring transaction unpaused successfully"
 msgstr "Transação Recorrente despausada com sucesso"
 
-#: apps/transactions/views/recurring_transactions.py:177
+#: apps/transactions/views/recurring_transactions.py:191
 msgid "Recurring transaction paused successfully"
 msgstr "Transação Recorrente pausada com sucesso"
 
-#: apps/transactions/views/recurring_transactions.py:200
+#: apps/transactions/views/recurring_transactions.py:217
 msgid "Recurring transaction finished successfully"
 msgstr "Transação Recorrente finalizada com sucesso"
 
-#: apps/transactions/views/recurring_transactions.py:221
+#: apps/transactions/views/recurring_transactions.py:238
 msgid "Recurring Transaction deleted successfully"
 msgstr "Transação Recorrente apagada com sucesso"
 
@@ -1344,41 +1344,41 @@ msgstr "Marcar como não pago"
 msgid "Yes, delete them!"
 msgstr "Sim, apague!"
 
-#: templates/cotton/ui/transactions_action_bar.html:127
-#: templates/cotton/ui/transactions_action_bar.html:149
-#: templates/cotton/ui/transactions_action_bar.html:169
-#: templates/cotton/ui/transactions_action_bar.html:189
-#: templates/cotton/ui/transactions_action_bar.html:209
-#: templates/cotton/ui/transactions_action_bar.html:229
-#: templates/cotton/ui/transactions_action_bar.html:249
+#: templates/cotton/ui/transactions_action_bar.html:101
+#: templates/cotton/ui/transactions_action_bar.html:125
+#: templates/cotton/ui/transactions_action_bar.html:145
+#: templates/cotton/ui/transactions_action_bar.html:165
+#: templates/cotton/ui/transactions_action_bar.html:185
+#: templates/cotton/ui/transactions_action_bar.html:205
+#: templates/cotton/ui/transactions_action_bar.html:225
 msgid "copied!"
 msgstr "copiado!"
 
-#: templates/cotton/ui/transactions_action_bar.html:134
+#: templates/cotton/ui/transactions_action_bar.html:110
 msgid "Toggle Dropdown"
 msgstr "Alternar menu suspenso"
 
-#: templates/cotton/ui/transactions_action_bar.html:142
+#: templates/cotton/ui/transactions_action_bar.html:118
 msgid "Flat Total"
 msgstr "Total Fixo"
 
-#: templates/cotton/ui/transactions_action_bar.html:162
+#: templates/cotton/ui/transactions_action_bar.html:138
 msgid "Real Total"
 msgstr "Total Real"
 
-#: templates/cotton/ui/transactions_action_bar.html:182
+#: templates/cotton/ui/transactions_action_bar.html:158
 msgid "Mean"
 msgstr "Média"
 
-#: templates/cotton/ui/transactions_action_bar.html:202
+#: templates/cotton/ui/transactions_action_bar.html:178
 msgid "Max"
 msgstr "Máximo"
 
-#: templates/cotton/ui/transactions_action_bar.html:222
+#: templates/cotton/ui/transactions_action_bar.html:198
 msgid "Min"
 msgstr "Minímo"
 
-#: templates/cotton/ui/transactions_action_bar.html:242
+#: templates/cotton/ui/transactions_action_bar.html:218
 msgid "Count"
 msgstr "Contagem"
 
@@ -1841,8 +1841,12 @@ msgid "Finish"
 msgstr "Finalizar"
 
 #: templates/recurring_transactions/fragments/table.html:83
-msgid "This will stop the creation of new transactions"
-msgstr "Isso interromperá a criação de novas transações"
+msgid ""
+"This will stop the creation of new transactions and delete any unpaid "
+"transactions after today"
+msgstr ""
+"Isso interromperá a criação de novas transações e apagará transações não "
+"pagas depois de hoje"
 
 #: templates/recurring_transactions/fragments/table.html:84
 msgid "Yes, finish it!"
@@ -2028,6 +2032,9 @@ msgstr "Visão Anual"
 msgid "Year"
 msgstr "Ano"
 
+#~ msgid "This will stop the creation of new transactions"
+#~ msgstr "Isso interromperá a criação de novas transações"
+
 #~ msgid "Is an asset account?"
 #~ msgstr "É uma conta de ativos?"
 

app/templates/cotton/ui/transactions_action_bar.html

@@ -56,66 +56,43 @@
           <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 realTotal to 0.0#}
-        {#                set flatTotal to 0.0#}
-        {#                for transaction in <.transaction:has(input[name='transactions']:checked)/>#}
-        {#                  set amt to first <.main-amount .amount/> in transaction#}
-        {#                  set amountValue to parseFloat(amt.getAttribute('data-amount'))#}
-        {#                  if not isNaN(amountValue)#}
-        {#                    set flatTotal to flatTotal + (amountValue * 100)#}
-        {##}
-        {#                    if transaction match .income#}
-        {#                      set realTotal to realTotal + (amountValue * 100)#}
-        {#                    else#}
-        {#                      set realTotal to realTotal - (amountValue * 100)#}
-        {#                    end#}
-        {#                  end#}
-        {#                end#}
-        {#                set realTotal to realTotal / 100#}
-        {#                put realTotal.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>#}
         <div class="btn-group"
               _="on selected_transactions_updated from #actions-bar
-                  set realTotal to 0.0
-                  set flatTotal to 0.0
+                  set realTotal to math.bignumber(0)
+                  set flatTotal to math.bignumber(0)
                   set transactions to <.transaction:has(input[name='transactions']:checked)/>
-                  set amountValues to []
+                  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 amountValues
+                    append amountValue to flatAmountValues
 
                     if not isNaN(amountValue)
-                      set flatTotal to flatTotal + (amountValue * 100)
+                      set flatTotal to math.chain(flatTotal).add(amountValue)
 
                       if transaction match .income
-                        set realTotal to realTotal + (amountValue * 100)
+                        append amountValue to realAmountValues
+                        set realTotal to math.chain(realTotal).add(amountValue)
                       else
-                        set realTotal to realTotal - (amountValue * 100)
+                        append -amountValue to realAmountValues
+                        set realTotal to math.chain(realTotal).subtract(amountValue)
                       end
                     end
                   end
+                  
+                  set mean to flatTotal.divide(flatAmountValues.length).done().toNumber()
+                  set realTotal to realTotal.done().toNumber()
+                  set flatTotal to flatTotal.done().toNumber()
 
-                  set realTotal to realTotal / 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
-                  set flatTotal to flatTotal / 100
                   put flatTotal.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40}) into #calc-menu-flat-total's innerText
-                  log amountValues
-                  put Math.max.apply(Math, amountValues) into #calc-menu-max's innerText
-                  put Math.min.apply(Math, amountValues) into #calc-menu-min's innerText
-                  put flatTotal / amountValues.length into #calc-menu-mean's innerText
-                  put amountValues.length into #calc-menu-count'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 mean.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

app/templates/extends/offcanvas.html

@@ -5,6 +5,7 @@
   <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label={% translate 'Close' %}></button>
 </div>
 <div id="generic-offcanvas-body" class="offcanvas-body"
-     _="install init_tom_select">
+     _="install init_tom_select
+        install init_datepicker">
   {% block body %}{% endblock %}
 </div>

app/templates/includes/scripts.html

@@ -3,19 +3,18 @@
 {% javascript_pack 'bootstrap' attrs="defer" %}
 {% javascript_pack 'sweetalert2' attrs="defer" %}
 {% javascript_pack 'select' attrs="defer" %}
+{% javascript_pack 'datepicker' %}
 
 {% include 'includes/scripts/hyperscript/init_tom_select.html' %}
+{% include 'includes/scripts/hyperscript/init_date_picker.html' %}
 {% include 'includes/scripts/hyperscript/hide_amount.html' %}
 {% include 'includes/scripts/hyperscript/tooltip.html' %}
 {% include 'includes/scripts/hyperscript/htmx_error_handler.html' %}
 {% include 'includes/scripts/hyperscript/sounds.html' %}
 {% include 'includes/scripts/hyperscript/swal.html' %}
-<script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/persist@3.x.x/dist/cdn.min.js"></script>
 
 {% javascript_pack 'htmx' attrs="defer" %}
 {% javascript_pack 'charts' %}
-{#<script src="https://unpkg.com/htmx-ext-alpine-morph@2.0.0/alpine-morph.js"></script>#}
-
 
 <script>
 let tz = Intl.DateTimeFormat().resolvedOptions().timeZone;

app/templates/includes/scripts/hyperscript/init_date_picker.html

@@ -0,0 +1,22 @@
+<script type="text/hyperscript">
+  behavior init_datepicker
+    init
+      set datepickers to <.airdatepickerinput/> in me
+      for x in datepickers
+        js(it)
+          DatePicker(it)
+        end
+      end
+      set datepickers to <.airdatetimepickerinput/> in me
+      for x in datepickers
+        js(it)
+          DatePicker(it)
+        end
+      end
+      set datepickers to <.airmonthyearpickerinput/> in me
+      for x in datepickers
+        MonthYearPicker(it)
+      end
+    end
+  end
+</script>

app/templates/includes/tools/calculator.html

@@ -66,11 +66,10 @@
                                            })
                 end
                 then set expr to it
-                then call math.evaluate(expr)
+                then call math.evaluate(expr).toNumber()
                 if result exists and result is a Number
                   js(result)
-                    return result.toString().replace(new RegExp(',|\\.', 'g'),
-                                                                   match => match === '.' ? window.decimalSeparator : window.argSeparator)
+                    return result.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 40})
                   end
                   then set localizedResult to it
                   set #calculator-result.innerText to localizedResult

app/templates/mini_tools/currency_converter/currency_converter.html

@@ -8,7 +8,9 @@
 {% block title %}{% translate 'Currency Converter' %}{% endblock %}
 
 {% block content %}
-  <div class="container px-md-3 py-3 column-gap-5" _="install init_tom_select">
+  <div class="container px-md-3 py-3 column-gap-5"
+       _="install init_tom_select
+          install init_datepicker">
     <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
       <div>{% translate 'Currency Converter' %}</div>
     </div>

app/templates/monthly_overview/pages/overview.html

@@ -124,7 +124,8 @@
       <div class="collapse" id="collapse-filter">
         <div class="card card-body">
           <form _="on change or submit or search trigger updated on window end
-                   install init_tom_select"
+                   install init_tom_select
+                   install init_datepicker"
                 id="filter">
             {% crispy filter.form %}
           </form>

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" _="on load call initializeAccountChart() then initializeCurrencyChart()">
+  <div class="container px-md-3 py-3" _="init call initializeAccountChart() then initializeCurrencyChart() end">
     <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">

app/templates/recurring_transactions/fragments/table.html

@@ -80,7 +80,7 @@
                   hx-swap="innerHTML"
                   data-bypass-on-ctrl="true"
                   data-title="{% translate "Are you sure?" %}"
-                  data-text="{% translate "This will stop the creation of new transactions" %}"
+                  data-text="{% translate "This will stop the creation of new transactions and delete any unpaid transactions after today" %}"
                   data-confirm-text="{% translate "Yes, finish it!" %}"
                   _="install prompt_swal">
               <i class="fa-solid fa-flag-checkered fa-fw"></i></a>

app/templates/transactions/pages/transactions.html

@@ -21,7 +21,8 @@
             <hr>
             <form hx-get="{% url 'transactions_all_list' %}" hx-trigger="change, submit, search"
                     hx-target="#transactions" id="filter" hx-indicator="#transactions"
-                    _="install init_tom_select">
+                    _="install init_tom_select
+                       install init_datepicker">
                 {% crispy filter.form %}
             </form>
           </div>

frontend/package-lock.json

@@ -17,6 +17,7 @@
         "@babel/preset-env": "^7.16.8",
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@popperjs/core": "^2.11.8",
+        "air-datepicker": "^3.5.3",
         "alpinejs": "^3.14.1",
         "autoprefixer": "^10.4.14",
         "autosize": "^6.0.1",
@@ -2703,6 +2704,12 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/air-datepicker": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/air-datepicker/-/air-datepicker-3.5.3.tgz",
+      "integrity": "sha512-Elf9gLhv/jidN1+TfeRJYMQRUfYx5apXw2dY5DuAMPRnNtQ4Iw9fTTJK772osmXSUB9xQ2Y8Q1Pt6pgBOQLPQw==",
+      "license": "MIT"
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",

frontend/package.json

@@ -30,6 +30,7 @@
     "@babel/preset-env": "^7.16.8",
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@popperjs/core": "^2.11.8",
+    "air-datepicker": "^3.5.3",
     "alpinejs": "^3.14.1",
     "autoprefixer": "^10.4.14",
     "autosize": "^6.0.1",

frontend/src/application/datepicker.js

@@ -0,0 +1,148 @@
+import AirDatepicker from 'air-datepicker';
+import en from 'air-datepicker/locale/en';
+import ptBr from 'air-datepicker/locale/pt-BR';
+import {createPopper} from '@popperjs/core';
+
+const locales = {
+    'pt': ptBr,
+    'en': en
+};
+
+function isMobileDevice() {
+    const mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
+    return mobileRegex.test(navigator.userAgent);
+}
+
+function isTouchDevice() {
+    return ('ontouchstart' in window) || (navigator.maxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0);
+}
+
+function isMobile() {
+    return isMobileDevice() || isTouchDevice();
+}
+
+window.DatePicker = function createDynamicDatePicker(element) {
+    let isOnMobile = isMobile();
+
+    let baseOpts = {
+        isMobile: isOnMobile,
+        timepicker: element.dataset.timepicker === 'true',
+        autoClose: element.dataset.autoClose === 'true',
+        buttons: element.dataset.clearButton === 'true' ? ['clear', 'today'] : ['today'],
+        locale: locales[element.dataset.language],
+        onSelect: ({date, formattedDate, datepicker}) => {
+            const _event = new CustomEvent("change", {
+                bubbles: true,
+            });
+            datepicker.$el.dispatchEvent(_event);
+        }
+    };
+
+    const positionConfig = !isOnMobile ? {
+        position({$datepicker, $target, $pointer, done}) {
+            let popper = createPopper($target, $datepicker, {
+                placement: 'bottom',
+                modifiers: [
+                    {
+                        name: 'flip',
+                        options: {
+                            padding: {
+                                top: 64
+                            }
+                        }
+                    },
+                    {
+                        name: 'offset',
+                        options: {
+                            offset: [0, 20]
+                        }
+                    },
+                    {
+                        name: 'arrow',
+                        options: {
+                            element: $pointer
+                        }
+                    }
+                ]
+            });
+
+            return function completeHide() {
+                popper.destroy();
+                done();
+            };
+        }
+    } : {};
+
+    let opts = {...baseOpts, ...positionConfig};
+
+    if (element.dataset.value) {
+        opts["selectedDates"] = [element.dataset.value];
+        opts["startDate"] = [element.dataset.value];
+    }
+
+    return new AirDatepicker(element, opts);
+};
+
+
+window.MonthYearPicker = function createDynamicDatePicker(element) {
+    let isOnMobile = isMobile();
+
+    let baseOpts = {
+        isMobile: isOnMobile,
+        view: 'months',
+        minView: 'months',
+        dateFormat: 'MMMM yyyy',
+        autoClose: element.dataset.autoClose === 'true',
+        buttons: element.dataset.clearButton === 'true' ? ['clear', 'today'] : ['today'],
+        locale: locales[element.dataset.language],
+        onSelect: ({date, formattedDate, datepicker}) => {
+            const _event = new CustomEvent("change", {
+                bubbles: true,
+            });
+            datepicker.$el.dispatchEvent(_event);
+        }
+    };
+
+    const positionConfig = !isOnMobile ? {
+        position({$datepicker, $target, $pointer, done}) {
+            let popper = createPopper($target, $datepicker, {
+                placement: 'bottom',
+                modifiers: [
+                    {
+                        name: 'flip',
+                        options: {
+                            padding: {
+                                top: 64
+                            }
+                        }
+                    },
+                    {
+                        name: 'offset',
+                        options: {
+                            offset: [0, 20]
+                        }
+                    },
+                    {
+                        name: 'arrow',
+                        options: {
+                            element: $pointer
+                        }
+                    }
+                ]
+            });
+
+            return function completeHide() {
+                popper.destroy();
+                done();
+            };
+        }
+    } : {};
+
+    let opts = {...baseOpts, ...positionConfig};
+
+    if (element.dataset.value) {
+        opts["selectedDates"] = [element.dataset.value];
+        opts["startDate"] = [element.dataset.value];
+    }
+    return new AirDatepicker(element, opts);
+};

frontend/src/application/htmx.js

@@ -2,18 +2,23 @@ import _hyperscript from 'hyperscript.org/dist/_hyperscript.min';
 import './_htmx.js';
 import Alpine from "alpinejs";
 import mask from '@alpinejs/mask';
-import { create, all } from 'mathjs';
+import {create, all} from 'mathjs';
 
 window.Alpine = Alpine;
 window._hyperscript = _hyperscript;
-window.math = create(all, { });
+window.math = create(all, {
+    number: 'BigNumber',      // Default type of number:
+                              // 'number' (default), 'BigNumber', or 'Fraction'
+    precision: 64,            // Number of significant digits for BigNumbers
+    relTol: 1e-60,
+    absTol: 1e-63
+});
 
 Alpine.plugin(mask);
 Alpine.start();
 _hyperscript.browserInit();
 
 
-
 const successAudio = new Audio("/static/sounds/success.mp3");
 const popAudio = new Audio("/static/sounds/pop.mp3");
 window.paidSound = successAudio;

frontend/src/styles/_datepicker.scss

@@ -0,0 +1,89 @@
+@import 'air-datepicker/air-datepicker.css';
+
+.air-datepicker-global-container {
+  z-index: 2000;  // Allows the datepicker to be shown on top of offcanvas
+}
+
+.air-datepicker {
+    --adp-accent-color: #fbb700;
+    --adp-day-name-color: #fbb700;
+    --adp-background-color: #303030; /* $gray-800 */
+    --adp-color: #fff;
+    --adb-color-other-month: #888; /* $gray-600 */
+    --adp-cell-background-color-selected: #fbb700;
+
+    --adp-border-color-inline: #444;
+
+    --adp-background-color-selected-other-month-focused: #e6a600; /* Slightly darker than $yellow */
+    --adp-background-color-selected-other-month: #fbb700;
+
+    --adp-color-secondary: #adb5bd; /* $gray-500 */
+    --adp-background-color-hover: #444;
+    --adp-background-color-active: #3c3c3c;
+    --adp-cell-background-color-selected-hover: #e6a600;
+    --adp-color-other-month: #888; /* $gray-600 */
+    --adp-color-disabled: #444; /* $gray-700 */
+    --adp-color-disabled-in-range: #666; /* Between $gray-600 and $gray-700 */
+    --adp-color-other-month-hover: #ced4da; /* $gray-400 */
+    --adp-time-track-color: #444; /* $gray-700 */
+    --adp-time-track-color-hover: #888; /* $gray-600 */
+}
+
+.air-datepicker-cell.-selected-,
+.air-datepicker-cell.-selected-.-current-,
+.-selected-.air-datepicker-cell.-year-.-other-decade-,
+.-selected-.air-datepicker-cell.-day-.-other-month-{
+    color: #222; /* $gray-900 */
+}
+
+/* Additional styles for better dark theme integration */
+.air-datepicker {
+    border-color: #444; /* $gray-700 */
+}
+
+.air-datepicker-body--day-names {
+    color: #fbb700; /* $yellow */
+}
+
+.air-datepicker-cell:hover {
+    background-color: #444; /* $gray-700 */
+}
+
+.air-datepicker-cell.-current- {
+    color: #fbb700; /* $yellow */
+}
+
+.air-datepicker-cell.-range-from-,
+.air-datepicker-cell.-range-to- {
+    border: 1px solid #fbb700; /* $yellow */
+}
+
+.air-datepicker-cell.-range-from-::before,
+.air-datepicker-cell.-range-to-::before {
+    background-color: rgba(251, 183, 0, 0.1); /* $yellow with opacity */
+}
+
+.air-datepicker-cell.-in-range- {
+    background-color: rgba(251, 183, 0, 0.1); /* $yellow with opacity */
+}
+
+.air-datepicker-time--row input[type='range']::-webkit-slider-thumb {
+    background-color: #fbb700; /* $yellow */
+}
+
+.air-datepicker-time--row input[type='range']::-moz-range-thumb {
+    background-color: #fbb700; /* $yellow */
+}
+
+.air-datepicker-button,
+.air-datepicker-button:hover {
+    color: #fbb700; /* $yellow */
+}
+
+.air-datepicker-button:hover {
+    background-color: #444; /* $gray-700 */
+}
+
+.air-datepicker--pointer:after {
+    background: #303030
+}

frontend/src/styles/style.scss

@@ -2,6 +2,7 @@
 @import "font-awesome.scss";
 @import "tailwind.scss";
 @import "bootstrap.scss";
+@import "datepicker.scss";
 @import "tom-select.scss";
 @import "animations.scss";
 @import "scrollbar.scss";