wbcrm 1.51.0__py2.py3-none-any.whl → 1.51.2__py2.py3-none-any.whl

wbcrm/filters/activities.py

@@ -4,10 +4,11 @@ import django_filters
 from django.contrib.auth import get_user_model
 from django.db.models import Exists, OuterRef, Q
 from django.db.models.query import QuerySet
+from django.utils import timezone
 from django.utils.translation import gettext_lazy
 from django.utils.translation import gettext_lazy as _
 from dynamic_preferences.registries import global_preferences_registry
-from psycopg.types.range import TimestamptzRange
+from psycopg.types.range import DateRange, TimestamptzRange
 from wbcore import filters as wb_filters
 from wbcore.contrib.agenda.filters import CalendarItemPeriodBaseFilterSet
 from wbcore.contrib.agenda.models import CalendarItem
@@ -160,10 +161,17 @@ class ActivityFilter(ActivityBaseFilterSet):
         }
 
 
+def default_activitychart_get_params(*args, **kwargs):
+    current_last_week_date_start = timezone.now().date() - timedelta(days=7)
+    current_next_week_date_end = timezone.now().date() + timedelta(days=7)
+    return DateRange(current_last_week_date_start, current_next_week_date_end)
+
+
 class ActivityChartFilter(ActivityBaseFilterSet):
     status = wb_filters.MultipleChoiceFilter(
         label=gettext_lazy("Status"), choices=Activity.Status.choices, widget=django_filters.widgets.CSVWidget
     )
+    period = wb_filters.DateTimeRangeFilter(label="Period", required=True, initial=default_activitychart_get_params)
 
     class Meta:
         model = Activity