starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-04-21 16:21:32 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

feat: another batch of fixes

Browse Source
This commit is contained in:
Herculino Trotta
2025-11-02 03:03:22 -03:00
parent a63367a772
commit 89b2d0118d
30 changed files with 208 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/apps/accounts/forms.py
View File

@@ -154,8 +154,8 @@ class AccountBalanceForm(forms.Form):
self.helper.layout = Layout(
"new_balance",
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
Field("account_id"),

4
app/apps/currencies/forms.py
View File

@@ -131,8 +131,8 @@ class ExchangeRateServiceForm(forms.ModelForm):
Switch("singleton"),
"api_key",
Row(
Column("interval_type", css_class="md:col-span-6"),
Column("fetch_interval", css_class="md:col-span-6"),
Column("interval_type"),
Column("fetch_interval"),
),
"target_currencies",
"target_accounts",

24
app/apps/dca/forms.py
View File

@@ -34,8 +34,8 @@ class DCAStrategyForm(forms.ModelForm):
self.helper.layout = Layout(
"name",
Row(
Column("payment_currency", css_class="md:col-span-6"),
Column("target_currency", css_class="md:col-span-6"),
Column("payment_currency"),
Column("target_currency"),
),
"notes",
)
@@ -153,8 +153,8 @@ class DCAEntryForm(forms.ModelForm):
self.helper.layout = Layout(
"date",
Row(
Column("amount_paid", css_class="md:col-span-6"),
Column("amount_received", css_class="md:col-span-6"),
Column("amount_paid"),
Column("amount_received"),
),
"notes",
BS5Accordion(
@@ -166,17 +166,11 @@ class DCAEntryForm(forms.ModelForm):
Row(
Column(
"from_account",
css_class="form-group",
),
css_class="form-row",
),
Row(
Column(
"from_category",
css_class="md:col-span-6 mb-0",
),
Column("from_tags", css_class="md:col-span-6 mb-0"),
css_class="form-row",
Column("from_category"),
Column("from_tags"),
),
),
css_class="p-1 mx-1 my-3 border rounded-3",
@@ -188,12 +182,10 @@ class DCAEntryForm(forms.ModelForm):
"to_account",
css_class="form-group",
),
css_class="form-row",
),
Row(
Column("to_category", css_class="md:col-span-6 mb-0"),
Column("to_tags", css_class="md:col-span-6 mb-0"),
css_class="form-row",
Column("to_category"),
Column("to_tags"),
),
),
css_class="p-1 mx-1 my-3 border rounded-3",

12
app/apps/insights/forms.py
View File

@@ -58,8 +58,8 @@ class MonthRangeForm(forms.Form):
self.helper.layout = Layout(
Row(
Column("month_from", css_class="md:col-span-6"),
Column("month_to", css_class="md:col-span-6"),
Column("month_from"),
Column("month_to"),
),
)
@@ -81,8 +81,8 @@ class YearRangeForm(forms.Form):
self.helper.layout = Layout(
Row(
Column("year_from", css_class="md:col-span-6"),
Column("year_to", css_class="md:col-span-6"),
Column("year_from"),
Column("year_to"),
),
)
@@ -104,8 +104,8 @@ class DateRangeForm(forms.Form):
self.helper.layout = Layout(
Row(
Column("date_from", css_class="md:col-span-6"),
Column("date_to", css_class="md:col-span-6"),
Column("date_from"),
Column("date_to"),
css_class="mb-0",
),
)

8
app/apps/transactions/filters.py
View File

@@ -158,13 +158,13 @@ class TransactionsFilter(django_filters.FilterSet):
Field("description"),
Row(Column("date_start"), Column("date_end")),
Row(
Column("reference_date_start", css_class="md:col-span-6 mb-0"),
Column("reference_date_end", css_class="md:col-span-6 mb-0"),
Column("reference_date_start"),
Column("reference_date_end"),
css_class="form-row",
),
Row(
Column("from_amount", css_class="md:col-span-6 mb-0"),
Column("to_amount", css_class="md:col-span-6 mb-0"),
Column("from_amount"),
Column("to_amount"),
css_class="form-row",
),
Field("account", size=1),

88
app/apps/transactions/forms.py
View File

@@ -133,20 +133,20 @@ class TransactionForm(forms.ModelForm):
),
Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
Row(
Column("account", css_class="md:col-span-6 mb-0"),
Column("entities", css_class="md:col-span-6 mb-0"),
Column("account"),
Column("entities"),
css_class="form-row",
),
Row(
Column(Field("date"), css_class="md:col-span-6 mb-0"),
Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
Column(Field("date")),
Column(Field("reference_date")),
css_class="form-row",
),
"description",
Field("amount", inputmode="decimal"),
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
"notes",
@@ -163,8 +163,8 @@ class TransactionForm(forms.ModelForm):
Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
"account",
Row(
Column(Field("date"), css_class="md:col-span-6 mb-0"),
Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
Column(Field("date")),
Column(Field("reference_date")),
css_class="form-row",
),
"description",
@@ -174,8 +174,8 @@ class TransactionForm(forms.ModelForm):
_("More"),
"entities",
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
"notes",
@@ -349,15 +349,15 @@ class QuickTransactionForm(forms.ModelForm):
"name",
HTML("<hr />"),
Row(
Column("account", css_class="md:col-span-6 mb-0"),
Column("entities", css_class="md:col-span-6 mb-0"),
Column("account"),
Column("entities"),
css_class="form-row",
),
"description",
Field("amount", inputmode="decimal"),
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
"notes",
@@ -480,20 +480,20 @@ class BulkEditTransactionForm(forms.Form):
template="transactions/widgets/unselectable_paid_toggle_button.html",
),
Row(
Column("account", css_class="md:col-span-6 mb-0"),
Column("entities", css_class="md:col-span-6 mb-0"),
Column("account"),
Column("entities"),
css_class="form-row",
),
Row(
Column(Field("date"), css_class="md:col-span-6 mb-0"),
Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
Column(Field("date")),
Column(Field("reference_date")),
css_class="form-row",
),
"description",
Field("amount", inputmode="decimal"),
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
"notes",
@@ -599,40 +599,30 @@ class TransferForm(forms.Form):
self.helper.layout = Layout(
Row(
Column(Field("date"), css_class="md:col-span-6 mb-0"),
Column(Field("date")),
Column(
Field("reference_date"),
css_class="md:col-span-6 mb-0",
),
css_class="form-row",
),
Field("description"),
Field("notes"),
Switch("mute"),
Row(
Column(
"from_account",
css_class="md:col-span-6",
),
Column(
Field("from_amount"),
css_class="md:col-span-6",
),
Column("from_category", css_class="md:col-span-6"),
Column("from_tags", css_class="md:col-span-6"),
Column("from_account"),
Column(Field("from_amount")),
Column("from_category"),
Column("from_tags"),
css_class="bg-base-200 rounded-box p-4 border-base-content/60 border mb-3",
),
Row(
Column(
"to_account",
css_class="md:col-span-6 mb-0",
),
Column(
Field("to_amount"),
css_class="md:col-span-6 mb-0",
),
Column("to_category", css_class="md:col-span-6 mb-0"),
Column("to_tags", css_class="md:col-span-6 mb-0"),
Column("to_category"),
Column("to_tags"),
css_class="bg-base-200 rounded-box p-4 border-base-content/60 border mb-3",
),
FormActions(
@@ -824,8 +814,8 @@ class InstallmentPlanForm(forms.ModelForm):
template="transactions/widgets/income_expense_toggle_buttons.html",
),
Row(
Column("account", css_class="md:col-span-6 mb-0"),
Column("entities", css_class="md:col-span-6 mb-0"),
Column("account"),
Column("entities"),
css_class="form-row",
),
"description",
@@ -833,8 +823,8 @@ class InstallmentPlanForm(forms.ModelForm):
"notes",
Switch("add_notes_to_transaction"),
Row(
Column("number_of_installments", css_class="md:col-span-6 mb-0"),
Column("installment_start", css_class="md:col-span-6 mb-0"),
Column("number_of_installments"),
Column("installment_start"),
css_class="form-row",
),
Row(
@@ -845,8 +835,8 @@ class InstallmentPlanForm(forms.ModelForm):
),
"installment_amount",
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
)
@@ -1086,23 +1076,23 @@ class RecurringTransactionForm(forms.ModelForm):
template="transactions/widgets/income_expense_toggle_buttons.html",
),
Row(
Column("account", css_class="md:col-span-6 mb-0"),
Column("entities", css_class="md:col-span-6 mb-0"),
Column("account"),
Column("entities"),
css_class="form-row",
),
"description",
Switch("add_description_to_transaction"),
"amount",
Row(
Column("category", css_class="md:col-span-6 mb-0"),
Column("tags", css_class="md:col-span-6 mb-0"),
Column("category"),
Column("tags"),
css_class="form-row",
),
"notes",
Switch("add_notes_to_transaction"),
Row(
Column("start_date", css_class="md:col-span-6 mb-0"),
Column("reference_date", css_class="md:col-span-6 mb-0"),
Column("start_date"),
Column("reference_date"),
css_class="form-row",
),
Row(

10
app/apps/users/forms.py
View File

@@ -53,7 +53,7 @@ class LoginForm(AuthenticationForm):
self.helper.layout = Layout(
"username",
"password",
Submit("Submit", "Login", css_class="btn btn-primary w-100"),
Submit("Submit", "Login", css_class="w-full mt-3"),
)
@@ -199,8 +199,8 @@ class UserUpdateForm(forms.ModelForm):
# Define the layout using Crispy Forms, including the new fields
self.helper.layout = Layout(
Row(
Column("first_name", css_class="md:col-span-6"),
Column("last_name", css_class="md:col-span-6"),
Column("first_name"),
Column("last_name"),
css_class="row",
),
Field("email"),
@@ -362,8 +362,8 @@ class UserAddForm(UserCreationForm):
self.helper.layout = Layout(
Field("email"),
Row(
Column("first_name", css_class="md:col-span-6"),
Column("last_name", css_class="md:col-span-6"),
Column("first_name"),
Column("last_name"),
css_class="row",
),
# UserCreationForm provides 'password1' and 'password2' fields