wbhuman_resources 1.56.1__py2.py3-none-any.whl → 1.56.2__py2.py3-none-any.whl

wbhuman_resources/models/employee.py

@@ -50,6 +50,7 @@ from wbcore.contrib.notifications.utils import create_notification_type
 from wbcore.models import WBModel
 from wbcore.models.fields import YearField
 from wbcore.utils.models import ComplexToStringMixin
+from wbcrm.signals import add_employee_activity_to_daily_brief
 
 from .absence import AbsenceRequest, AbsenceRequestPeriods
 from .calendars import DayOff, DayOffCalendar, DefaultDailyPeriod
@@ -235,11 +236,6 @@ class EmployeeHumanResource(ComplexToStringMixin, WBModel):
                 title="Vacation Notification",
                 help_text="Notifies you when there are Vacation days that you still have to take",
             ),
-            create_notification_type(
-                code="wbhuman_resources.employeehumanresource.birthday",
-                title="Birthday Notification",
-                help_text="Notifies you when today one of your colleagues is celebrating their birthday",
-            ),
         ]
 
     def unassign_position_groups(self):
@@ -1213,3 +1209,22 @@ def deactivate_profile_as_task(requester_id: int, employee_id: int, substitute_i
         body=gettext("The following actions have been done: \n{messages}").format(messages=messages),
         user=requester,
     )
+
+
+@receiver(add_employee_activity_to_daily_brief, sender="directory.Person")
+def daily_birthday(sender, instance: Person, val_date: date, **kwargs) -> tuple[str, str] | None:
+    """
+    Cron task supposed to be ran every day. Check and notify employee about a colleague's birthday.
+    """
+    birthday_firstnames = list(
+        EmployeeHumanResource.active_internal_employees.filter(
+            Q(profile__birthday__day=val_date.day) & Q(profile__birthday__month=val_date.month)
+        )
+        .exclude(profile=instance)
+        .values_list("profile__first_name", flat=True)
+    )
+    if birthday_firstnames:
+        birthday_firstnames_humanized = f"{', '.join(birthday_firstnames[:-1])} and {birthday_firstnames[-1]}"
+        return "Today Birthdays", _("Today is {}'s birthday, Which them a happy birthday!").format(
+            birthday_firstnames_humanized
+        )

wbhuman_resources/tasks.py

@@ -29,30 +29,6 @@ def create_future_public_holiday(today: date | None = None, forecast_year: int =
             calendar.create_public_holidays(year)
 
 
-@shared_task
-def daily_birthday(today=None):
-    """
-    Cron task supposed to be ran every day. Check and notify employee about a colleague's birthday.
-    """
-    day = "today"
-    if not today:
-        # Notify employee the day before
-        today = datetime.today() + timedelta(days=1)
-        day = "tomorrow"
-    for birthday_employee in EmployeeHumanResource.active_internal_employees.filter(
-        Q(profile__birthday__day=today.day) & Q(profile__birthday__month=today.month)
-    ).all():
-        for employee in EmployeeHumanResource.active_internal_employees.exclude(id=birthday_employee.id):
-            send_notification(
-                code="wbhuman_resources.employeehumanresource.birthday",
-                title=_("{} {}'s birthday is {}!").format(
-                    birthday_employee.profile.first_name, birthday_employee.profile.last_name, day
-                ),
-                body=_("Wish her/him a happy birthday!"),
-                user=employee.profile.user_account,
-            )
-
-
 @shared_task
 def assign_balance(today=None):
     """

{wbhuman_resources-1.56.1.dist-info → wbhuman_resources-1.56.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbhuman_resources
-Version: 1.56.1
+Version: 1.56.2
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcore

{wbhuman_resources-1.56.1.dist-info → wbhuman_resources-1.56.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wbhuman_resources/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
 wbhuman_resources/apps.py,sha256=UPXBSjg_i7Zo00IPxMuxV7iYEsY1GWIu217R_ZqEWR8,675
 wbhuman_resources/dynamic_preferences_registry.py,sha256=Piydi7FVWyzuQK6BDGEVmoP2CyCwqOEJdxgiErsNo4w,4107
-wbhuman_resources/tasks.py,sha256=tQ6MYa9Zw4yaozubNFo80osqAHY7z4usSAc-Kp5ikJA,7786
+wbhuman_resources/tasks.py,sha256=RzGg98F2Rjilehhw7rKa_8AWEZrDyUPwVUBRs0q1r50,6773
 wbhuman_resources/urls.py,sha256=FfpMuxZejfMt3xVu18WOa2aXC4ht2-MIESRmC_GUuIU,7980
 wbhuman_resources/utils.py,sha256=EZNxathbV_Azj1XX489X78WDbiNwj6F5FUqBqMrV2sg,1487
 wbhuman_resources/admin/__init__.py,sha256=hXIquTlOG4HFeeMetc6T1LwNJmFc9HBbtpCAQsgV8oM,113
@@ -43,7 +43,7 @@ wbhuman_resources/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 wbhuman_resources/models/__init__.py,sha256=PW4LDmMpJqcynmnbdy_VSwbhxyDU9ZCR2LIXk6LkHlg,631
 wbhuman_resources/models/absence.py,sha256=WDepyQjrySU860ESSZRP4Z13UlenMZD5JTsDS8Bm7xY,35892
 wbhuman_resources/models/calendars.py,sha256=TjUaabVldDY4baZN9tGVJA609LUAZV2pCowTCEa4VYA,14621
-wbhuman_resources/models/employee.py,sha256=qj8mGcC4sOMLj6Qh7ppDMG82o35T1xvU2VHhKRrZ5Sg,49046
+wbhuman_resources/models/employee.py,sha256=9IE00cJJ-qvMjYYnobxG0JM60xeBpqUfwvkf5Cs-LSc,49710
 wbhuman_resources/models/kpi.py,sha256=BrYKb56MKm5Ya0sIav3-jmw0qk4zKNoSRr0bYfNM9mk,7270
 wbhuman_resources/models/preferences.py,sha256=iQhcu-jrEkk8DgM5hgakg5mdkbtlO11KeJC0QpTBcKI,1432
 wbhuman_resources/models/review.py,sha256=QXXckJclht6iAw75_QL6bva4urHeSeUgbu4D_lsmiaw,39414
@@ -105,6 +105,6 @@ wbhuman_resources/viewsets/titles/absence.py,sha256=4F4ENgmZBGKiDuC8DmgrklNXEsRo
 wbhuman_resources/viewsets/titles/employee.py,sha256=VP_AC3E-3fpbO8-RUvi2haXcoJr9LVLYtJifGawVRGo,565
 wbhuman_resources/viewsets/titles/kpis.py,sha256=OSH_vIsIjfThWn17X_K7ykBKAFqNvz8M4PyFCF8BRQo,491
 wbhuman_resources/viewsets/titles/review.py,sha256=fL_PqTNAIK7alk_-7RaklkiR9guh54u8oS0m5AWOSSc,2458
-wbhuman_resources-1.56.1.dist-info/METADATA,sha256=PdBOe90qM8vXBYOkLHz6ENf21DzNPaNxv6gAXt8J8dE,272
-wbhuman_resources-1.56.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbhuman_resources-1.56.1.dist-info/RECORD,,
+wbhuman_resources-1.56.2.dist-info/METADATA,sha256=aULUHs43puj4KScHfXNRTIYan5mynz3NpBC0xWX5Mo4,272
+wbhuman_resources-1.56.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbhuman_resources-1.56.2.dist-info/RECORD,,