wbcore 1.46.0__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

wbcore/contrib/directory/viewsets/display/entries.py

@@ -123,6 +123,7 @@ class PersonModelDisplay(EntryModelDisplay):
                             grid_template_areas=[
                                 ["salutation", "birthday", "formal", "."],
                                 ["has_user_account", "last_connection", ".", "."],
+                                ["description", "description", "description", "description"],
                             ],
                             grid_template_columns=[
                                 "minmax(min-content, 1fr)",
@@ -284,14 +285,31 @@ class PersonModelDisplay(EntryModelDisplay):
         return dp.ListDisplay(
             fields=[
                 dp.Field(key="name", label=_("Name")),
-                dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
                 dp.Field(key="customer_status", label=_("Status")),
                 dp.Field(key="position_in_company", label=_("Position")),
                 dp.Field(key="cities", label=_("City")),
-                dp.Field(key="primary_telephone", label=_("Primary Phone Number")),
                 dp.Field(key="tier", label=_("Tier")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
-                dp.Field(key="last_event", label=_("Last Event")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
+                dp.Field(
+                    key=None,
+                    label=_("Last Event"),
+                    children=[
+                        dp.Field(key="last_event", label=_("Name")),
+                        dp.Field(key="last_event_period_endswith", label=_("End Date")),
+                    ],
+                ),
                 dp.Field(key="activity_heat", label=_("Activity Heat")),
             ],
         )
@@ -339,19 +357,36 @@ class CompanyModelDisplay(EntryModelDisplay):
             ),
         )
 
-        display = Display(
+        grid_template_areas = [
+            ["profile_image", "name", "customer_status", "activity_table"],
+            ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
+            ["profile_image", "type", "tier", "activity_table"],
+            ["profile_image", "activity_heat", "activity_heat", "activity_table"],
+            ["employees_section", "employees_section", "employees_section", "employees_section"],
+        ]
+        sections = [employees_section]
+        if portfolio_fields:
+            grid_template_areas.insert(
+                4,
+                [
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    "activity_table",
+                ],
+            )
+            sections.append(portfolio_fields)
+        if aum_table:
+            grid_template_areas[-1][-1] = aum_table.key
+            sections.append(aum_table)
+
+        return Display(
             pages=[
                 Page(
                     title=_("Main Information"),
                     layouts={
                         default(): Layout(
-                            grid_template_areas=[
-                                ["profile_image", "name", "customer_status", "activity_table"],
-                                ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
-                                ["profile_image", "type", "tier", "activity_table"],
-                                ["profile_image", "activity_heat", "activity_heat", "activity_table"],
-                                ["employees_section", "employees_section", "employees_section", "employees_section"],
-                            ],
+                            grid_template_areas=grid_template_areas,
                             grid_template_columns=[
                                 Style.MIN_CONTENT,
                                 "minmax(min-content, 1fr)",
@@ -360,7 +395,7 @@ class CompanyModelDisplay(EntryModelDisplay):
                             ],
                             grid_template_rows=[Style.rem(6), Style.rem(6), Style.rem(6)],
                             grid_auto_rows=Style.MIN_CONTENT,
-                            sections=[employees_section],
+                            sections=sections,
                             inlines=[
                                 Inline(
                                     key="activity_table",
@@ -385,29 +420,6 @@ class CompanyModelDisplay(EntryModelDisplay):
             ]
         )
 
-        # Need to insert the portfolio fields into the display
-        for page in display.pages:
-            if page.title == "Main Information":
-                for layout_key in page.layouts.keys():
-                    if portfolio_fields:
-                        # Insert the section with the AUM fields below the profile picture at the left
-                        page.layouts[layout_key].grid_template_areas.insert(
-                            4,
-                            [
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                "activity_table",
-                            ],
-                        )
-                        page.layouts[layout_key].sections.append(portfolio_fields)
-                    if aum_table:
-                        # Insert the section with the AUM table at the bottom right
-                        page.layouts[layout_key].grid_template_areas[-1][-1] = aum_table.key
-                        page.layouts[layout_key].sections.append(aum_table)
-                break
-        return display
-
     @classmethod
     def _get_new_company_instance_display(cls) -> Display:
         """Returns the display for creating a new company
@@ -460,8 +472,26 @@ class CompanyModelDisplay(EntryModelDisplay):
                 dp.Field(key="type", label=_("Type")),
                 dp.Field(key="tier", label=_("Tier")),
                 dp.Field(key="customer_status", label=_("Status")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
-                dp.Field(key="last_event", label=_("Last Event")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
+                dp.Field(
+                    key=None,
+                    label=_("Last Event"),
+                    children=[
+                        dp.Field(key="last_event", label=_("Name")),
+                        dp.Field(key="last_event_period_endswith", label=_("Date")),
+                    ],
+                ),
                 dp.Field(key="activity_heat", label=_("Activity Heat")),
             ]
         )

wbcore/contrib/directory/viewsets/display/relationships.py

@@ -4,7 +4,7 @@ from typing import Optional
 from django.utils.translation import gettext as _
 
 from wbcore.contrib.color.enums import WBColor
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
+from wbcore.contrib.directory.models import ClientManagerRelationship
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
@@ -15,7 +15,7 @@ from wbcore.metadata.configs.display.instance_display.utils import repeat_field
 from wbcore.metadata.configs.display.view_config import DisplayViewConfig
 
 
-class CMR_Color(Enum):
+class ClientManagerRelationshipColor(Enum):
     DRAFT = WBColor.RED_LIGHT.value
     PENDING = WBColor.YELLOW_LIGHT.value
     APPROVED = WBColor.GREEN_LIGHT.value
@@ -93,13 +93,7 @@ class EmployerEmployeeRelationshipDisplayConfig(DisplayViewConfig):
                             condition=("==", True),
                         ),
                     ],
-                ),
-                dp.Formatting(
-                    column="primary",
-                    formatting_rules=[
-                        dp.FormattingRule(icon=WBIcon.FAVORITE.icon, condition=("==", True)),
-                    ],
-                ),
+                )
             ],
         )
 
@@ -143,13 +137,7 @@ class EmployeeEmployerDisplayConfig(DisplayViewConfig):
                             condition=("==", True),
                         ),
                     ],
-                ),
-                dp.Formatting(
-                    column="primary",
-                    formatting_rules=[
-                        dp.FormattingRule(icon=WBIcon.FAVORITE.icon, condition=("==", True)),
-                    ],
-                ),
+                )
             ],
         )
 
@@ -188,13 +176,7 @@ class EmployerEmployeeDisplayConfig(DisplayViewConfig):
                             condition=("==", True),
                         ),
                     ],
-                ),
-                dp.Formatting(
-                    column="primary",
-                    formatting_rules=[
-                        dp.FormattingRule(icon=WBIcon.FAVORITE.icon, condition=("==", True)),
-                    ],
-                ),
+                )
             ],
         )
 
@@ -221,29 +203,29 @@ class ClientManagerModelDisplay(DisplayViewConfig):
                     key="status",
                     items=[
                         dp.LegendItem(
-                            icon=CMR_Color.DRAFT.value,
-                            label=CMR.Status.DRAFT.label,
-                            value=CMR.Status.DRAFT.name,
+                            icon=ClientManagerRelationshipColor.DRAFT.value,
+                            label=ClientManagerRelationship.Status.DRAFT.label,
+                            value=ClientManagerRelationship.Status.DRAFT.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.PENDING.value,
-                            label=CMR.Status.PENDINGADD.label,
-                            value=CMR.Status.PENDINGADD.name,
+                            icon=ClientManagerRelationshipColor.PENDING.value,
+                            label=ClientManagerRelationship.Status.PENDINGADD.label,
+                            value=ClientManagerRelationship.Status.PENDINGADD.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.APPROVED.value,
-                            label=CMR.Status.APPROVED.label,
-                            value=CMR.Status.APPROVED.name,
+                            icon=ClientManagerRelationshipColor.APPROVED.value,
+                            label=ClientManagerRelationship.Status.APPROVED.label,
+                            value=ClientManagerRelationship.Status.APPROVED.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.PENDING_REMOVE.value,
-                            label=CMR.Status.PENDINGREMOVE.label,
-                            value=CMR.Status.PENDINGREMOVE.name,
+                            icon=ClientManagerRelationshipColor.PENDING_REMOVE.value,
+                            label=ClientManagerRelationship.Status.PENDINGREMOVE.label,
+                            value=ClientManagerRelationship.Status.PENDINGREMOVE.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.REMOVED.value,
-                            label=CMR.Status.REMOVED.label,
-                            value=CMR.Status.REMOVED.name,
+                            icon=ClientManagerRelationshipColor.REMOVED.value,
+                            label=ClientManagerRelationship.Status.REMOVED.label,
+                            value=ClientManagerRelationship.Status.REMOVED.name,
                         ),
                     ],
                 ),
@@ -260,32 +242,26 @@ class ClientManagerModelDisplay(DisplayViewConfig):
                     formatting_rules=[
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.YELLOW_LIGHT.value},
-                            condition=("==", CMR.Status.PENDINGADD.name),
+                            condition=("==", ClientManagerRelationship.Status.PENDINGADD.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.YELLOW_DARK.value},
-                            condition=("==", CMR.Status.PENDINGREMOVE.name),
+                            condition=("==", ClientManagerRelationship.Status.PENDINGREMOVE.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.GREEN_LIGHT.value},
-                            condition=("==", CMR.Status.APPROVED.name),
+                            condition=("==", ClientManagerRelationship.Status.APPROVED.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.RED_LIGHT.value},
-                            condition=("==", CMR.Status.DRAFT.name),
+                            condition=("==", ClientManagerRelationship.Status.DRAFT.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.GREY.value},
-                            condition=("==", CMR.Status.REMOVED.name),
+                            condition=("==", ClientManagerRelationship.Status.REMOVED.name),
                         ),
                     ],
-                ),
-                dp.Formatting(
-                    column="primary",
-                    formatting_rules=[
-                        dp.FormattingRule(icon=WBIcon.FAVORITE.icon, condition=("==", True)),
-                    ],
-                ),
+                )
             ],
         )
 

wbcore/contrib/directory/viewsets/endpoints/relationships.py

@@ -6,26 +6,7 @@ from wbcore.permissions.shortcuts import is_internal_user
 
 
 class RelationshipEntryModelEndpoint(EndpointViewConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbcore:directory:entry-relationship-detail",
-            args=[
-                self.view.kwargs["entry_id"],
-                self.view.kwargs.get("pk"),
-            ],
-            request=self.request,
-        )
-
-    def get_instance_endpoint(self, **kwargs):
-        return reverse(
-            "wbcore:directory:entry-relationship-list",
-            args=[
-                self.view.kwargs["entry_id"],
-            ],
-            request=self.request,
-        )
-
-    def get_create_endpoint(self, **kwargs):
+    def get_endpoint(self, **kwargs):
         return reverse(
             "wbcore:directory:entry-relationship-list",
             args=[
@@ -57,9 +38,6 @@ class ClientManagerEndpoint(EndpointViewConfig):
                 return None
         return super().get_delete_endpoint(**kwargs)
 
-    def get_list_endpoint(self, **kwargs):
-        return f"{reverse('wbcore:directory:clientmanagerrelationship-list', args=[], request=self.request)}"
-
 
 class EmployeeEmployerEndpointConfig(EndpointViewConfig):
     PK_FIELD = "employee"
@@ -101,6 +79,3 @@ class UserIsClientEndpointConfig(EndpointViewConfig):
         if is_internal_user(self.request.user, include_superuser=True):
             return reverse("wbcore:directory:person-list", request=self.request)
         return None
-
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbcore:directory:clientmanagerrelationship-userclient-list", request=self.request)

wbcore/contrib/directory/viewsets/entries.py

@@ -10,6 +10,7 @@ from wbcore.contrib.directory.models import (
     Entry,
     Person,
 )
+from wbcore.contrib.i18n.viewsets import ModelTranslateMixin
 
 from ...authentication.models import UserActivity
 from ..filters import CompanyFilter, EntryFilter, PersonFilter, UserIsManagerFilter
@@ -117,7 +118,7 @@ class EntryModelViewSet(EntryPermissionMixin, TransparencyMixin, viewsets.ModelV
         return self.request.user.profile and self.request.user.profile.is_internal
 
 
-class PersonModelViewSet(EntryModelViewSet):
+class PersonModelViewSet(ModelTranslateMixin, EntryModelViewSet):
     LIST_DOCUMENTATION = "directory/markdown/documentation/person.md"
     button_config_class = PersonModelButtonConfig
     display_config_class = PersonModelDisplay
@@ -133,6 +134,7 @@ class PersonModelViewSet(EntryModelViewSet):
         "tier",
         "primary_manager_repr",
         "last_event",
+        "last_event_period_endswith",
         "activity_heat",
     )
 
@@ -148,11 +150,10 @@ class PersonModelViewSet(EntryModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
-        )
+        qs = super().get_queryset()
+        if "pk" in self.kwargs:
+            qs = qs.annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
+        return qs
 
 
 class CompanyModelViewSet(EntryModelViewSet):
@@ -168,6 +169,7 @@ class CompanyModelViewSet(EntryModelViewSet):
         "customer_status",
         "relationship_managers",
         "last_event",
+        "last_event_period_endswith",
         "activity_heat",
     )
     ordering = ["name", "id"]

wbcore/contrib/directory/viewsets/previews/entries.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from django.utils.translation import gettext as _
 
 from wbcore.contrib.icons import WBIcon
@@ -17,12 +19,10 @@ class EntryPreviewConfig(PreviewViewConfig):
             ["primary_telephone"],
             ["primary_manager_name"],
         ]
-        try:
+        with suppress(Exception):
             entry = self.view.get_object()
             if entry.profile_image:
                 fields.insert(0, "profile_image")
-        except Exception:
-            pass
 
         return create_simple_display(fields)
 

wbcore/contrib/directory/viewsets/relationships.py

@@ -2,8 +2,10 @@ from django.db.models import CharField, F, OuterRef, Q, Subquery, Value
 from django.db.models.functions import Concat
 from django.utils.functional import cached_property
 from dynamic_preferences.registries import global_preferences_registry
-from rest_framework import filters
+from rest_framework import filters, status
+from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 from rest_fuzzysearch.search import RankedFuzzySearchFilter
 from reversion.views import RevisionMixin
 
@@ -19,6 +21,7 @@ from wbcore.filters import DjangoFilterBackend
 from wbcore.viewsets import ModelViewSet, ReadOnlyModelViewSet, RepresentationViewSet
 
 from ..filters import ClientManagerFilter, RelationshipEntryFilter, RelationshipFilter
+from ..permissions import IsClientManagerRelationshipAdmin
 from ..serializers import (
     ClientManagerModelSerializer,
     ClientManagerRelationshipRepresentationSerializer,
@@ -29,7 +32,7 @@ from ..serializers import (
     RelationshipTypeRepresentationSerializer,
     UserIsClientModelSerializer,
 )
-from .buttons import EmployerEmployeeRelationshipButtonConfig
+from .buttons import ClientManagerRelationshipButtonConfig, EmployerEmployeeRelationshipButtonConfig
 from .display import (
     ClientManagerModelDisplay,
     EmployeeEmployerDisplayConfig,
@@ -179,6 +182,7 @@ class ClientManagerViewSet(RevisionMixin, ModelViewSet):
     queryset = ClientManagerRelationship.objects.none()
     serializer_class = ClientManagerModelSerializer
     display_config_class = ClientManagerModelDisplay
+    button_config_class = ClientManagerRelationshipButtonConfig
     endpoint_config_class = ClientManagerEndpoint
     filterset_class = ClientManagerFilter
     title_config_class = ClientManagerTitleConfig
@@ -197,6 +201,16 @@ class ClientManagerViewSet(RevisionMixin, ModelViewSet):
             return ClientManagerRelationship.objects.select_related("client", "relationship_manager")
         return ClientManagerRelationship.objects.none()
 
+    @action(detail=False, methods=["PATCH"], permission_classes=[IsClientManagerRelationshipAdmin])
+    def approveallpendingrequests(self, *args, **kwargs):
+        for request in ClientManagerRelationship.objects.filter(status=ClientManagerRelationship.Status.PENDINGADD):
+            request.approve(by=self.request.user)
+            request.save()
+        for request in ClientManagerRelationship.objects.filter(status=ClientManagerRelationship.Status.PENDINGREMOVE):
+            request.approveremoval(by=self.request.user)
+            request.save()
+        return Response({}, status=status.HTTP_200_OK)
+
 
 class UserIsClientViewSet(ReadOnlyModelViewSet):
     queryset = ClientManagerRelationship.objects.all()

wbcore/contrib/directory/viewsets/titles/relationships.py

@@ -1,7 +1,6 @@
 from django.utils.translation import gettext as _
 
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
-from wbcore.contrib.directory.models import Company, Entry, Person
+from wbcore.contrib.directory.models import ClientManagerRelationship, Company, Entry, Person
 from wbcore.metadata.configs.titles import TitleViewConfig
 
 
@@ -29,7 +28,7 @@ class RelationshipTypeModelTitleConfig(TitleViewConfig):
 class ClientManagerTitleConfig(TitleViewConfig):
     def get_instance_title(self):
         if pk := self.view.kwargs.get("pk"):
-            cmr_request = CMR.objects.get(id=pk)
+            cmr_request = ClientManagerRelationship.objects.get(id=pk)
             return _("Client Manager Relationship Between {client} & {person}").format(
                 client=str(cmr_request.client), person=str(cmr_request.relationship_manager)
             )

wbcore/contrib/documents/filters.py

@@ -13,7 +13,6 @@ from wbcore.contrib.documents.models import (
 class ShareableLinkFilter(wb_filters.FilterSet):
     valid = wb_filters.BooleanFilter(label=_("Valid"), method="boolean_is_valid")
     valid_until = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Valid Until",
     )
     link = wb_filters.CharFilter(label=_("Link"), method="filter_uuid")
@@ -36,7 +35,6 @@ class ShareableLinkFilter(wb_filters.FilterSet):
 class ShareableLinkAccessFilter(wb_filters.FilterSet):
     clearable = (False,)
     accessed = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Accessed between date",
     )