wbcore 1.59.12__py2.py3-none-any.whl → 1.59.14__py2.py3-none-any.whl

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

@@ -11,16 +11,6 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 class EntryModelButtonConfig(ButtonViewConfig):
     CRM_BUTTONS = ()
 
-    CONTACT_BUTTONS = (
-        bt.WidgetButton(key="relationships", label=gettext_lazy("Relationships"), icon=WBIcon.GROUPS.icon),
-        bt.WidgetButton(key="emails", label=gettext_lazy("Emails"), icon=WBIcon.MAIL.icon),
-        bt.WidgetButton(key="telephones", label=gettext_lazy("Telephones"), icon=WBIcon.PHONE.icon),
-        bt.WidgetButton(key="addresses", label=gettext_lazy("Addresses"), icon=WBIcon.LOCATION.icon),
-        bt.WidgetButton(key="websites", label=gettext_lazy("Websites"), icon=WBIcon.PUBLIC.icon),
-        bt.WidgetButton(key="bankings", label=gettext_lazy("Bankings"), icon=WBIcon.BANK.icon),
-        bt.WidgetButton(key="social_media", label=gettext_lazy("Social Media"), icon=WBIcon.NEWSPAPER.icon),
-    )
-
     def get_custom_list_instance_buttons(self):
         return {
             bt.DropDownButton(
@@ -40,9 +30,6 @@ class EntryModelButtonConfig(ButtonViewConfig):
         return {
             bt.WidgetButton(key="employees", label=_("Employees"), icon=WBIcon.PEOPLE.icon, weight=2),
             bt.WidgetButton(key="manager", label=_("Relationship Managers"), icon=WBIcon.SUPERVISE.icon, weight=3),
-            bt.DropDownButton(
-                label=_("More Information"), icon=WBIcon.UNFOLD.icon, buttons=self.CONTACT_BUTTONS, weight=4
-            ),
         }
 
 
@@ -58,9 +45,6 @@ class PersonModelButtonConfig(EntryModelButtonConfig):
         return {
             bt.WidgetButton(key="employers", label=_("Employers"), icon=WBIcon.WORK.icon, weight=2),
             bt.DropDownButton(label=_("Client/Manager"), icon=WBIcon.UNFOLD.icon, buttons=self.CRM_BUTTONS, weight=3),
-            bt.DropDownButton(
-                label=_("More Information"), icon=WBIcon.UNFOLD.icon, buttons=self.CONTACT_BUTTONS, weight=4
-            ),
         }
 
 

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

@@ -21,6 +21,139 @@ class EntryModelDisplay(DisplayViewConfig):
         return create_simple_display([["computed_str"]])
 
 
+# CONTACT_PAGE = Page(
+#     title=_("Contacts"),
+#     layouts={
+#         default(): Layout(
+#             grid_template_areas=[
+#                 ["addresses_table", "addresses_table"],
+#                 ["telephones_table", "emails_table"],
+#                 ["websites_table", "social_media_table"],
+#                 ["bankings_table", "bankings_table"],
+#                 ["relationships_table", "relationships_table"],
+#             ],
+#             grid_auto_rows=Style.AUTO,
+#             grid_template_rows=[
+#                 "200px",
+#                 "200px",
+#                 "200px",
+#                 "200px",
+#                 "200px",
+#             ],
+#             inlines=[
+#                 Inline(
+#                     key="addresses_table",
+#                     endpoint="addresses",
+#                     title="Addresses",
+#                 ),
+#                 Inline(
+#                     key="telephones_table",
+#                     endpoint="telephones",
+#                     title="Telephones",
+#                 ),
+#                 Inline(
+#                     key="emails_table",
+#                     endpoint="emails",
+#                     title="Emails",
+#                 ),
+#                 Inline(
+#                     key="websites_table",
+#                     endpoint="websites",
+#                     title="Websites",
+#                 ),
+#                 Inline(
+#                     key="bankings_table",
+#                     endpoint="bankings",
+#                     title="Banking",
+#                 ),
+#                 Inline(
+#                     key="social_media_table",
+#                     endpoint="social_media",
+#                     title="Socials",
+#                 ),
+#                 Inline(
+#                     key="relationships_table",
+#                     endpoint="relationships",
+#                     title="Relationships",
+#                 ),
+#             ],
+#         ),
+#     },
+# )
+contact_section = Section(
+    key="contact_section",
+    collapsible=False,
+    title=_("Contacts"),
+    display=Display(
+        pages=[
+            Page(
+                title=_("Telephones"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["telephone_table"]],
+                        inlines=[Inline(key="telephone_table", endpoint="telephones")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Emails"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["email_table"]],
+                        inlines=[Inline(key="email_table", endpoint="emails")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Addresses"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["addresses_table"]],
+                        inlines=[Inline(key="addresses_table", endpoint="addresses")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Websites"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["website_table"]],
+                        inlines=[Inline(key="website_table", endpoint="websites")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Bankings"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["banking_table"]],
+                        inlines=[Inline(key="banking_table", endpoint="bankings")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Socials"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["socials_table"]],
+                        inlines=[Inline(key="socials_table", endpoint="social_media")],
+                    )
+                },
+            ),
+            Page(
+                title=_("Relationships"),
+                layouts={
+                    default(): Layout(
+                        grid_template_areas=[["relationship_table"]],
+                        inlines=[Inline(key="relationship_table", endpoint="relationships")],
+                    )
+                },
+            ),
+        ]
+    ),
+)
+
+
 class PersonModelDisplay(EntryModelDisplay):
     @classmethod
     def _get_person_instance_display(cls) -> Display:
@@ -66,7 +199,7 @@ class PersonModelDisplay(EntryModelDisplay):
                                     "personality_profile_blue",
                                     "activity_table",
                                 ],
-                                ["employers_section", "employers_section", "employers_section", "employers_section"],
+                                ["employers_section", "employers_section", "employers_section", "contact_section"],
                             ],
                             grid_template_columns=[
                                 Style.MIN_CONTENT,
@@ -76,7 +209,7 @@ class PersonModelDisplay(EntryModelDisplay):
                             ],
                             grid_template_rows=[Style.rem(6), Style.rem(6), Style.rem(6), Style.rem(6)],
                             grid_auto_rows=Style.MIN_CONTENT,
-                            sections=[employers_section],
+                            sections=[employers_section, contact_section],
                             inlines=[
                                 Inline(
                                     key="activity_table",
@@ -362,9 +495,9 @@ class CompanyModelDisplay(EntryModelDisplay):
             ["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"],
+            ["employees_section", "employees_section", "employees_section", "contact_section"],
         ]
-        sections = [employees_section]
+        sections = [employees_section, contact_section]
         if portfolio_fields:
             grid_template_areas.insert(
                 4,
@@ -377,7 +510,7 @@ class CompanyModelDisplay(EntryModelDisplay):
             )
             sections.append(portfolio_fields)
         if aum_table:
-            grid_template_areas[-1][-1] = aum_table.key
+            grid_template_areas.append([aum_table.key, aum_table.key, aum_table.key, aum_table.key])
             sections.append(aum_table)
 
         return Display(

wbcore/serializers/fields/datetime.py

@@ -1,6 +1,7 @@
 from datetime import date, datetime, timedelta
 
 import pytz
+from django.core.exceptions import ValidationError
 from psycopg.types.range import DateRange, TimestampRange, TimestamptzRange
 from rest_framework import serializers
 from rest_framework.settings import api_settings
@@ -36,9 +37,28 @@ class ShortcutMixin(WBCoreSerializerFieldMixin):
         return key, representation
 
 
+class DateRangeBoundedValidator:
+    """
+    Ensure a psycopg DateRange has both lower and upper bounds set (no None).
+    """
+
+    def __call__(self, value):
+        # Accept empty values the usual DRF way; let `required` handle presence.
+        if value is None:
+            return
+
+        # DateRange / DateTimeTZRange objects expose .lower and .upper. [web:30][web:44]
+        lower = getattr(value, "lower", None)
+        upper = getattr(value, "upper", None)
+
+        if lower is None or upper is None:
+            raise ValidationError("This range must have both a lower and an upper bound.")
+
+
 class DateRangeField(RangeMixin, ShortcutMixin, serializers.DateField):
     field_type = WBCoreType.DATERANGE.value
     internal_field = DateRange
+    default_validators = [DateRangeBoundedValidator()]
 
     def __init__(
         self,
@@ -78,6 +98,7 @@ class DateRangeField(RangeMixin, ShortcutMixin, serializers.DateField):
 class DateTimeRangeField(RangeMixin, ShortcutMixin, serializers.DateTimeField):
     field_type = WBCoreType.DATETIMERANGE.value
     internal_field = TimestamptzRange
+    default_validators = [DateRangeBoundedValidator()]
 
     def __init__(self, *args, lower_time_choices=None, upper_time_choices=None, **kwargs):
         self.lower_time_choices = lower_time_choices

{wbcore-1.59.12.dist-info → wbcore-1.59.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.59.12
+Version: 1.59.14
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: celery[redis]==5.*
 Requires-Dist: croniter==2.*

{wbcore-1.59.12.dist-info → wbcore-1.59.14.dist-info}/RECORD

@@ -376,11 +376,11 @@ wbcore/contrib/directory/viewsets/relationships.py,sha256=jy73aCven25PbLoy3-KTjn
 wbcore/contrib/directory/viewsets/utils.py,sha256=2i7rIT8qMCD-ajT-uNN7Re4uMRwijrzvblokedJnwOw,3400
 wbcore/contrib/directory/viewsets/buttons/__init__.py,sha256=dB3nD_NflX6U5muEMwtBcm3aNB0w65h42iYmtbMbFb4,270
 wbcore/contrib/directory/viewsets/buttons/contacts.py,sha256=BECTH8ADx-Pz8kk11dpLGB2xRrkMI5emoIHcL8wdrJU,599
-wbcore/contrib/directory/viewsets/buttons/entries.py,sha256=X7tH209qPojFNlBiE8hU5BrxQHa07WkBddVtvX-aCds,5660
+wbcore/contrib/directory/viewsets/buttons/entries.py,sha256=AH4M9L-XgJzDd2cEwk7xss8ksp6n1UGh03ESj_HWLmU,4613
 wbcore/contrib/directory/viewsets/buttons/relationships.py,sha256=Q1vLLA9ZGt-s29Of8dj24IlMQzDzW_sMPU7n_F00DuY,2786
 wbcore/contrib/directory/viewsets/display/__init__.py,sha256=NiC0d1-RjPIYEzkGAQzThNFQeYv5UAW3aKL9j_lFV38,945
 wbcore/contrib/directory/viewsets/display/contacts.py,sha256=2PBSxVmbq_26LyhSTWrpjNv9cxKz7w086BqoVX7SDs4,13449
-wbcore/contrib/directory/viewsets/display/entries.py,sha256=tK2tsiJvKy_SEWHq9TT30Nu1g158bpGv5z4EnFd9psQ,23548
+wbcore/contrib/directory/viewsets/display/entries.py,sha256=puz_PqnHOYHvqeeu7Y-ggHsBcc5V1IdduxETAvMtBho,28068
 wbcore/contrib/directory/viewsets/display/relationships.py,sha256=-s3ABMIGmbvmAOe8CRJqVv8RpKaMw7xeoy0HSvo0kRQ,11587
 wbcore/contrib/directory/viewsets/display/utils.py,sha256=5sMFdEXUfanKp60IvTyO4YLqFlEUz9fGMldoqTYTnwU,830
 wbcore/contrib/directory/viewsets/endpoints/__init__.py,sha256=0z1LYIrLQvIcs2qZEfD2SYB6tqycmSQjlJ4NwZgd0JY,647
@@ -1106,7 +1106,7 @@ wbcore/serializers/utils.py,sha256=H_faApLg6bNiZvZNvApZhmVBJ07obw1u5QKZx7DLLa8,4
 wbcore/serializers/fields/__init__.py,sha256=xNNak0yl8FtC6m-__B5mfieSNGAygXND34E_HrJ2Fcw,1498
 wbcore/serializers/fields/boolean.py,sha256=vwP7HQflArFEG0w9FfXkPYKreFJ5qMjs-L0qKMeKCVQ,1682
 wbcore/serializers/fields/choice.py,sha256=ozVwKaPCpsgPuQXQWr8TxHIcxSdGvhw23OFVD0xnipg,2128
-wbcore/serializers/fields/datetime.py,sha256=UVrBAdh-Iy3cDdVxbce9rsPYwwfxDJ-kJEr_1K_29ec,7386
+wbcore/serializers/fields/datetime.py,sha256=cHJNQyR5Xx9Z7AQEBpmRB7obRRwqAiMZeVzdPo0udts,8151
 wbcore/serializers/fields/fields.py,sha256=R_JJxnSfgKK6pYFgfe_-7qo_y25YksQ-WuNgiKWev4U,7068
 wbcore/serializers/fields/file.py,sha256=tDDK2bITiP7zxl9Ilzja2_gWae_lf9CkO1rDEBPaj6g,568
 wbcore/serializers/fields/fsm.py,sha256=xUYxDj166PDnmDLggI4fShXdSunJVzbc8quFQioM3Yc,700
@@ -1238,6 +1238,6 @@ wbcore/viewsets/generics.py,sha256=lKDq9UY_Tyc56u1bqaIEvHGgoaXwXxpZ1c3fLVteptI,1
 wbcore/viewsets/mixins.py,sha256=IdHd_uixOv3ExKoHxTgL5Bt8OELIwfYwhBZm0nsvZfc,12054
 wbcore/viewsets/utils.py,sha256=4520Ij3ASM8lOa8QZkCqbBfOexVRiZu688eW-PGqMOA,882
 wbcore/viewsets/viewsets.py,sha256=FPPESunEjlunDr5VFsjTfsquTS3iDSQkw0H6QjMKPqk,6574
-wbcore-1.59.12.dist-info/METADATA,sha256=3P0NTHFMvLQkaopsmazWN789ZtepkAcEg0YxUTgnW-A,2317
-wbcore-1.59.12.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbcore-1.59.12.dist-info/RECORD,,
+wbcore-1.59.14.dist-info/METADATA,sha256=TiTbuASllTZhi0LXNXfDDZCxJxj1ebOC3EOYvyEzWY0,2317
+wbcore-1.59.14.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbcore-1.59.14.dist-info/RECORD,,