further tests and fixes

2022-05-18 17:20:28 +01:00
parent f887257a55
commit a8cf3e3460
7 changed files with 953 additions and 102 deletions
@@ -1,6 +1,6 @@
 import datetime
 from collections import defaultdict
-from typing import List
+from typing import Iterable, List

 # from .shifts import RotaBuilder, days, sites
 import uuid
@@ -24,10 +24,10 @@ class Worker:
        nwd: list[str] | list[str, datetime.datetime, datetime.datetime] = [],
        start_date: datetime.datetime | None = None,
        end_date: datetime.datetime | None = None,
-        oop:list[(datetime.datetime, datetime.datetime, str)] | None = None,
-        not_available_to_work=None,
-        pref_not_to_work=None,
-        work_requests=None,
+        oop: list[(datetime.datetime, datetime.datetime, str)] | None = None,
+        not_available_to_work: list[(datetime.datetime, str)] | None = None,
+        pref_not_to_work: list[datetime.datetime] | None = None,
+        work_requests: list[(datetime.datetime, str)] | None = None,
        remote_site: str = "plymouth",  # We set a default proc_site
        previous_shifts: dict = {},
        shift_balance_extra: dict = {},
@@ -58,8 +58,11 @@ class Worker:

        self.shift_target_number = defaultdict(int)

-        #days_to_work = Rota.rota_days_length
+        # days_to_work = Rota.rota_days_length

+        if start_date is not None and end_date is not None:
+            if start_date >= end_date:
+                raise ValueError("End date must be after start date")

        # if no start date default to the start of the rota
        if start_date is None:
@@ -71,18 +74,12 @@ class Worker:
        if end_date is None:
            self.end_date = Rota.rota_end_date
        else:
-            if isinstance(end_date, datetime.date):
-                self.end_date = end_date
-            else:
-                self.end_date = datetime.datetime.strptime(end_date, "%d/%m/%y").date()
+            self.end_date = end_date
+            # self.end_date = datetime.datetime.strptime(end_date, "%d/%m/%y").date()

            if self.end_date > Rota.rota_end_date:
                self.end_date = Rota.rota_end_date

-            
-        #if self.start_date >= self.end_date:
-        #    raise ValueError("End date must be after start date")
-
        days_to_work = (self.end_date - self.start_date).days

        for week, day in Rota.weeks_days_product:
@@ -94,42 +91,28 @@ class Worker:
                    (self.id, week, day)
                ] = f"START DATE: {self.start_date}"

-            if date >= self.end_date: 
+            if date >= self.end_date:
                Rota.unavailable_to_work.add((self.id, week, day))
                Rota.unavailable_to_work_reason[
                    (self.id, week, day)
                ] = f"END DATE: {self.end_date}"

-        #if self.start_date > Rota.start_date:
-        #    # add unavalabilities
-        #    for weeks_days in Rota.weeks_days_product[:days_to_work]:
-        #        week, day = weeks_days
-        #        Rota.unavailable_to_work.add((self.id, week, day))
-        #        Rota.unavailable_to_work_reason[
-        #            (self.id, week, day)
-        #        ] = f"START DATE: {self.start_date}"
-
-        #if self.end_date < Rota.rota_end_date:
-        #    # add unavalabilities
-        #    for weeks_days in Rota.weeks_days_product[days_to_work:]:
-        #        week, day = weeks_days
-        #        Rota.unavailable_to_work.add((self.id, week, day))
-        #        Rota.unavailable_to_work_reason[
-        #            (self.id, week, day)
-        #        ] = f"END DATE: {self.end_date}"
-
        if oop is not None:
            for start_oop, end_oop, oop_name in oop:
-                #start_oop, end_oop = oop
+                # start_oop, end_oop = oop
                if isinstance(start_oop, datetime.date):
                    start_oop_date = start_oop
                else:
-                    start_oop_date = datetime.datetime.strptime(start_oop, "%d/%m/%y").date()
+                    start_oop_date = datetime.datetime.strptime(
+                        start_oop, "%d/%m/%y"
+                    ).date()

                if isinstance(end_oop, datetime.date):
                    end_oop_date = end_oop
                else:
-                    end_oop_date = datetime.datetime.strptime(end_oop, "%d/%m/%y").date()
+                    end_oop_date = datetime.datetime.strptime(
+                        end_oop, "%d/%m/%y"
+                    ).date()

                if start_oop_date >= end_oop_date:
                    raise ValueError("End OOP date must be after start date")
@@ -163,7 +146,7 @@ class Worker:
            # loop throught dates converting to week / day combination
            for date in pref_not_to_work:
                days_from_start = (
-                    datetime.datetime.strptime(date, "%d/%m/%y").date()
+                    date
                    - Rota.start_date
                ).days
                week = days_from_start // 7 + 1
@@ -180,7 +163,7 @@ class Worker:
            # loop throught dates converting to week / day combination
            for date, reason in not_available_to_work:
                days_from_start = (
-                    datetime.datetime.strptime(date, "%d/%m/%y").date()
+                    date
                    - Rota.start_date
                ).days
                week = days_from_start // 7 + 1
@@ -191,7 +174,7 @@ class Worker:
        if work_requests is not None:
            for date, shift in work_requests:
                days_from_start = (
-                    datetime.datetime.strptime(date, "%d/%m/%y").date()
+                    date
                    - Rota.start_date
                ).days
                week = days_from_start // 7 + 1