[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period

2025-12-10 14:49:53 +01:00
parent 5b103056d6
commit dfd5f26e95
6 changed files with 145 additions and 100 deletions
--- a/hr_employee_stats_sheet/tests/test_employee_stats.py
+++ b/hr_employee_stats_sheet/tests/test_employee_stats.py
@@ -37,11 +37,13 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
                (0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
            ],
        })
+        self.base_calendar.hours_per_day = 7
        self.employee.resource_calendar_id = self.base_calendar
+        self.env.company.recovery_type_id = self.recovery_type
        self.env.company.coef = 25

    def _create_timesheet_sheet(self, start_date):
-        #Crée une feuille de temps pour la semaine du lundi au dimanche
+        # Create a timesheet for the week (Monday to Sunday)
        return self.env['hr_timesheet.sheet'].create({
            'employee_id': self.employee.id,
            'date_start': start_date,
@@ -49,7 +51,7 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
        })

    def _create_stats(self, start_date, nb_days, unit_amount):
-        # Crée des temps du lundi au vendredi (ou nb_days)
+        # Create timesheet lines from Monday to Friday (or nb_days)
        for i in range(nb_days):
            self.env['account.analytic.line'].create({
                'employee_id': self.employee.id,
@@ -58,16 +60,17 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
                'account_id': 1,
                'name': 'Work Entry',
            })
-            # Génère les hr_employee_stats pour chaque jour de la période
+            # Generate hr.employee.stats for each day of the period
            stat = self.env['hr.employee.stats'].create({
                'employee_id': self.employee.id,
                'date': start_date + timedelta(days=i),
            })
+            stat._compute_dayofweek()
            stat._compute_hours()
            yield stat

    def test_invalide_recovery_type(self):
-        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # lundi de la semaine dernière
+        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # monday of last week
        self.recovery_type.request_unit = 'day'
        self.recovery_type.allows_negative = False
        timesheet_sheet = self._create_timesheet_sheet(start_date)
@@ -76,7 +79,7 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
            timesheet_sheet.action_generate_recovery_allocation()

    def test_no_recovery_hours(self):
-        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # lundi de la semaine dernière
+        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # monday of last week
        timesheet_sheet = self._create_timesheet_sheet(start_date)
        for stat in self._create_stats(start_date, 5, 7): #créer 5 stats de 7h chacune
            # Compare les heures de récupération calculées et le calendrier qui prévoit 7h par jour
@@ -106,7 +109,7 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
        timesheet_sheet.action_generate_recovery_allocation()
        recovery_allocation = self.env["hr.leave.allocation"].search([("timesheet_sheet_id","=",timesheet_sheet.id)])
        self.assertEqual(len(recovery_allocation), 1, "There should be one recovery")
-        self.assertEqual(recovery_allocation.number_of_days,0.78125, "The recovery allocation should be for 6.25h/8h = 0.78125 day")
+        self.assertEqual(recovery_allocation.number_of_days,0.8928571428571429, "The recovery allocation should be for 6.25h/7h = 0.8928571428571429 day")
        
    def test_negative_recovery_hours(self):
        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # lundi de la semaine dernière
@@ -125,7 +128,7 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
        timesheet_sheet.action_generate_recovery_allocation()
        recovery_allocation = self.env["hr.leave.allocation"].search([("timesheet_sheet_id","=",timesheet_sheet.id)])
        self.assertEqual(len(recovery_allocation), 1, "There should be one recovery")
-        self.assertEqual(recovery_allocation.number_of_days, -0.625, "The recovery allocation should be for -5/8 hours = ")
+        self.assertEqual(recovery_allocation.number_of_days, -0.7142857142857143, "The recovery allocation should be for -5/7 hours = −0,714285714")

    def test_recovery_hours_part_time_employee(self):
        part_time_calendar = self.env['resource.calendar'].create({
@@ -156,8 +159,9 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
        self.assertEqual(timesheet_sheet.timesheet_sheet_gap_hours, 4, "timesheet_sheet_gap_hours should be 4",) # l'employé a travaillé supplémentaire 4h au total sur la semaine
        self.assertEqual(timesheet_sheet.timesheet_sheet_recovery_hours, 5, "timesheet_sheet_recovery_hours should be 5",) # 5h sera le montant de l'allocation de récupération (coef de 25% de majoration)

-    def test_recovery_hours_change_contract(self):
-        part_time_calendar = self.env['resource.calendar'].create({
+    def test_recovery_hours_change_calendar(self):
+        employee_full_time_calendar = self.base_calendar # full time calendar (from monday to friday)
+        employee_part_time_calendar = self.env['resource.calendar'].create({
            'name': 'Part Time Calendar',
            'attendance_ids': [
                (0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
@@ -170,35 +174,31 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
                (0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
            ],
        })
-        #create one contract ending on wednesday and one other starting on thursday
-        self.env['hr.contract'].create({
-            'name': 'Contract 1',
+
+        #create two hr.employee.calendar to change calendar during the timesheet period
+        self.env['hr.employee.calendar'].create({
            'employee_id': self.employee.id,
-            'date_start': date.today() - timedelta(days=300), # date de début factice
-            'date_end': date.today() - timedelta(days= date.today().weekday() + 5), # date de fin le mercredi de la semaine dernière
-            'resource_calendar_id': self.base_calendar.id,
-            'wage': 2000,
-            'state': 'close',
+            'date_start': Date.to_date("2023-07-01"),
+            'date_end': Date.to_date("2025-07-31"),
+            'calendar_id': employee_full_time_calendar.id,
        })
-        self.env['hr.contract'].create({
-            'name': 'Contract 2',
+        self.env['hr.employee.calendar'].create({
            'employee_id': self.employee.id,
-            'state': 'open',
-            'date_start': date.today() - timedelta(days= date.today().weekday() + 4), # date de début le jeudi de la semaine dernière
-            'date_end': False,
-            'resource_calendar_id': self.base_calendar.id,
-            'wage': 1500,
+            'date_start': Date.to_date("2025-08-01"),
+            'date_end': None,
+            'calendar_id': employee_part_time_calendar.id,
        })
-        self.employee.resource_calendar_id = part_time_calendar.id
-        start_date = date.today() - timedelta(days=date.today().weekday() + 7)  # lundi de la semaine dernière
-        #create a timesheet with period including the change of contract
-        timesheet_sheet = self._create_timesheet_sheet(start_date)
+        self.employee.resource_calendar_id = employee_part_time_calendar.id
+
+        #create recovery hours on a period including the change of calendar
+        timesheet_sheet = self._create_timesheet_sheet(Date.to_date("2025-07-28")) #a week including the change of calendar on 1st august
        #the create of recovery allocation should raise an error
        with self.assertRaises(UserError):
            timesheet_sheet.action_generate_recovery_allocation()

-    def test_recovery_hours_change_contract_sucess(self):
-        part_time_calendar = self.env['resource.calendar'].create({
+    def test_recovery_hours_change_calendar_sucess(self):
+        employee_full_time_calendar = self.base_calendar # full time calendar (from monday to friday)
+        employee_part_time_calendar = self.env['resource.calendar'].create({
            'name': 'Part Time Calendar',
            'attendance_ids': [
                (0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
@@ -211,38 +211,49 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
                (0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
            ],
        })
-        #create one contract ending on wednesday and one other starting on thursday
-        self.env['hr.contract'].create({
-            'name': 'Contract 1',
-            'employee_id': self.employee.id,
-            'date_start': date(2025,8,18),
-            'date_end':  date(2025,8,24),
-            'resource_calendar_id': self.base_calendar.id,
-            'wage': 2000,
-            'state': 'close',
-        })
-        self.env['hr.contract'].create({
-            'name': 'Contract 2',
-            'employee_id': self.employee.id,
-            'state': 'open',
-            'date_start': date(2025,8,25),
-            'date_end': date(2025,8,31),
-            'resource_calendar_id': part_time_calendar.id,
-            'wage': 1500,
-        })
-        self.employee.resource_calendar_id = part_time_calendar.id
-        #create a timesheet with period including the change of contract
-        timesheet_sheet_1 = self._create_timesheet_sheet(date(2025,8,18))
-        timesheet_sheet_2 = self._create_timesheet_sheet(date(2025,8,25))
-  
-        timesheet_sheet_1.action_generate_recovery_allocation()
-        timesheet_sheet_2.action_generate_recovery_allocation()

-        recovery_allocation = self.env["hr.leave.allocation"].search([("timesheet_sheet_id","=",timesheet_sheet_1.id)])
-        self.assertEqual(len(recovery_allocation), 1, "There should be one recovery")
+        #create two hr.employee.calendar to change calendar during the timesheet period
+        self.env['hr.employee.calendar'].create({
+            'employee_id': self.employee.id,
+            'date_start': Date.to_date("2023-07-01"),
+            'date_end': Date.to_date("2025-07-31"),
+            'calendar_id': employee_full_time_calendar.id,
+        })
+        self.env['hr.employee.calendar'].create({
+            'employee_id': self.employee.id,
+            'date_start': Date.to_date("2025-08-01"),
+            'date_end': None,
+            'calendar_id': employee_part_time_calendar.id,
+        })
+        self.employee.resource_calendar_id = employee_part_time_calendar.id

-        recovery_allocation = self.env["hr.leave.allocation"].search([("timesheet_sheet_id","=",timesheet_sheet_2.id)])
-        self.assertEqual(len(recovery_allocation), 1, "There should be one recovery")
+        #create stats during period of full time calendar for the employee
+        timesheet_sheet = self.env['hr_timesheet.sheet'].create({
+            'employee_id': self.employee.id,
+            'date_start': "2025-07-07",
+            'date_end': "2025-07-13",
+        })
+        stats = self._create_stats(Date.to_date("2025-07-07"), 5, 7) 
+        for stat in stats:
+            stat._compute_dayofweek()
+            stat._compute_hours()
+            print("stat :", stat.date, stat.total_hours, stat.total_planned_hours, stat.gap_hours)
+        timesheet_sheet.action_generate_recovery_allocation()
+        self.assertEqual(timesheet_sheet.timesheet_sheet_gap_hours, 0, "timesheet_sheet_gap_hours should be 0",)
+        self.assertEqual(timesheet_sheet.timesheet_sheet_recovery_hours, 0, "timesheet_sheet_recovery_hours should be 0",)
+
+        #create stats during period of part time calendar for the employee
+        stats = self._create_stats(Date.to_date("2025-09-08"), 5, 7) 
+        for stat in stats:
+            stat._compute_dayofweek()
+            stat._compute_hours()
+        timesheet_sheet = self.env['hr_timesheet.sheet'].create({
+            'employee_id': self.employee.id,
+            'date_start': "2025-09-08",
+            'date_end': "2025-09-14",
+        })
+        self.assertEqual(timesheet_sheet.timesheet_sheet_gap_hours, 7, "timesheet_sheet_gap_hours should be 7",)
+        self.assertEqual(timesheet_sheet.timesheet_sheet_recovery_hours, 8.75, "timesheet_sheet_recovery_hours should be 8,75",)

    def test_public_holiday(self):
        # create a public holiday