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.

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

adds date ranger picker widget #95

Merged
merged 1 commit into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<div class="acdhch-django-datepicker-start">
<label for="startDate">Start</label>
<input id="id_{{ name }}_0" name="{{ name }}_after" class="form-control" type="date" value="{{ value.0 }}"/>
<span id="{{ name }}_after_selected"></span>
</div>
<div class="acdhch-django-datepicker-end">
<label for="endDate">End</label>
<input id="id_{{ name }}_1" name="{{ name }}_before" class="form-control" class="form-control" type="date" value="{{ value.1 }}"/>
<span id="{{ name }}_before_selected"></span>
</div>


<script>
{% if attrs.min %}
var minValue = {{ attrs.min }};
var minValForm = document.getElementById("id_{{ name }}_0");
var startValue = minValForm.value;
{% endif %}
{% if attrs.max %}
var maxValue = {{ attrs.max }};
var maxValForm = document.getElementById("id_{{ name }}_1");
var endValue = maxValForm.value;
{% endif %}
</script>
14 changes: 14 additions & 0 deletions acdh_django_widgets/widgets.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import django_filters
from django.template.loader import render_to_string
from django.utils.safestring import mark_safe
import django_filters.widgets


class RangeSliderWidget(django_filters.widgets.RangeWidget):
Expand All @@ -23,3 +24,16 @@ def render(self, name, value, attrs=None, renderer=None):
context = {"name": name, "value": value, "attrs": self.attrs}
rendered = render_to_string(self.template_name, context)
return mark_safe(rendered)


class DateRangePickerWidget(django_filters.widgets.DateRangeWidget):
"""Renders date range input fields as date picker fields
"""
template_name = "acdh_django_widgets/range_datepicker_widget.html"

def render(self, name, value, attrs=None, renderer=None):
if value[0] is None:
value = [self.attrs.get("min", 0), self.attrs.get("max", 100)]
context = {"name": name, "value": value, "attrs": self.attrs}
rendered = render_to_string(self.template_name, context)
return mark_safe(rendered)
12 changes: 5 additions & 7 deletions archiv/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.contrib.postgres.search import SearchRank
from django.db.utils import ProgrammingError

from acdh_django_widgets.widgets import RangeSliderWidget
from acdh_django_widgets.widgets import RangeSliderWidget, DateRangePickerWidget

from .models import Court
from .models import CourtDecission
Expand Down Expand Up @@ -199,12 +199,10 @@ class CourtDecissionListFilter(django_filters.FilterSet):
url="archiv-ac:person-autocomplete", forward=["partial_legal_system"]
),
)
decission_date__year = django_filters.RangeFilter(
help_text="Year of Decision.",
decission_date = django_filters.DateFromToRangeFilter(
help_text=CourtDecission._meta.get_field("decission_date").help_text,
label=CourtDecission._meta.get_field("decission_date").verbose_name,
widget=RangeSliderWidget(
attrs={"min": "1900", "max": "2030", "hide_input_fileds": False}
),
widget=DateRangePickerWidget
)

def search_fulltext(self, queryset, field_name, value):
Expand Down Expand Up @@ -256,7 +254,7 @@ class Meta:
"ft_search",
"partial_legal_system",
"court",
"decission_date__year",
"decission_date",
"file_number",
"party",
"location",
Expand Down
2 changes: 1 addition & 1 deletion archiv/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def __init__(self, *args, **kwargs):
"ft_search",
"partial_legal_system",
"court",
"decission_date__year",
"decission_date",
"keyword",
"tag",
css_id="basic",
Expand Down