Skip to content

feat: date range widget #954

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

Closed
Closed
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
8 changes: 7 additions & 1 deletion src/unfold/admin.py
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@
from .widgets import (
SELECT_CLASSES,
UnfoldAdminBigIntegerFieldWidget,
UnfoldAdminDateTimeRangeWidget,
UnfoldAdminDecimalFieldWidget,
UnfoldAdminEmailInputWidget,
UnfoldAdminFileFieldWidget,
@@ -57,7 +58,11 @@
)

try:
from django.contrib.postgres.fields import ArrayField, IntegerRangeField
from django.contrib.postgres.fields import (
ArrayField,
DateTimeRangeField,
IntegerRangeField,
)
from django.contrib.postgres.search import SearchVectorField

HAS_PSYCOPG = True
@@ -102,6 +107,7 @@
ArrayField: {"widget": UnfoldAdminTextareaWidget},
SearchVectorField: {"widget": UnfoldAdminTextareaWidget},
IntegerRangeField: {"widget": UnfoldAdminIntegerRangeWidget},
DateTimeRangeField: {"widget": UnfoldAdminDateTimeRangeWidget},
}
)

22 changes: 22 additions & 0 deletions src/unfold/widgets.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from datetime import datetime
from typing import Any, Callable, Dict, Optional, Tuple, Union

from django.contrib.admin.options import VERTICAL
@@ -22,6 +23,7 @@
from django.forms import (
CheckboxInput,
CheckboxSelectMultiple,
DateTimeInput,
MultiWidget,
NullBooleanSelect,
NumberInput,
@@ -297,6 +299,26 @@ def decompress(self, value: Union[str, None]) -> Tuple[Optional[Callable], ...]:
return None, None


class UnfoldAdminDateTimeRangeWidget(MultiWidget):
template_name = "unfold/widgets/range.html"

def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
if attrs is None:
attrs = {}

attrs["class"] = " ".join(INPUT_CLASSES)
attrs["type"] = "datetime-local"

_widgets = (DateTimeInput(attrs=attrs), DateTimeInput(attrs=attrs))

super().__init__(_widgets, attrs)

def decompress(self, value: Union[str, None]) -> Tuple[Optional[datetime], ...]:
if value:
return value.lower, value.upper
return None, None


class UnfoldAdminEmailInputWidget(AdminEmailInputWidget):
def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})