wbhuman_resources 1.56.0__tar.gz → 1.56.2__tar.gz

{wbhuman_resources-1.56.0 → wbhuman_resources-1.56.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbhuman_resources
-Version: 1.56.0
+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.0 → wbhuman_resources-1.56.2}/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-1.56.0 → wbhuman_resources-1.56.2}/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):
     """