From 412069b9f5af73660c2c366332261b55fd30a6fd Mon Sep 17 00:00:00 2001
From: long2ice <long2ice@gmail.com>
Date: Sat, 22 May 2021 13:12:04 +0800
Subject: [PATCH] Fix datetime filter.

---
 CHANGELOG.md                                  |  1 +
 .../templates/widgets/filters/datetime.html   |  5 ++-
 fastapi_admin/widgets/filters.py              | 40 ++++++++++++++-----
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e75d7fc..5628bf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Add `column_attributes`.
 - Remove `can_create` and add `get_toolbar_actions`.
 - Add `DistinctColumn` filter.
+- Fix datetime filter.
 
 ### 1.0.0
 
diff --git a/fastapi_admin/templates/widgets/filters/datetime.html b/fastapi_admin/templates/widgets/filters/datetime.html
index 9077458..22aef6d 100644
--- a/fastapi_admin/templates/widgets/filters/datetime.html
+++ b/fastapi_admin/templates/widgets/filters/datetime.html
@@ -5,7 +5,8 @@
     <div class="d-inline-block">
         <input {% if not null %}
             required
-        {% endif %} class="form-control" type="text" id="{{ name }}" name="{{ name }}" value="{{ value }}">
+        {% endif %} class="form-control" type="text" id="{{ name }}" name="{{ name }}" value="{{ value }}"
+            placeholder="{{ placeholder }}" size="30">
     </div>
 </div>
 <script>
@@ -14,7 +15,7 @@
         let format = '{{ format }}';
         let option = {
             autoUpdateInput: false,
-            timePicker: true,
+            timePicker: {% if not date %}true{% else %}false{% endif%},
             timePicker24Hour: true,
             locale: {
                 format: format,
diff --git a/fastapi_admin/widgets/filters.py b/fastapi_admin/widgets/filters.py
index f743961..dfd7257 100644
--- a/fastapi_admin/widgets/filters.py
+++ b/fastapi_admin/widgets/filters.py
@@ -1,7 +1,8 @@
 import abc
 from enum import Enum as EnumCLS
-from typing import Any, Optional, Type
+from typing import Any, Optional, Type, Tuple
 
+import pendulum
 from starlette.requests import Request
 from tortoise import Model
 from tortoise.queryset import QuerySet
@@ -53,7 +54,12 @@ class Datetime(Filter):
     template = "widgets/filters/datetime.html"
 
     def __init__(
-        self, name: str, label: str, format_: str = constants.DATE_FORMAT_MOMENT, null: bool = True
+        self,
+        name: str,
+        label: str,
+        format_: str = constants.DATETIME_FORMAT_MOMENT,
+        null: bool = True,
+        placeholder: str = "",
     ):
         """
         Datetime filter
@@ -61,23 +67,39 @@ class Datetime(Filter):
         :param label:
         :param format_: the format of moment.js
         """
-        super().__init__(name + "__range", label, null=null, format=format_)
+        super().__init__(
+            name + "__range", label, null=null, format=format_, placeholder=placeholder
+        )
 
     async def parse_value(self, request: Request, value: Optional[str]):
-        return value.split(" - ")
+        if value:
+            ranges = value.split(" - ")
+            return pendulum.parse(ranges[0]), pendulum.parse(ranges[1])
 
-    async def render(self, request: Request, value: Any):
+    async def render(self, request: Request, value: Tuple[pendulum.DateTime, pendulum.DateTime]):
+        format_ = self.context.get('format')
         if value is not None:
-            value = " - ".join(value)
+            value = (
+                value[0].format(format_)
+                + " - "
+                + value[1].format(format_)
+            )
         return await super().render(request, value)
 
 
 class Date(Datetime):
     def __init__(
-        self, name: str, label: str, format_: str = constants.DATE_FORMAT_MOMENT, null: bool = True
+        self,
+        name: str,
+        label: str,
+        format_: str = constants.DATE_FORMAT_MOMENT,
+        null: bool = True,
+        placeholder: str = "",
     ):
-        super().__init__(name=name, label=label, format_=format_, null=null)
-
+        super().__init__(
+            name=name, label=label, format_=format_, null=null, placeholder=placeholder
+        )
+        self.context.update(date=True)
 
 class Select(Filter):
     template = "widgets/filters/select.html"