diff --git a/app/apps/common/widgets/datepicker.py b/app/apps/common/widgets/datepicker.py index a110620..a9ee922 100644 --- a/app/apps/common/widgets/datepicker.py +++ b/app/apps/common/widgets/datepicker.py @@ -19,12 +19,10 @@ class AirDatePickerInput(widgets.DateInput): format=None, clear_button=True, auto_close=True, - user=None, *args, **kwargs, ): attrs = attrs or {} - self.user = user super().__init__(attrs=attrs, format=format, *args, **kwargs) self.clear_button = clear_button self.auto_close = auto_close @@ -91,12 +89,10 @@ class AirDateTimePickerInput(widgets.DateTimeInput): timepicker=True, clear_button=True, auto_close=True, - user=None, *args, **kwargs, ): attrs = attrs or {} - self.user = user super().__init__(attrs=attrs, format=format, *args, **kwargs) self.timepicker = timepicker self.clear_button = clear_button diff --git a/app/apps/currencies/forms.py b/app/apps/currencies/forms.py index fb5e745..22fa04f 100644 --- a/app/apps/currencies/forms.py +++ b/app/apps/currencies/forms.py @@ -72,7 +72,7 @@ class ExchangeRateForm(forms.ModelForm): model = ExchangeRate fields = ["from_currency", "to_currency", "rate", "date"] - def __init__(self, *args, user=None, **kwargs): + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper = FormHelper() @@ -81,9 +81,7 @@ class ExchangeRateForm(forms.ModelForm): self.helper.layout = Layout("date", "from_currency", "to_currency", "rate") self.fields["rate"].widget = ArbitraryDecimalDisplayNumberInput() - self.fields["date"].widget = AirDateTimePickerInput( - clear_button=False, user=user - ) + self.fields["date"].widget = AirDateTimePickerInput(clear_button=False) if self.instance and self.instance.pk: self.helper.layout.append( diff --git a/app/apps/currencies/views/exchange_rates.py b/app/apps/currencies/views/exchange_rates.py index f7e9ed4..dc43de5 100644 --- a/app/apps/currencies/views/exchange_rates.py +++ b/app/apps/currencies/views/exchange_rates.py @@ -83,7 +83,7 @@ def exchange_rates_list_pair(request): @require_http_methods(["GET", "POST"]) def exchange_rate_add(request): if request.method == "POST": - form = ExchangeRateForm(request.POST, user=request.user) + form = ExchangeRateForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Exchange rate added successfully")) @@ -95,7 +95,7 @@ def exchange_rate_add(request): }, ) else: - form = ExchangeRateForm(user=request.user) + form = ExchangeRateForm() return render( request, @@ -111,7 +111,7 @@ def exchange_rate_edit(request, pk): exchange_rate = get_object_or_404(ExchangeRate, id=pk) if request.method == "POST": - form = ExchangeRateForm(request.POST, instance=exchange_rate, user=request.user) + form = ExchangeRateForm(request.POST, instance=exchange_rate) if form.is_valid(): form.save() messages.success(request, _("Exchange rate updated successfully")) @@ -123,7 +123,7 @@ def exchange_rate_edit(request, pk): }, ) else: - form = ExchangeRateForm(instance=exchange_rate, user=request.user) + form = ExchangeRateForm(instance=exchange_rate) return render( request, diff --git a/app/apps/dca/forms.py b/app/apps/dca/forms.py index 2158704..a4e052e 100644 --- a/app/apps/dca/forms.py +++ b/app/apps/dca/forms.py @@ -65,7 +65,7 @@ class DCAEntryForm(forms.ModelForm): "notes": forms.Textarea(attrs={"rows": 3}), } - def __init__(self, *args, user=None, **kwargs): + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper = FormHelper() self.helper.form_tag = False @@ -106,4 +106,4 @@ class DCAEntryForm(forms.ModelForm): self.fields["amount_paid"].widget = ArbitraryDecimalDisplayNumberInput() self.fields["amount_received"].widget = ArbitraryDecimalDisplayNumberInput() - self.fields["date"].widget = AirDatePickerInput(clear_button=False, user=user) + self.fields["date"].widget = AirDatePickerInput(clear_button=False) diff --git a/app/apps/dca/views.py b/app/apps/dca/views.py index 547b9ef..22f718d 100644 --- a/app/apps/dca/views.py +++ b/app/apps/dca/views.py @@ -155,7 +155,7 @@ def strategy_detail(request, strategy_id): def strategy_entry_add(request, strategy_id): strategy = get_object_or_404(DCAStrategy, id=strategy_id) if request.method == "POST": - form = DCAEntryForm(request.POST, user=request.user) + form = DCAEntryForm(request.POST) if form.is_valid(): entry = form.save(commit=False) entry.strategy = strategy @@ -169,7 +169,7 @@ def strategy_entry_add(request, strategy_id): }, ) else: - form = DCAEntryForm(user=request.user) + form = DCAEntryForm() return render( request, @@ -184,7 +184,7 @@ def strategy_entry_edit(request, strategy_id, entry_id): dca_entry = get_object_or_404(DCAEntry, id=entry_id, strategy__id=strategy_id) if request.method == "POST": - form = DCAEntryForm(request.POST, instance=dca_entry, user=request.user) + form = DCAEntryForm(request.POST, instance=dca_entry) if form.is_valid(): form.save() messages.success(request, _("Entry updated successfully")) @@ -196,7 +196,7 @@ def strategy_entry_edit(request, strategy_id, entry_id): }, ) else: - form = DCAEntryForm(instance=dca_entry, user=request.user) + form = DCAEntryForm(instance=dca_entry) return render( request, diff --git a/app/apps/monthly_overview/views.py b/app/apps/monthly_overview/views.py index 814bce5..0289a4d 100644 --- a/app/apps/monthly_overview/views.py +++ b/app/apps/monthly_overview/views.py @@ -41,7 +41,7 @@ def monthly_overview(request, month: int, year: int): previous_month = 12 if month == 1 else month - 1 previous_year = year - 1 if previous_month == 12 and month == 1 else year - f = TransactionsFilter(request.GET, user=request.user) + f = TransactionsFilter(request.GET) return render( request, @@ -64,7 +64,7 @@ def monthly_overview(request, month: int, year: int): def transactions_list(request, month: int, year: int): order = request.GET.get("order") - f = TransactionsFilter(request.GET, user=request.user) + f = TransactionsFilter(request.GET) transactions_filtered = ( f.qs.filter() .filter( diff --git a/app/apps/transactions/filters.py b/app/apps/transactions/filters.py index 81d9ef5..ccbb58f 100644 --- a/app/apps/transactions/filters.py +++ b/app/apps/transactions/filters.py @@ -133,7 +133,7 @@ class TransactionsFilter(django_filters.FilterSet): "to_amount", ] - def __init__(self, data=None, user=None, *args, **kwargs): + def __init__(self, data=None, *args, **kwargs): # if filterset is bound, use initial values as defaults if data is not None: # get a mutable copy of the QueryDict @@ -182,5 +182,5 @@ class TransactionsFilter(django_filters.FilterSet): self.form.fields["to_amount"].widget = ArbitraryDecimalDisplayNumberInput() self.form.fields["from_amount"].widget = ArbitraryDecimalDisplayNumberInput() - self.form.fields["date_start"].widget = AirDatePickerInput(user=user) - self.form.fields["date_end"].widget = AirDatePickerInput(user=user) + self.form.fields["date_start"].widget = AirDatePickerInput() + self.form.fields["date_end"].widget = AirDatePickerInput() diff --git a/app/apps/transactions/forms.py b/app/apps/transactions/forms.py index 27842a9..2878755 100644 --- a/app/apps/transactions/forms.py +++ b/app/apps/transactions/forms.py @@ -86,7 +86,7 @@ class TransactionForm(forms.ModelForm): "account": TomSelect(clear_button=False, group_by="group"), } - def __init__(self, *args, user=None, **kwargs): + 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 @@ -177,7 +177,7 @@ class TransactionForm(forms.ModelForm): ) self.fields["reference_date"].required = False - self.fields["date"].widget = AirDatePickerInput(clear_button=False, user=user) + self.fields["date"].widget = AirDatePickerInput(clear_button=False) if self.instance and self.instance.pk: decimal_places = self.instance.account.currency.decimal_places @@ -333,7 +333,7 @@ class TransferForm(forms.Form): label=_("Notes"), ) - def __init__(self, *args, user=None, **kwargs): + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper = FormHelper() @@ -402,7 +402,7 @@ class TransferForm(forms.Form): self.fields["from_amount"].widget = ArbitraryDecimalDisplayNumberInput() self.fields["to_amount"].widget = ArbitraryDecimalDisplayNumberInput() - self.fields["date"].widget = AirDatePickerInput(clear_button=False, user=user) + self.fields["date"].widget = AirDatePickerInput(clear_button=False) def clean(self): cleaned_data = super().clean() @@ -515,7 +515,7 @@ class InstallmentPlanForm(forms.ModelForm): "notes": forms.Textarea(attrs={"rows": 3}), } - def __init__(self, *args, user=None, **kwargs): + 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 @@ -572,9 +572,7 @@ class InstallmentPlanForm(forms.ModelForm): ) self.fields["installment_amount"].widget = ArbitraryDecimalDisplayNumberInput() - self.fields["start_date"].widget = AirDatePickerInput( - clear_button=False, user=user - ) + self.fields["start_date"].widget = AirDatePickerInput(clear_button=False) if self.instance and self.instance.pk: self.helper.layout.append( @@ -762,7 +760,7 @@ class RecurringTransactionForm(forms.ModelForm): ), } - def __init__(self, *args, user=None, **kwargs): + 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 @@ -819,10 +817,8 @@ class RecurringTransactionForm(forms.ModelForm): ) self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput() - self.fields["start_date"].widget = AirDatePickerInput( - clear_button=False, user=user - ) - self.fields["end_date"].widget = AirDatePickerInput(user=user) + self.fields["start_date"].widget = AirDatePickerInput(clear_button=False) + self.fields["end_date"].widget = AirDatePickerInput() if self.instance and self.instance.pk: self.helper.layout.append( diff --git a/app/apps/transactions/views/installment_plans.py b/app/apps/transactions/views/installment_plans.py index c437a05..f292759 100644 --- a/app/apps/transactions/views/installment_plans.py +++ b/app/apps/transactions/views/installment_plans.py @@ -81,7 +81,7 @@ def installment_plan_transactions(request, installment_plan_id): @require_http_methods(["GET", "POST"]) def installment_plan_add(request): if request.method == "POST": - form = InstallmentPlanForm(request.POST, user=request.user) + form = InstallmentPlanForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Installment Plan added successfully")) @@ -93,7 +93,7 @@ def installment_plan_add(request): }, ) else: - form = InstallmentPlanForm(user=request.user) + form = InstallmentPlanForm() return render( request, @@ -109,9 +109,7 @@ def installment_plan_edit(request, installment_plan_id): installment_plan = get_object_or_404(InstallmentPlan, id=installment_plan_id) if request.method == "POST": - form = InstallmentPlanForm( - request.POST, instance=installment_plan, user=request.user - ) + form = InstallmentPlanForm(request.POST, instance=installment_plan) if form.is_valid(): form.save() messages.success(request, _("Installment Plan updated successfully")) @@ -123,7 +121,7 @@ def installment_plan_edit(request, installment_plan_id): }, ) else: - form = InstallmentPlanForm(instance=installment_plan, user=request.user) + form = InstallmentPlanForm(instance=installment_plan) return render( request, diff --git a/app/apps/transactions/views/recurring_transactions.py b/app/apps/transactions/views/recurring_transactions.py index 7b59fe3..f3a4338 100644 --- a/app/apps/transactions/views/recurring_transactions.py +++ b/app/apps/transactions/views/recurring_transactions.py @@ -106,7 +106,7 @@ def recurring_transaction_transactions(request, recurring_transaction_id): @require_http_methods(["GET", "POST"]) def recurring_transaction_add(request): if request.method == "POST": - form = RecurringTransactionForm(request.POST, user=request.user) + form = RecurringTransactionForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Recurring Transaction added successfully")) @@ -118,7 +118,7 @@ def recurring_transaction_add(request): }, ) else: - form = RecurringTransactionForm(user=request.user) + form = RecurringTransactionForm() return render( request, @@ -136,9 +136,7 @@ def recurring_transaction_edit(request, recurring_transaction_id): ) if request.method == "POST": - form = RecurringTransactionForm( - request.POST, instance=recurring_transaction, user=request.user - ) + form = RecurringTransactionForm(request.POST, instance=recurring_transaction) if form.is_valid(): form.save() messages.success(request, _("Recurring Transaction updated successfully")) @@ -150,9 +148,7 @@ def recurring_transaction_edit(request, recurring_transaction_id): }, ) else: - form = RecurringTransactionForm( - instance=recurring_transaction, user=request.user - ) + form = RecurringTransactionForm(instance=recurring_transaction) return render( request, diff --git a/app/apps/transactions/views/transactions.py b/app/apps/transactions/views/transactions.py index f1d1cb7..33156de 100644 --- a/app/apps/transactions/views/transactions.py +++ b/app/apps/transactions/views/transactions.py @@ -44,7 +44,7 @@ def transaction_add(request): ).date() if request.method == "POST": - form = TransactionForm(request.POST, user=request.user) + form = TransactionForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Transaction added successfully")) @@ -55,7 +55,6 @@ def transaction_add(request): ) else: form = TransactionForm( - user=request.user, initial={ "date": expected_date, "type": transaction_type, @@ -84,13 +83,12 @@ def transaction_simple_add(request): ).date() if request.method == "POST": - form = TransactionForm(request.POST, user=request.user) + form = TransactionForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Transaction added successfully")) form = TransactionForm( - user=request.user, initial={ "date": expected_date, "type": transaction_type, @@ -99,7 +97,6 @@ def transaction_simple_add(request): else: form = TransactionForm( - user=request.user, initial={ "date": expected_date, "type": transaction_type, @@ -120,7 +117,7 @@ def transaction_edit(request, transaction_id, **kwargs): transaction = get_object_or_404(Transaction, id=transaction_id) if request.method == "POST": - form = TransactionForm(request.POST, user=request.user, instance=transaction) + form = TransactionForm(request.POST, instance=transaction) if form.is_valid(): form.save() messages.success(request, _("Transaction updated successfully")) @@ -130,7 +127,7 @@ def transaction_edit(request, transaction_id, **kwargs): headers={"HX-Trigger": "updated, hide_offcanvas"}, ) else: - form = TransactionForm(instance=transaction, user=request.user) + form = TransactionForm(instance=transaction) return render( request, @@ -152,7 +149,7 @@ def transactions_bulk_edit(request): count = transactions.count() if request.method == "POST": - form = BulkEditTransactionForm(request.POST, user=request.user) + form = BulkEditTransactionForm(request.POST) if form.is_valid(): # Apply changes from the form to all selected transactions for transaction in transactions: @@ -184,9 +181,7 @@ def transactions_bulk_edit(request): headers={"HX-Trigger": "updated, hide_offcanvas"}, ) else: - form = BulkEditTransactionForm( - initial={"is_paid": None, "type": None}, user=request.user - ) + form = BulkEditTransactionForm(initial={"is_paid": None, "type": None}) context = { "form": form, @@ -276,7 +271,7 @@ def transactions_transfer(request): ).date() if request.method == "POST": - form = TransferForm(request.POST, user=request.user) + form = TransferForm(request.POST) if form.is_valid(): form.save() messages.success(request, _("Transfer added successfully")) @@ -290,7 +285,6 @@ def transactions_transfer(request): "reference_date": expected_date, "date": expected_date, }, - user=request.user, ) return render(request, "transactions/fragments/transfer.html", {"form": form}) @@ -319,7 +313,7 @@ def transaction_pay(request, transaction_id): @login_required @require_http_methods(["GET"]) def transaction_all_index(request): - f = TransactionsFilter(request.GET, user=request.user) + f = TransactionsFilter(request.GET) return render(request, "transactions/pages/transactions.html", {"filter": f}) @@ -341,7 +335,7 @@ def transaction_all_list(request): transactions = default_order(transactions, order=order) - f = TransactionsFilter(request.GET, user=request.user, queryset=transactions) + f = TransactionsFilter(request.GET, queryset=transactions) page_number = request.GET.get("page", 1) paginator = Paginator(f.qs, 100) @@ -371,7 +365,7 @@ def transaction_all_summary(request): "installment_plan", ).all() - f = TransactionsFilter(request.GET, user=request.user, queryset=transactions) + f = TransactionsFilter(request.GET, queryset=transactions) currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True) currency_percentages = calculate_percentage_distribution(currency_data)