wbhuman_resources 1.55.9__tar.gz → 1.55.10rc0__tar.gz

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/PKG-INFO

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

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/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:
         """

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/models/employee.py

@@ -830,8 +830,11 @@ class BalanceHourlyAllowance(models.Model):
             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",
@@ -935,7 +938,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",

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/models/kpi.py

@@ -82,7 +82,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 +178,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(

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/models/review.py

@@ -105,7 +105,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")
@@ -721,6 +721,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"

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/tasks.py

@@ -173,7 +173,7 @@ def daily_automatic_application_deadline():
 
 
 @shared_task
-def periodic_updating_kpi_task(kpi_id=[], start=None, end=None):
+def periodic_updating_kpi_task(kpi_id: list | None = None, start=None, end=None):
     intervals = {elt.name: KPI.Interval.get_frequence_correspondance(elt.name) for elt in KPI.Interval}
     for key, value in intervals.items():
         kpis = (

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/utils.py

@@ -6,8 +6,11 @@ from django.utils import timezone
 
 
 def get_number_of_hours_between_dates(
-    d1, d2, list_employee_dayoffs, list_public_holidays=False, hours_range=range(0, 23), granularity=12
+    d1, d2, list_employee_dayoffs, list_public_holidays=False, hours_range=None, granularity=12
 ):
+    if hours_range is None:
+        hours_range = range(0, 23)
+
     def convert_days_from_hours(hours, granularity, hours_per_day):
         return int(hours / granularity) * granularity / hours_per_day
 

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/viewsets/absence.py

@@ -5,7 +5,7 @@ from django.db.models.functions import Concat, Extract
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.functional import cached_property
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext
 from rest_framework import filters
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -143,7 +143,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                 ).exclude(id=instance.id)
                 activities_title = qs.values_list("title", flat=True)
                 if len(activities_title) > 0:
-                    message = _("<p>During this absence, you already have these events:</p><ul>")
+                    message = gettext("<p>During this absence, you already have these events:</p><ul>")
                     for activity_title in activities_title:
                         message += f"<li>{activity_title}</li>"
                     message += "</ul>"
@@ -169,11 +169,11 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                     available_hourly_balance_in_days = (
                         available_hourly_balance / instance.employee.calendar.get_daily_hours()
                     )
-                    message = _(
+                    message = gettext(
                         "After this request, you will have {} days ({} hours) left for the balance {}</b>"
                     ).format(available_hourly_balance_in_days, available_hourly_balance, current_balance.year)
                     if other_pending_hours > 0:
-                        message += _(
+                        message += gettext(
                             " (not including <b>{pending_hours}</b> hours from other pending/draft absence requests)"
                         ).format(pending_hours=other_pending_hours)
                     if available_hourly_balance < 0:
@@ -185,7 +185,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
                 )
                 if day_offs:
                     day_offs_messages = [
-                        _("{holiday} not counted ({title})").format(
+                        gettext("{holiday} not counted ({title})").format(
                             holiday=holiday.date.strftime("%d.%m.%Y"), title=holiday.title
                         )
                         for holiday in day_offs
@@ -236,7 +236,7 @@ class AbsenceRequestModelViewSet(EmployeeViewMixin, viewsets.ModelViewSet):
     def increaseday(self, request, pk=None):
         absence_request = get_object_or_404(AbsenceRequest, id=pk)
         if absence_request.type.is_extensible and (number_days := int(request.POST.get("number_days", 1))):
-            for i in range(number_days):
+            for _ in range(number_days):
                 if next_extensible_period := absence_request.next_extensible_period:
                     absence_request.period = next_extensible_period
             absence_request.save()

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/viewsets/buttons/kpis.py

@@ -5,12 +5,12 @@ from wbcore.metadata.configs import buttons as bt
 
 class KPIButtonConfig(bt.ButtonViewConfig):
     def get_custom_instance_buttons(self):
-        BUTTONS = []
+        buttons = []
         if self.view.kwargs.get("pk", None):
-            BUTTONS += [
+            buttons += [
                 bt.WidgetButton(
                     key="evaluationgraph", label=_("Evaluation Graph"), icon=WBIcon.CHART_BARS_HORIZONTAL.icon
                 ),
                 bt.WidgetButton(key="kpievaluationpandas", label=_("Latest Evaluations"), icon=WBIcon.DATA_GRID.icon),
             ]
-        return {*BUTTONS}
+        return {*buttons}

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/viewsets/buttons/review.py

@@ -32,7 +32,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
         return self.get_custom_instance_buttons()
 
     def get_custom_instance_buttons(self):
-        BUTTONS = [
+        buttons = [
             bt.WidgetButton(key="progress", label=_("Progress"), icon=WBIcon.CHART_BARS_HORIZONTAL.icon),
             bt.ActionButton(
                 method=RequestType.PATCH,
@@ -132,7 +132,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
                             "include_kpi",
                         )
 
-                BUTTONS.append(
+                buttons.append(
                     bt.ActionButton(
                         method=RequestType.PATCH,
                         identifiers=("wbhuman_resources:review",),
@@ -158,7 +158,7 @@ class ReviewButtonConfig(bt.ButtonViewConfig):
                         ),
                     )
                 )
-        return {*BUTTONS}
+        return {*buttons}
 
 
 class ReviewGroupButtonConfig(bt.ButtonViewConfig):

{wbhuman_resources-1.55.9 → wbhuman_resources-1.55.10rc0}/wbhuman_resources/viewsets/display/review.py

@@ -303,24 +303,24 @@ class ReviewQuestionReviewDisplayConfig(ReviewQuestionDisplayConfig):
 
 class ReviewAnswerDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
-        FIELDS = [
+        fields = [
             dp.Field(key="question_name", label=_("Question"), width=Unit.PIXEL(720)),
             dp.Field(key="mandatory", label=_("Mandatory"), width=Unit.PIXEL(80)),
         ]
         if self.view.get_queryset().filter(question__answer_type=ReviewQuestion.ANSWERTYPE.RATING):
-            FIELDS += [dp.Field(key="answer_number", label=_("Rating"), width=Unit.PIXEL(170))]
+            fields += [dp.Field(key="answer_number", label=_("Rating"), width=Unit.PIXEL(170))]
 
-        FIELDS += [dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(720))]
+        fields += [dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(720))]
 
         if review_id := self.view.kwargs.get("review_id"):
             review = Review.objects.get(id=review_id)
             if review.status in [Review.Status.EVALUATION, Review.Status.VALIDATION]:
-                FIELDS = [
+                fields = [
                     dp.Field(key="question_name", label=_("Question"), width=Unit.PIXEL(740)),
                     dp.Field(key="answered_by", label=_("Answered By"), width=Unit.PIXEL(140)),
                     dp.Field(key="answer_text", label=_("Comment"), width=Unit.PIXEL(740)),
                 ]
-        return dp.ListDisplay(fields=FIELDS)
+        return dp.ListDisplay(fields=fields)
 
     def get_instance_display(self) -> Display:
         grid_fields = [[repeat_field(2, "question_name")], ["mandatory", "."]]