wbcrm 1.51.0__py2.py3-none-any.whl → 1.51.1__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

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/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,
 )

{wbcrm-1.51.0.dist-info → wbcrm-1.51.1.dist-info}/METADATA

@@ -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.dist-info → wbcrm-1.51.1.dist-info}/RECORD

@@ -20,7 +20,7 @@ wbcrm/factories/groups.py,sha256=OWmGk-H9zEnLOo_5oe4czSVvAUUOfrpUmVHgG9xvtak,621
 wbcrm/factories/products.py,sha256=UuhCaSZsrmIA8ccj80gAaNNlAmhcKLjwDwNOvE3BHro,244
 wbcrm/filters/__init__.py,sha256=ZX47xCq18N_FTvvFCk2mIlFoValKFaTcxw9xv8qdn0E,305
 wbcrm/filters/accounts.py,sha256=WwBNxXnyevdP_k7yHCgy-5eM-ILc8MgVTltPcAmu760,2738
-wbcrm/filters/activities.py,sha256=y1MmnXlypIcDfj4P3oa3VbAHY1LTwGamUeeX6h6XbDs,7783
+wbcrm/filters/activities.py,sha256=-1BIlnMn5fDyqt3Ze9lmEPXi1DU-rpUQirrnba4kp7I,8233
 wbcrm/filters/groups.py,sha256=X6XC5nUZOlOwuJJxjl0tD9-FfzFkwIDeIXUdbQ1GHMs,624
 wbcrm/filters/products.py,sha256=K1ZJ4hhMibv0YBnQyzlPqg4KkT-uq_fGVNVJPzlP8j0,1204
 wbcrm/filters/signals.py,sha256=cd4LSwPUwutLI4CcFjzADVhv2Bc0-XkYoiaojO0rkvs,3820
@@ -138,7 +138,7 @@ wbcrm/tests/e2e/e2e_wbcrm_utility.py,sha256=NB2pQXEzr8-S7cMGOs6w5IrT3gdcuzwz5x3a
 wbcrm/tests/e2e/test_e2e.py,sha256=p4elt_MWXWxBy6i8ayKdqTxHARiaozdd9xmi9_orQr4,16520
 wbcrm/viewsets/__init__.py,sha256=aoi2Hry7C6CixqV7ZIVrVPSjrcRcdRkE3zBmm1Va1Qo,668
 wbcrm/viewsets/accounts.py,sha256=gO7nb4cYtm4qZO5tpcQ2akoH54F6Uq01VFpshq5pdvQ,4458
-wbcrm/viewsets/activities.py,sha256=6fFuv8AqrFeh7rPOJyBdV0D2hlUq_8_FeRQtEhBVwyQ,12873
+wbcrm/viewsets/activities.py,sha256=ifN6evcgYStW0hCN2v9rWrBQQynkysSTyF2Ccrh5754,12873
 wbcrm/viewsets/groups.py,sha256=2W529zW2m1DIRYTxn8nEDYjWjQAHzh6yV7Owvf3KZA4,1414
 wbcrm/viewsets/mixins.py,sha256=pqyP00VNA5jJL9LwvIw7Mfc-zN-z5yJ-cAblZY7o7c4,1113
 wbcrm/viewsets/products.py,sha256=aby4V6F-7WzosKIbYV_CEguXrNo2IN8ZjUTcUGGmX8w,2157
@@ -159,7 +159,7 @@ wbcrm/viewsets/endpoints/groups.py,sha256=JLPEEtyKbCDb0R7aCdHtrG3XWyfCduW1zdOwK6
 wbcrm/viewsets/endpoints/products.py,sha256=1sjCon-dgWwwwCJV_KxRGRiHLDVv1t60Vv8ezNpiXCU,362
 wbcrm/viewsets/menu/__init__.py,sha256=V2ns9vGWIkkN4PsJHvGVnbiQUaGcx9VFA2UV65l8nXA,221
 wbcrm/viewsets/menu/accounts.py,sha256=XyfLf-3EmMDUyVeGEG4-THIifIwAp5RnX9UCm0epG2g,630
-wbcrm/viewsets/menu/activities.py,sha256=rp10r9WsI_ji7YPfLRhWP9ieGG6BwNF3G6pH_Fr4msU,2152
+wbcrm/viewsets/menu/activities.py,sha256=BvzrUtMj9xk-ybG4y6a36nGN01CtsRkzqQUEpjewUB0,1602
 wbcrm/viewsets/menu/groups.py,sha256=cTRT9-TVWvzx0-fk_OrBYujqZkqdw88_Q2lDfBfIwoU,606
 wbcrm/viewsets/menu/products.py,sha256=0YwZwTakoR92_l5kjX4I0pCAnx--OTIlTZ0HkB3lFPw,654
 wbcrm/viewsets/previews/__init__.py,sha256=EWvN0AiXSj7XzT48LfT6EH-ZkrzCQcM9zMKKDUsZ_Pc,46
@@ -171,6 +171,6 @@ wbcrm/viewsets/titles/products.py,sha256=cFAK5zljjybabk2U0KzPT2PVfV5vmO_UlJd6QlI
 wbcrm/viewsets/titles/utils.py,sha256=IaHQTmEG2OwIHS1bRv7sjuT950wefUJNi3yvPdrpNEs,1144
 wbcrm/workflows/__init__.py,sha256=biwXXPkVJugT9Vc1cwbInAUY8EnVmOauxdPz7e_2w_A,32
 wbcrm/workflows/assignee_methods.py,sha256=L7ymErtcpFgXdTMTj_lDOVJqsLAGLNT6qMlrkHGuXWM,999
-wbcrm-1.51.0.dist-info/METADATA,sha256=kQQy6dC9NXdywcrzyRBolzPoZDNEkCzdUsXYimLatuY,450
-wbcrm-1.51.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcrm-1.51.0.dist-info/RECORD,,
+wbcrm-1.51.1.dist-info/METADATA,sha256=OQYkl0-NyGY3R3eVoJ59wPo7fBRZ9rjEJl6T7_Dc55M,450
+wbcrm-1.51.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcrm-1.51.1.dist-info/RECORD,,