diff --git a/silverstrike/forms.py b/silverstrike/forms.py index 32525d32..75e33577 100644 --- a/silverstrike/forms.py +++ b/silverstrike/forms.py @@ -80,11 +80,14 @@ class Meta: model = models.Transaction fields = ['title', 'src', 'dst', 'amount', 'date', 'value_date', 'category', 'notes'] + widgets = { + 'date': forms.DateInput(attrs={'type': 'date'}) + } amount = forms.DecimalField(max_digits=10, decimal_places=2, min_value=0.01) category = forms.ModelChoiceField( queryset=models.Category.objects.exclude(active=False).order_by('name'), required=False) - value_date = forms.DateField(required=False) + value_date = forms.DateField(required=False, widget=forms.DateInput(attrs={'type': 'date'})) src = forms.ModelChoiceField(queryset=models.Account.objects.filter( account_type=models.Account.AccountType.PERSONAL, active=True)) @@ -176,6 +179,9 @@ class Meta: model = models.RecurringTransaction fields = ['title', 'date', 'amount', 'src', 'dst', 'category', 'interval', 'multiplier', 'weekend_handling', 'usual_month_day'] + widgets = { + 'date': forms.DateInput(attrs={'type': 'date'}) + } def clean_amount(self): amount = self.cleaned_data['amount'] @@ -247,6 +253,9 @@ class SplitForm(forms.ModelForm): class Meta: model = models.Split fields = ['title', 'account', 'opposing_account', 'date', 'amount', 'category'] + widgets = { + 'date': forms.DateInput(attrs={'type': 'date'}) + } account = forms.ModelChoiceField(queryset=models.Account.objects.exclude( account_type=models.Account.AccountType.SYSTEM)) opposing_account = forms.ModelChoiceField(queryset=models.Account.objects.exclude( diff --git a/silverstrike/static/silverstrike/css/style.css b/silverstrike/static/silverstrike/css/style.css index 74208158..2a51c6e3 100644 --- a/silverstrike/static/silverstrike/css/style.css +++ b/silverstrike/static/silverstrike/css/style.css @@ -31,6 +31,11 @@ line-height: inherit !important; } +/* Fix for adminlte dateinput issue */ +input[type="date"].form-control { + line-height: unset; +} + /* fix for adminlte issue https://github.com/almasaeed2010/AdminLTE/issues/1607 */ @media (max-width: 767px) { .skin-blue-light .main-header .navbar .dropdown-menu li a { diff --git a/silverstrike/templates/silverstrike/base.html b/silverstrike/templates/silverstrike/base.html index 6e8b083a..03f82736 100644 --- a/silverstrike/templates/silverstrike/base.html +++ b/silverstrike/templates/silverstrike/base.html @@ -14,12 +14,12 @@ {% block stylesheets %} {% endblock %} - + SilverStrike diff --git a/silverstrike/templates/silverstrike/export.html b/silverstrike/templates/silverstrike/export.html index cbc97ec5..41b43639 100644 --- a/silverstrike/templates/silverstrike/export.html +++ b/silverstrike/templates/silverstrike/export.html @@ -21,11 +21,15 @@

{% trans 'Export' %}

{% csrf_token %}
-
{{ form.start|add_class:"form-control date-input" }}
+
+ +
-
{{ form.end|add_class:"form-control date-input" }}
+
+ +
@@ -40,19 +44,4 @@

{% trans 'Export' %}

-{% endblock %} -{% block scripts %} - - - {% endblock %} \ No newline at end of file diff --git a/silverstrike/templates/silverstrike/reconcile.html b/silverstrike/templates/silverstrike/reconcile.html index b9615e8f..29da29b4 100644 --- a/silverstrike/templates/silverstrike/reconcile.html +++ b/silverstrike/templates/silverstrike/reconcile.html @@ -63,12 +63,7 @@

{% trans 'Create reconcile transaction' %}

{% endblock %} -{% block stylesheets %} - -{% endblock %} - {% block scripts %} - {% endblock %} diff --git a/silverstrike/templates/silverstrike/recurringtransaction_form.html b/silverstrike/templates/silverstrike/recurringtransaction_form.html index a87eb662..4ade35c1 100644 --- a/silverstrike/templates/silverstrike/recurringtransaction_form.html +++ b/silverstrike/templates/silverstrike/recurringtransaction_form.html @@ -58,23 +58,4 @@

{% trans 'Transaction Details' %}

-{% endblock %} - -{% block stylesheets %} - -{% endblock %} - -{% block scripts %} - - {% endblock %} \ No newline at end of file diff --git a/silverstrike/templates/silverstrike/transaction_edit.html b/silverstrike/templates/silverstrike/transaction_edit.html index fb584bf3..6b44c839 100644 --- a/silverstrike/templates/silverstrike/transaction_edit.html +++ b/silverstrike/templates/silverstrike/transaction_edit.html @@ -72,7 +72,7 @@

{% trans 'Transaction Details' %}

- {{ form.date|add_class:"form-control date-input" }} + {{ form.date|add_class:"form-control" }} {% for error in form.date.errors %} {{ error }} {% endfor %} @@ -81,7 +81,7 @@

{% trans 'Transaction Details' %}

- {{ form.value_date|add_class:"form-control date-input" }} + {{ form.value_date|add_class:"form-control" }} {% for error in form.value_date.errors %} {{ error }} {% endfor %} @@ -111,22 +111,11 @@

{% trans 'Transaction Details' %}

{% endblock %} -{% block stylesheets %} - -{% endblock %} - {% block scripts %} - {% endblock %} \ No newline at end of file diff --git a/silverstrike/templates/silverstrike/transaction_split_form.html b/silverstrike/templates/silverstrike/transaction_split_form.html index 51c0b4fd..24025ac4 100644 --- a/silverstrike/templates/silverstrike/transaction_split_form.html +++ b/silverstrike/templates/silverstrike/transaction_split_form.html @@ -39,7 +39,7 @@

{% trans 'Transaction Details' %}

{% if field|widget_type == 'dateinput' %} - {{ field|add_class:"form-control dateinput" }} + {{ field|add_class:"form-control" }} {% else %} {{ field|add_class:"form-control" }} {% endif %} @@ -69,11 +69,7 @@

{% trans 'Transaction Details' %}

{{ field }} {% else %} - {% if field|widget_type == 'dateinput' %} - {{ field|add_class:"form-control dateinput" }} - {% else %} {{ field|add_class:"form-control" }} - {% endif %} {% endif %} {% endfor %}