django-smartbase-admin 1.0.41__tar.gz → 1.0.43__tar.gz

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 1.0.41
+Version: 1.0.43
 Summary: 
 Home-page: https://smartbase-sk.github.io/django-smartbase-admin-docs/
 License: MIT

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "1.0.41"
+version = "1.0.43"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/src/django_smartbase_admin/admin/admin_base.py

@@ -71,7 +71,7 @@ except ImportError:
 
 postrgres_enabled = None
 try:
-    from django.contrib.postgres.forms import SimpleArrayField
+    from django.contrib.postgres.forms import SimpleArrayField, DateTimeRangeField
 
     postrgres_enabled = True
 except ImportError:
@@ -118,6 +118,7 @@ from django_smartbase_admin.admin.widgets import (
     SBAdminMultipleChoiceInlineWidget,
     SBAdminColorWidget,
     SBAdminFilerFileWidget,
+    SBAdminDateTimeRangeWidget,
 )
 from django_smartbase_admin.engine.admin_base_view import (
     SBAdminBaseListView,
@@ -177,6 +178,7 @@ class SBAdminFormFieldWidgetsMixin:
     }
     if postrgres_enabled:
         formfield_widgets[SimpleArrayField] = SBAdminArrayWidget
+        formfield_widgets[DateTimeRangeField] = SBAdminDateTimeRangeWidget
     if django_cms_attributes:
         formfield_widgets[AttributesFormField] = SBAdminAttributesWidget
     if color_field_enabled:
@@ -1064,7 +1066,7 @@ class SBAdminInline(
 
     def register_autocomplete_views(self, request) -> None:
         super().register_autocomplete_views(request)
-        form_class = self.get_formset(request, self.model()).form
+        form_class = self.get_formset(request, None).form
         self.initialize_form_class(form_class, request)
         form_class()
 

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/src/django_smartbase_admin/admin/widgets.py

@@ -11,6 +11,7 @@ from django.contrib.admin.widgets import (
     ForeignKeyRawIdWidget,
 )
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
+from django.contrib.postgres.forms import RangeWidget
 from django.core.exceptions import (
     FieldDoesNotExist,
     ImproperlyConfigured,
@@ -41,7 +42,7 @@ from django_smartbase_admin.services.thread_local import SBAdminThreadLocalServi
 from django_smartbase_admin.templatetags.sb_admin_tags import (
     SBAdminJSONEncoder,
 )
-from django_smartbase_admin.utils import is_modal
+from django_smartbase_admin.utils import is_modal, convert_django_to_flatpickr_format
 
 try:
     # Django >= 5.0
@@ -261,7 +262,9 @@ class SBAdminDateWidget(SBAdminBaseWidget, forms.DateInput):
                 "flatpickrOptions": {
                     "dateFormat": "Y-m-d",
                     "altInput": True,
-                    "altFormat": get_format("SHORT_DATE_FORMAT"),
+                    "altFormat": convert_django_to_flatpickr_format(
+                        get_format("SHORT_DATE_FORMAT")
+                    ),
                 },
             },
             cls=SBAdminJSONEncoder,
@@ -286,9 +289,30 @@ class SBAdminTimeWidget(SBAdminBaseWidget, forms.TimeInput):
 class SBAdminDateTimeWidget(SBAdminBaseWidget, forms.DateTimeInput):
     template_name = "sb_admin/widgets/datetime.html"
 
-    def __init__(self, form_field=None, attrs=None):
+    def __init__(self, form_field=None, attrs=None, format=None):
         super().__init__(
-            form_field, attrs={"class": "input js-datetimepicker", **(attrs or {})}
+            form_field,
+            format="%Y-%m-%d %H:%M",
+            attrs={
+                "class": "input js-datetimepicker",
+                "data-sbadmin-datepicker": self.get_data(),
+                "placeholder": get_datetime_placeholder()["date"],
+                **(attrs or {}),
+            },
+        )
+
+    def get_data(self):
+        return json.dumps(
+            {
+                "flatpickrOptions": {
+                    "dateFormat": "Y-m-d H:i",
+                    "altInput": True,
+                    "altFormat": convert_django_to_flatpickr_format(
+                        get_format("SHORT_DATETIME_FORMAT")
+                    ),
+                },
+            },
+            cls=SBAdminJSONEncoder,
         )
 
 
@@ -965,3 +989,13 @@ class SBAdminTreeWidget(SBAdminTreeWidgetMixin, SBAdminAutocompleteWidget):
             if input_value in children_ids:
                 raise ValidationError(_("Cannot set parent to it's own child"))
         return parsed_value
+
+
+class SBAdminDateTimeRangeWidget(SBAdminBaseWidget, RangeWidget):
+    template_name = "sb_admin/widgets/multiwidget.html"
+
+    def __init__(self, form_field=None, attrs=None):
+        super().__init__(
+            form_field,
+            base_widget=SBAdminDateTimeWidget(),
+        )

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/src/django_smartbase_admin/engine/admin_base_view.py

@@ -240,6 +240,7 @@ class SBAdminBaseView(object):
             "view_id": self.get_id(),
             "configuration": request.request_data.configuration,
             "request_data": request.request_data,
+            "admin_title": request.request_data.configuration.get_admin_title(),
             "add_label": self.get_add_label(request, object_id),
             "change_label": self.get_change_label(request, object_id),
             "DETAIL_STRUCTURE_RIGHT_CLASS": DETAIL_STRUCTURE_RIGHT_CLASS,

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/src/django_smartbase_admin/engine/configuration.py

@@ -186,6 +186,7 @@ class SBAdminRoleConfiguration(metaclass=Singleton):
     filters_version = FilterVersions.FILTERS_VERSION_1
     default_color_scheme = ColorScheme.AUTO
     login_view_class = LoginView
+    admin_title = "SBAdmin"
 
     def __init__(
         self,
@@ -196,6 +197,7 @@ class SBAdminRoleConfiguration(metaclass=Singleton):
         filters_version=None,
         default_color_scheme=None,
         login_view_class=None,
+        admin_title=None,
     ) -> None:
         super().__init__()
         self.default_view = default_view or self.default_view or []
@@ -207,6 +209,7 @@ class SBAdminRoleConfiguration(metaclass=Singleton):
         self.filters_version = filters_version or self.filters_version
         self.default_color_scheme = default_color_scheme or self.default_color_scheme
         self.login_view_class = login_view_class or self.login_view_class
+        self.admin_title = admin_title or self.admin_title
 
     def init_registered_views(self):
         registered_views = []
@@ -386,3 +389,6 @@ class SBAdminRoleConfiguration(metaclass=Singleton):
         request,
     ) -> bool:
         return not is_modal(request)
+
+    def get_admin_title(self):
+        return self.admin_title

{django_smartbase_admin-1.0.41 → django_smartbase_admin-1.0.43}/src/django_smartbase_admin/engine/dashboard.py

@@ -340,12 +340,14 @@ class SBAdminDashboardChartWidget(SBAdminDashboardWidget):
             sub_widget_data[sub_widget.get_id()] = sub_widget.get_data(
                 request, sub_widget_qs
             )
+        active_sub_widget = self.get_active_sub_widget(request)
+        dataset_label = active_sub_widget.title if active_sub_widget else self.name
         return_data = {
             "main": {
                 "labels": labels,
                 "datasets": [
                     {
-                        "label": self.name,
+                        "label": dataset_label,
                         "data": dataset_data,
                         **self.get_dataset_options(request),
                     }