wbcrm 1.51.0__tar.gz → 1.51.1__tar.gz

{wbcrm-1.51.0 → wbcrm-1.51.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.51.0
+Version: 1.51.1
 Summary: A workbench module that contains all the functionality related to a customer relationship management.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: django-eventtools==1.*

{wbcrm-1.51.0 → wbcrm-1.51.1}/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

{wbcrm-1.51.0 → wbcrm-1.51.1}/wbcrm/viewsets/activities.py

@@ -255,12 +255,12 @@ class ActivityChartModelViewSet(viewsets.ChartViewSet):
             df = pd.DataFrame(
                 queryset.values("type", "start_date", "end_date", "activity_type_color", "activity_type_title")
             )
-            df["start_date"] = df["start_date"].dt.floor("H")
-            df["end_date"] = df["end_date"].dt.ceil("H")
+            df["start_date"] = df["start_date"].dt.floor("h")
+            df["end_date"] = df["end_date"].dt.ceil("h")
             df = (
                 pd.concat(
                     [
-                        pd.DataFrame(index=pd.date_range(r.start_date, r.end_date, freq="1H")).assign(
+                        pd.DataFrame(index=pd.date_range(r.start_date, r.end_date, freq="1h")).assign(
                             type=r.type,
                             activity_type_color=r.activity_type_color,
                             activity_type_title=r.activity_type_title,
@@ -275,7 +275,7 @@ class ActivityChartModelViewSet(viewsets.ChartViewSet):
                 x="Period",
                 color="Type",
                 labels="Type",
-                nbins=len(pd.date_range(df["Period"].min(), df["Period"].max(), freq="1H")) + 1,
+                nbins=len(pd.date_range(df["Period"].min(), df["Period"].max(), freq="1h")) + 1,
             )
             fig.update_layout(
                 paper_bgcolor="rgba(0,0,0,0)",

{wbcrm-1.51.0 → wbcrm-1.51.1}/wbcrm/viewsets/menu/activities.py

@@ -1,6 +1,3 @@
-from datetime import timedelta
-
-from django.utils import timezone
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
 from wbcore.permissions.shortcuts import is_internal_user
@@ -10,13 +7,6 @@ def default_activity_create_get_params(request) -> dict:
     return {"participants": request.user.profile.id}
 
 
-def default_activitychart_get_params(request) -> dict:
-    current_last_week_date_start = timezone.now().date() - timedelta(days=7)
-    current_next_week_date_end = timezone.now().date() + timedelta(days=7)
-
-    return {"period": f"{current_last_week_date_start:%Y-%m-%d},{current_next_week_date_end:%Y-%m-%d}"}
-
-
 ACTIVITYTYPE_MENUITEM = MenuItem(
     label=_("Activity Types"),
     endpoint="wbcrm:activitytype-list",
@@ -41,7 +31,6 @@ ACTIVITY_MENUTITEM = MenuItem(
     permission=ItemPermission(
         method=lambda request: is_internal_user(request.user), permissions=["wbcrm.view_activity"]
     ),
-    # endpoint_get_parameters={"only_recent": True}, # TODO confirm that this can actually be commented out
     add=MenuItem(
         label=_("Create Activity"),
         endpoint="wbcrm:activity-list",
@@ -57,5 +46,4 @@ ACTIVITYCHART_MENUITEM = MenuItem(
     permission=ItemPermission(
         method=lambda request: is_internal_user(request.user), permissions=["wbcrm.view_activity"]
     ),
-    endpoint_get_parameters=default_activitychart_get_params,
 )