wbhuman_resources 1.54.7__py2.py3-none-any.whl → 1.61.5__py2.py3-none-any.whl

wbhuman_resources/migrations/0023_alter_employeehumanresource_weekly_off_periods.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2025-12-09 08:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbhuman_resources', '0022_remove_review_editable_mode'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='employeehumanresource',
+            name='weekly_off_periods',
+            field=models.ManyToManyField(related_name='employees_off', through='wbhuman_resources.EmployeeWeeklyOffPeriods', through_fields=('employee', 'period'), to='wbhuman_resources.defaultdailyperiod', verbose_name='Weekly off periods'),
+        ),
+    ]

wbhuman_resources/migrations/0024_alter_absencerequestperiods_unique_together_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.9 on 2025-12-16 15:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbhuman_resources', '0023_alter_employeehumanresource_weekly_off_periods'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='absencerequestperiods',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='balancehourlyallowance',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='dayoffcalendar',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='employeeweeklyoffperiods',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='employeeyearbalance',
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name='balancehourlyallowance',
+            constraint=models.UniqueConstraint(fields=('balance', 'period_index'), name='unique_balanceallowance'),
+        ),
+        migrations.AddConstraint(
+            model_name='dayoffcalendar',
+            constraint=models.UniqueConstraint(fields=('resource', 'timezone'), name='unique_calendar'),
+        ),
+        migrations.AddConstraint(
+            model_name='employeeweeklyoffperiods',
+            constraint=models.UniqueConstraint(fields=('employee', 'period', 'weekday'), name='unique_weeklyoffperiod'),
+        ),
+        migrations.AddConstraint(
+            model_name='employeeyearbalance',
+            constraint=models.UniqueConstraint(fields=('employee', 'year'), name='unique_employeeyearbalance'),
+        ),
+    ]

wbhuman_resources/models/absence.py

@@ -2,7 +2,6 @@ from datetime import timedelta
 
 import pandas as pd
 from django.contrib import admin
-from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.postgres.constraints import ExclusionConstraint
 from django.contrib.postgres.fields import DateTimeRangeField, RangeOperators
@@ -20,6 +19,7 @@ from django_fsm import FSMField, transition
 from pandas._libs.tslibs.offsets import BDay
 from psycopg.types.range import TimestamptzRange
 from wbcore.contrib.agenda.models import CalendarItem
+from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.geography.models import Geography
 from wbcore.contrib.icons import WBIcon
 from wbcore.contrib.notifications.dispatch import send_notification
@@ -35,7 +35,21 @@ from wbcore.utils.models import CalendarItemTypeMixin
 from .calendars import DayOff, DefaultDailyPeriod
 from .preferences import get_previous_year_balance_expiration_date
 
-User = get_user_model()
+
+def get_valid_employee_human_resource(user: "User"):
+    if (employee := getattr(user.profile, "human_resources", None)) and employee.is_active and user.profile:
+        return employee
+
+
+def can_edit_request(instance: "AbsenceRequest", user: "User") -> bool:
+    if employee := get_valid_employee_human_resource(user):
+        requester = instance.employee
+        return instance.status == AbsenceRequest.Status.DRAFT and (
+            user.has_perm("wbhuman_resources.administrate_absencerequest")
+            or employee.is_manager_of(requester)
+            or user.profile == requester.profile
+        )
+    return False
 
 
 def can_cancel_request(instance: "AbsenceRequest", user: "User") -> bool:
@@ -643,7 +657,9 @@ class AbsenceRequestPeriods(models.Model):
     class Meta:
         verbose_name = _("Absence Request Period")
         verbose_name_plural = _("Absence Request Periods")
-        unique_together = ("employee", "default_period", "date")
+        constraints = (
+            models.UniqueConstraint(name="unique_requestperiod", fields=("employee", "default_period", "date")),
+        )
         indexes = [
             models.Index(fields=["employee", "default_period", "date"]),
         ]

wbhuman_resources/models/calendars.py

@@ -76,10 +76,10 @@ class DayOffCalendar(WBModel):
                 DayOff.objects.get_or_create(
                     date=holiday_date, calendar=self, defaults={"count_as_holiday": True, "title": holiday_title}
                 )
-        except ModuleNotFoundError:
-            raise InvalidDayOffCalendarResourceError(_("The continent you've supplied is invalid."))
-        except AttributeError:
-            raise InvalidDayOffCalendarResourceError(_("The region you've supplied is invalid."))
+        except ModuleNotFoundError as e:
+            raise InvalidDayOffCalendarResourceError(_("The continent you've supplied is invalid.")) from e
+        except AttributeError as e:
+            raise InvalidDayOffCalendarResourceError(_("The region you've supplied is invalid.")) from e
 
     def get_day_off_per_employee_df(self, start: date, end: date, employees) -> pd.DataFrame:
         """
@@ -210,7 +210,7 @@ class DayOffCalendar(WBModel):
     class Meta:
         verbose_name = _("Day Off Calendar")
         verbose_name_plural = _("Days Off Calendar")
-        unique_together = ("resource", "timezone")
+        constraints = (models.UniqueConstraint(name="unique_calendar", fields=("resource", "timezone")),)
 
     @classmethod
     def get_endpoint_basename(cls) -> str:
@@ -302,7 +302,7 @@ class DefaultDailyPeriod(models.Model):
         verbose_name = _("Default Daily Period")
         verbose_name_plural = _("Default Daily Periods")
         constraints = [
-            CheckConstraint(check=Q(upper_time__gt=F("lower_time")), name="check_lower_time_lt_upper_time"),
+            CheckConstraint(condition=Q(upper_time__gt=F("lower_time")), name="check_lower_time_lt_upper_time"),
             ExclusionConstraint(
                 expressions=[("timespan", RangeOperators.OVERLAPS), ("calendar", RangeOperators.EQUAL)],
                 name="check_no_overlapping_default_periods_time",

wbhuman_resources/models/employee.py

@@ -1,5 +1,6 @@
 import math
 import operator
+from contextlib import suppress
 from datetime import date, datetime, timedelta
 from functools import reduce
 from typing import Generator, List, Optional, Tuple, Type, TypeVar
@@ -8,7 +9,6 @@ import pandas as pd
 from celery import shared_task
 from colorfield.fields import ColorField
 from django.contrib import admin
-from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -38,6 +38,7 @@ from django.utils.translation import gettext_lazy as _
 from dynamic_preferences.registries import global_preferences_registry
 from mptt.models import MPTTModel, TreeForeignKey
 from psycopg.types.range import TimestamptzRange
+from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.directory.models import (
     Company,
     EmployerEmployeeRelationship,
@@ -49,7 +50,11 @@ from wbcore.contrib.notifications.dispatch import send_notification
 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 wbcore.signals import pre_merge
+from wbcore.utils.models import ComplexToStringMixin, MergeError
+from wbcore.workers import Queue
+
+from wbhuman_resources.signals import add_employee_activity_to_daily_brief
 
 from .absence import AbsenceRequest, AbsenceRequestPeriods
 from .calendars import DayOff, DayOffCalendar, DefaultDailyPeriod
@@ -61,8 +66,6 @@ from .preferences import (
     long_vacation_number_of_days,
 )
 
-User = get_user_model()
-
 
 class ActiveEmployeeManager(models.Manager):
     """Custom Manager for filtering directly Active Employees. Exclude objects without reverse related field user_account and profile"""
@@ -235,11 +238,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):
@@ -545,8 +543,7 @@ class EmployeeHumanResource(ComplexToStringMixin, WBModel):
             The administrator user accounts (as queryset)
         """
         return (
-            get_user_model()
-            .objects.filter(is_active=True, profile__isnull=False)
+            User.objects.filter(is_active=True, profile__isnull=False)
             .filter(
                 Q(groups__permissions__codename="administrate_absencerequest")
                 | Q(user_permissions__codename="administrate_absencerequest")
@@ -824,14 +821,17 @@ class BalanceHourlyAllowance(models.Model):
     class Meta:
         verbose_name = _("Monthly Allowance")
         verbose_name_plural = _("Monthly Allowance")
-        unique_together = ("balance", "period_index")
+        constraints = (models.UniqueConstraint(name="unique_balanceallowance", fields=("balance", "period_index")),)
         indexes = [
             models.Index(fields=["balance"]),
             models.Index(fields=["balance", "period_index"]),
         ]
 
+    def __str__(self) -> str:
+        return f"{self.balance} - {self.period_index} Period Index: {self.hourly_allowance}"
+
 
-class EmployeeYearBalance(ComplexToStringMixin, models.Model):
+class EmployeeYearBalance(ComplexToStringMixin):
     employee = models.ForeignKey(
         EmployeeHumanResource,
         related_name="balances",
@@ -854,7 +854,7 @@ class EmployeeYearBalance(ComplexToStringMixin, models.Model):
     class Meta:
         verbose_name = _("Employee Year Balance")
         verbose_name_plural = _("Employee Year Balances")
-        unique_together = ("employee", "year")
+        constraints = (models.UniqueConstraint(name="unique_employeeyearbalance", fields=("employee", "year")),)
         indexes = [
             models.Index(fields=["employee", "year"]),
         ]
@@ -935,7 +935,7 @@ class EmployeeYearBalance(ComplexToStringMixin, models.Model):
         return "wbhuman_resources:employeeyearbalancerepresentation-list"
 
 
-class EmployeeWeeklyOffPeriods(ComplexToStringMixin, models.Model):
+class EmployeeWeeklyOffPeriods(ComplexToStringMixin):
     employee = models.ForeignKey(
         "wbhuman_resources.EmployeeHumanResource",
         related_name="default_periods_relationships",
@@ -975,7 +975,9 @@ class EmployeeWeeklyOffPeriods(ComplexToStringMixin, models.Model):
     class Meta:
         verbose_name = _("Employee Weekly off Period")
         verbose_name_plural = _("Employee Weekly off Periods")
-        unique_together = ("employee", "period", "weekday")
+        constraints = (
+            models.UniqueConstraint(name="unique_weeklyoffperiod", fields=("employee", "period", "weekday")),
+        )
         indexes = [
             models.Index(fields=["employee", "period", "weekday"]),
         ]
@@ -1184,7 +1186,7 @@ def position_groups_to_employee(
                 user.groups.remove(group)
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def deactivate_profile_as_task(requester_id: int, employee_id: int, substitute_id: Optional[int] = None):
     """
     Call the deactivation method as a async task
@@ -1195,7 +1197,7 @@ def deactivate_profile_as_task(requester_id: int, employee_id: int, substitute_i
         substitute_id: The potential Profile id to replace this employee's resources
 
     """
-    requester = get_user_model().objects.get(id=requester_id)
+    requester = User.objects.get(id=requester_id)
     employee = EmployeeHumanResource.objects.get(id=employee_id)
     substitute = None
     if substitute_id:
@@ -1210,3 +1212,48 @@ 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.
+    """
+
+    # If daily brief is a monday, we get the birthday that happen during the weekend as well
+    if val_date.weekday() == 0:
+        sunday = val_date - timedelta(days=1)
+        saturday = val_date - timedelta(days=2)
+        conditions = (
+            (Q(profile__birthday__day=val_date.day) & Q(profile__birthday__month=val_date.month))
+            | (Q(profile__birthday__day=sunday.day) & Q(profile__birthday__month=sunday.month))
+            | (Q(profile__birthday__day=saturday.day) & Q(profile__birthday__month=saturday.month))
+        )
+    else:
+        conditions = Q(profile__birthday__day=val_date.day) & Q(profile__birthday__month=val_date.month)
+    birthday_firstnames = list(
+        EmployeeHumanResource.active_internal_employees.filter(conditions)
+        .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
+        )
+
+
+@receiver(pre_merge, sender="directory.Person")
+def pre_merge_person_employee(sender: models.Model, merged_object, main_object, **kwargs):
+    Position.objects.filter(manager=merged_object).update(manager=main_object)
+    EmployeeHumanResource.objects.filter(direct_manager=merged_object).update(direct_manager=main_object)
+
+    with suppress(EmployeeHumanResource.DoesNotExist):
+        hr = EmployeeHumanResource.objects.get(profile=merged_object)
+        if EmployeeHumanResource.objects.filter(profile=main_object).exists():
+            raise MergeError(
+                f"We cannot safely merge directory profile {merged_object} into {main_object}: A HR profile already exists for {main_object}"
+            )
+        else:
+            hr.profile = main_object
+            hr.save()

wbhuman_resources/models/kpi.py

@@ -8,9 +8,11 @@ from django.conf import settings
 from django.contrib.postgres.fields import DateRangeField
 from django.db import models
 from django.db.models.query import QuerySet
+from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
 from wbcore.models import WBModel
 from wbcore.serializers.serializers import ModelSerializer
+from wbcore.signals import pre_merge
 
 
 class KPIHandler(Protocol):
@@ -82,7 +84,8 @@ class KPI(WBModel):
 
     @staticmethod
     def get_all_handlers() -> Iterator[KPIHandler]:
-        for handler_path, name in settings.KPI_HANDLERS:
+        for param in settings.KPI_HANDLERS:
+            handler_path = param[0]
             *module, handler = handler_path.split(".")
             module_path = ".".join(module)
             yield getattr(importlib.import_module(module_path), handler)()
@@ -177,6 +180,9 @@ class Evaluation(models.Model):
         verbose_name = _("Evaluation")
         verbose_name_plural = _("Evaluations")
 
+    def __str__(self) -> str:
+        return f"{self.kpi} - {self.evaluation_date}"
+
     def get_rating(self):
         list_date = list(
             pd.date_range(
@@ -193,3 +199,13 @@ class Evaluation(models.Model):
         rating = (self.evaluated_score / goal_expected * 100).round(2)
         rating = round(rating / 100 * 4)
         return 1 if rating < 1 else rating if rating < 4 else 4
+
+
+@receiver(pre_merge, sender="directory.Person")
+def pre_merge_person_kpi(sender: models.Model, merged_object, main_object, **kwargs):
+    Evaluation.objects.filter(person=merged_object).update(person=main_object)
+
+    for kpi in KPI.objects.filter(evaluated_persons=merged_object):
+        kpi.evaluated_persons.remove(merged_object)
+        if main_object not in kpi.evaluated_persons.all():
+            kpi.evaluated_persons.add(main_object)

wbhuman_resources/models/review.py

@@ -4,7 +4,6 @@ from typing import TypeVar
 
 from celery import shared_task
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
 from django.core.files.base import ContentFile
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -30,6 +29,7 @@ from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from slugify import slugify
+from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.color.enums import WBColor
 from wbcore.contrib.directory.models import Person
 from wbcore.contrib.documents.models import Document, DocumentType
@@ -42,14 +42,15 @@ from wbcore.metadata.configs.buttons import ActionButton, ButtonDefaultColor
 from wbcore.models import WBModel
 from wbcore.models.fields import YearField
 from wbcore.models.orderable import OrderableModel
+from wbcore.signals import pre_merge
 from wbcore.utils.models import CloneMixin, ComplexToStringMixin
+from wbcore.workers import Queue
 from weasyprint import HTML
 
 from wbhuman_resources.models.employee import get_main_company
 from wbhuman_resources.models.kpi import Evaluation
 
 SelfReview = TypeVar("SelfReview", bound="Review")
-User = get_user_model()
 
 
 def can_trigger_review(instance, user):
@@ -105,7 +106,7 @@ class Review(CloneMixin, ComplexToStringMixin, WBModel):
                 WBColor.GREEN_LIGHT.value,
                 WBColor.GREEN_DARK.value,
             ]
-            return [choice for choice in zip(cls, colors)]
+            return [choice for choice in zip(cls, colors, strict=False)]
 
     class Type(models.TextChoices):
         ANNUAL = "ANNUAL", _("Annual")
@@ -238,14 +239,10 @@ class Review(CloneMixin, ComplexToStringMixin, WBModel):
 
     @classmethod
     def get_administrators(cls) -> QuerySet[User]:
-        return (
-            get_user_model()
-            .objects.filter(
-                Q(groups__permissions__codename="administrate_review")
-                | Q(user_permissions__codename="administrate_review")
-            )
-            .distinct()
-        )
+        return User.objects.filter(
+            Q(groups__permissions__codename="administrate_review")
+            | Q(user_permissions__codename="administrate_review")
+        ).distinct()
 
     @transition(
         field=status,
@@ -373,14 +370,10 @@ class Review(CloneMixin, ComplexToStringMixin, WBModel):
         },
     )
     def validation(self, by=None, description=None, **kwargs):
-        users = (
-            get_user_model()
-            .objects.filter(
-                Q(groups__permissions__codename="administrate_review")
-                | Q(user_permissions__codename="administrate_review")
-            )
-            .distinct()
-        )
+        users = User.objects.filter(
+            Q(groups__permissions__codename="administrate_review")
+            | Q(user_permissions__codename="administrate_review")
+        ).distinct()
         for user in users:
             send_review_report_via_mail.delay(user.id, self.id)
 
@@ -721,6 +714,9 @@ class ReviewAnswer(models.Model):
     )
     answer_text = models.TextField(null=True, blank=True, verbose_name=_("Comment"))
 
+    def __str__(self) -> str:
+        return f"{self.question} - {self.answered_by}"
+
     @classmethod
     def get_endpoint_basename(cls):
         return "wbhuman_resources:reviewanswer"
@@ -754,7 +750,7 @@ def pre_save_review(sender, instance, **kwargs):
         instance.validation()
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def finalize_review(review_id):
     review = Review.objects.get(id=review_id)
     ReviewAnswer.objects.filter(
@@ -765,9 +761,9 @@ def finalize_review(review_id):
     ).update(answer_number=1)
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def submit_reviews_from_group(group_id, user_id):
-    user = get_user_model().objects.get(id=user_id)
+    user = User.objects.get(id=user_id)
 
     reviews = Review.objects.filter(
         Q(review_group__id=group_id)
@@ -780,7 +776,7 @@ def submit_reviews_from_group(group_id, user_id):
         review.save()
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def create_review_from_template(
     template_id, from_date, to_date, review_deadline, auto_apply_deadline, employees, include_kpi
 ):
@@ -881,7 +877,7 @@ What do you think of this result?
                 ReviewQuestion.objects.create(**kwargs)
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def submit_review(review_id):
     review = Review.objects.get(id=review_id)
     questions = ReviewQuestion.objects.filter(review=review)
@@ -953,9 +949,9 @@ def submit_review(review_id):
             )
 
 
-@shared_task
+@shared_task(queue=Queue.DEFAULT.value)
 def send_review_report_via_mail(user_id, review_id):
-    user = get_user_model().objects.get(id=user_id)
+    user = User.objects.get(id=user_id)
     review = Review.objects.get(id=review_id)
     pdf_content = review.generate_pdf()
     filename = f"{slugify(str(review))}.pdf"
@@ -977,3 +973,16 @@ def send_review_report_via_mail(user_id, review_id):
     document.link(review)
 
     document.send_email(to_emails=user.email, as_link=True, subject=gettext("Review PDF - ") + review.computed_str)
+
+
+@receiver(pre_merge, sender="directory.Person")
+def pre_merge_person_review(sender: models.Model, merged_object, main_object, **kwargs):
+    ReviewAnswer.objects.filter(answered_by=merged_object).update(answered_by=main_object)
+    Review.objects.filter(reviewee=merged_object).update(reviewee=main_object)
+    Review.objects.filter(reviewer=merged_object).update(reviewer=main_object)
+    Review.objects.filter(moderator=merged_object).update(moderator=main_object)
+
+    for group in ReviewGroup.objects.filter(employees=merged_object):
+        group.employees.remove(merged_object)
+        if main_object not in group.employees.all():
+            group.employees.add(main_object)

wbhuman_resources/permissions/backend.py

@@ -1,11 +1,9 @@
-from django.contrib.auth import get_user_model
 from django.db.models import Q, QuerySet
-from wbcore.permissions.backend import UserBackend as BaseUserBackend
+from wbcore.contrib.authentication.models.users import User
+from wbcore.contrib.permission.internal.backend import UserBackend as BaseUserBackend
 
 from wbhuman_resources.models.employee import EmployeeHumanResource
 
-User = get_user_model()
-
 
 class UserBackend(BaseUserBackend):
     """

wbhuman_resources/serializers/__init__.py

@@ -1,6 +1,7 @@
 from .absence import (
     AbsenceRequestCrossBorderCountryModelSerializer,
     AbsenceRequestModelSerializer,
+    ReadOnlyAbsenceRequestModelSerializer,
     AbsenceRequestPeriodsModelSerializer,
     AbsenceRequestTypeModelSerializer,
     AbsenceRequestTypeRepresentationSerializer,

wbhuman_resources/serializers/absence.py

@@ -269,6 +269,11 @@ class AbsenceRequestModelSerializer(wb_serializers.ModelSerializer):
         ]
 
 
+class ReadOnlyAbsenceRequestModelSerializer(AbsenceRequestModelSerializer):
+    class Meta(AbsenceRequestModelSerializer.Meta):
+        read_only_fields = AbsenceRequestModelSerializer.Meta.fields
+
+
 class EmployeeAbsenceDaysModelSerializer(wb_serializers.ModelSerializer):
     year = wb_serializers.YearField(read_only=True)
     absence_type = wb_serializers.ChoiceField(read_only=True, choices=AbsenceRequestType.get_choices())

wbhuman_resources/serializers/calendars.py

@@ -58,10 +58,11 @@ class DayOffCalendarModelSerializer(wb_serializers.ModelSerializer):
 
 class DefaultDailyPeriodModelSerializer(wb_serializers.ModelSerializer):
     _calendar = DayOffCalendarRepresentationSerializer(source="calendar")
+    timespan = wb_serializers.TimeRange(timerange_fields=("lower_time", "upper_time"))
 
     class Meta:
         model = DefaultDailyPeriod
-        fields = ("id", "lower_time", "upper_time", "timespan", "title", "total_hours", "calendar", "_calendar")
+        fields = ("id", "timespan", "title", "total_hours", "calendar", "_calendar")
 
 
 class DayOffModelSerializer(wb_serializers.ModelSerializer):

wbhuman_resources/serializers/employee.py

@@ -167,9 +167,9 @@ class EmployeeModelSerializer(wb_serializers.ModelSerializer):
     _position_manager = PersonRepresentationSerializer(
         source="position_manager", filter_params={"is_internal_profile": True}
     )
-    top_position_repr = wb_serializers.CharField(read_only=True, default="")
-    primary_email = wb_serializers.CharField(default="", label=_("Primary Email"), allow_null=True, read_only=True)
-    primary_address = wb_serializers.CharField(default="", label=_("Primary Address"), allow_null=True, read_only=True)
+    top_position_repr = wb_serializers.CharField(read_only=True)
+    primary_email = wb_serializers.CharField(label=_("Primary Email"), allow_null=True, read_only=True)
+    primary_address = wb_serializers.CharField(label=_("Primary Address"), allow_null=True, read_only=True)
     primary_telephone = wb_serializers.TelephoneField(label=_("Primary Telephone"), allow_null=True, read_only=True)
 
     @wb_serializers.register_resource()

wbhuman_resources/signals.py

@@ -0,0 +1,4 @@
+from django.db.models.signals import ModelSignal
+
+# this signal gathers all activity report needed to be inserted into the daily brief
+add_employee_activity_to_daily_brief = ModelSignal(use_caching=True)