Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use native datepicker #120

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use native datepicker #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion silverstrike/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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(
Expand Down
5 changes: 5 additions & 0 deletions silverstrike/static/silverstrike/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion silverstrike/templates/silverstrike/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<link rel="manifest" href="{% url 'manifest' %}">
{% block stylesheets %}
{% endblock %}
<link rel="stylesheet" href="{% static 'silverstrike/css/style.css' %}">
<link rel="stylesheet" href="{% static 'vendor/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'vendor/css/font-awesome.min.css' %}">
<link rel="stylesheet" href="{% static 'vendor/css/AdminLTE.min.css' %}">
<link rel="stylesheet" href="{% static 'vendor/css/skin-blue-light.min.css' %}">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
<link rel="stylesheet" href="{% static 'silverstrike/css/style.css' %}">
<title>SilverStrike</title>
</head>
<body class="hold-transition skin-blue-light sidebar-mini">
Expand Down
23 changes: 6 additions & 17 deletions silverstrike/templates/silverstrike/export.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ <h3 class="box-title">{% trans 'Export' %}</h3>
{% csrf_token %}
<div class="form-group">
<label class="control-label col-sm-2" for="{{ form.start.id_for_label }}">{{ form.start.label }}</label>
<div class="col-sm-8">{{ form.start|add_class:"form-control date-input" }}</div>
<div class="col-sm-8">
<input id="id_start" class="form-control" type="date" name="start">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="{{ form.end.id_for_label }}">{{ form.end.label }}</label>
<div class="col-sm-8">{{ form.end|add_class:"form-control date-input" }}</div>
<div class="col-sm-8">
<input id="id_end" class="form-control" type="date" name="end">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="{{ form.accounts.id_for_label }}">{{ form.accounts.label }}</label>
Expand All @@ -40,19 +44,4 @@ <h3 class="box-title">{% trans 'Export' %}</h3>
</form>

</div>
{% endblock %}
{% block scripts %}
<script src="{% static 'vendor/js/bootstrap-datepicker.min.js' %}"></script>

<script>
$(function() {
$('.date-input').datepicker({
autoclose: true,
format: 'yyyy-mm-dd',
orientation: 'bottom'

});
$('.date-input').attr('autocomplete', 'off');
})
</script>
{% endblock %}
12 changes: 0 additions & 12 deletions silverstrike/templates/silverstrike/reconcile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,7 @@ <h3 class="box-title">{% trans 'Create reconcile transaction' %}</h3>
</div>
{% endblock %}

{% block stylesheets %}
<link rel="stylesheet" href="{% static 'vendor/css/bootstrap-datepicker.min.css' %}">
{% endblock %}

{% block scripts %}
<script src="{% static 'vendor/js/bootstrap-datepicker.min.js' %}"></script>
<script src="{% static 'vendor/js/bootstrap3-typeahead.min.js' %}"></script>

<script>
Expand All @@ -78,13 +73,6 @@ <h3 class="box-title">{% trans 'Create reconcile transaction' %}</h3>
changeEvent = e;
$('#amount-difference').text({{ account.balance }} - e.target.value);
});
$('#id_date').datepicker({
autoclose: true,
format: 'yyyy-mm-dd',
endDate: '0d',
orientation: 'bottom'
});
$('#id_date').attr('autocomplete', 'off');
})
</script>
{% endblock %}
19 changes: 0 additions & 19 deletions silverstrike/templates/silverstrike/recurringtransaction_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,4 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
</form>
</div>
</div>
{% endblock %}

{% block stylesheets %}
<link rel="stylesheet" href="{% static 'vendor/css/bootstrap-datepicker.min.css' %}">
{% endblock %}

{% block scripts %}
<script src="{% static 'vendor/js/bootstrap-datepicker.min.js' %}"></script>
<script>
$(function() {
$('#id_date').datepicker({
autoclose: true,
format: 'yyyy-mm-dd',
startDate: '0d',
orientation: 'bottom'
});
$('#id_date').attr('autocomplete', 'off');
})
</script>
{% endblock %}
16 changes: 2 additions & 14 deletions silverstrike/templates/silverstrike/transaction_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
<div class="form-group{% if form.date.errors %} has-error{% endif %}">
<label class="col-sm-2 control-label" for="{{ form.date.id_for_label }}">{{ form.date.label }}</label>
<div class="col-sm-8">
{{ form.date|add_class:"form-control date-input" }}
{{ form.date|add_class:"form-control" }}
{% for error in form.date.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
Expand All @@ -81,7 +81,7 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
<div class="form-group{% if form.value_date.errors %} has-error{% endif %}">
<label class="col-sm-2 control-label" for="{{ form.value_date.id_for_label }}">{{ form.value_date.label }}</label>
<div class="col-sm-8">
{{ form.value_date|add_class:"form-control date-input" }}
{{ form.value_date|add_class:"form-control" }}
{% for error in form.value_date.errors %}
<span class="help-block">{{ error }}</span>
{% endfor %}
Expand Down Expand Up @@ -111,22 +111,11 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
</div>
{% endblock %}

{% block stylesheets %}
<link rel="stylesheet" href="{% static 'vendor/css/bootstrap-datepicker.min.css' %}">
{% endblock %}

{% block scripts %}
<script src="{% static 'vendor/js/bootstrap-datepicker.min.js' %}"></script>
<script src="{% static 'vendor/js/bootstrap3-typeahead.min.js' %}"></script>

<script>
$(function() {
$('.date-input').datepicker({
autoclose: true,
format: 'yyyy-mm-dd',
orientation: 'bottom'

});
if ($('input#id_src').length > 0) {
$.getJSON('{% url 'api_accounts' 'FOREIGN' %}').done(function (data) {
$('#id_src').typeahead({source: data});
Expand All @@ -137,7 +126,6 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
$('#id_dst').typeahead({source: data});
});
}
$('.date-input').attr('autocomplete', 'off');
})
</script>
{% endblock %}
6 changes: 1 addition & 5 deletions silverstrike/templates/silverstrike/transaction_split_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
</label>
<div class="col-sm-8">
{% if field|widget_type == 'dateinput' %}
{{ field|add_class:"form-control dateinput" }}
{{ field|add_class:"form-control" }}
{% else %}
{{ field|add_class:"form-control" }}
{% endif %}
Expand Down Expand Up @@ -69,11 +69,7 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
<td class="text-center">{{ field }}</td>
{% else %}
<td class="form-group{% if field.errors %} has-error{% endif %}">
{% if field|widget_type == 'dateinput' %}
{{ field|add_class:"form-control dateinput" }}
{% else %}
{{ field|add_class:"form-control" }}
{% endif %}
</td>
{% endif %}
{% endfor %}
Expand Down