ross/proc-rota
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further tests and fixes

Browse Source
This commit is contained in:
Ross
2022-05-18 17:20:28 +01:00
parent f887257a55
commit a8cf3e3460
7 changed files with 953 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rota/shifts.py
+32 -14
View File
@@ -38,7 +38,7 @@ for bank_holiday in bank_holidays.get_holidays(division="england-and-wales"):
bank_holiday_map[bank_holiday["date"]] = bank_holiday["title"]
SHIFT_BOUNDS = {
"bank_holiday": (0, 4),
"bank_holiday": (0, 9),
"shift_count": (0, 400),
"night_shift_count": (0, 19),
"weekend_count": (0, 60),
@@ -76,7 +76,7 @@ class SingleShift(object):
length: float,
shift_days: Sequence[str],
# balance_by_site=True,
balance_offset: float = 2, # this could be generated dynamically
balance_offset: float | None = None,
balance_weighting: float = 1,
workers_required: float = 1,
rota_on_nwds: bool = False,
@@ -95,7 +95,11 @@ class SingleShift(object):
# balance_offset defines the max difference in allocated shifts
# versus target shifts (hard constraint)
# if 0 exactly equal shifts must be assigend (unlikely to be possible)
self.balance_offset = balance_offset
if balance_offset is None:
self.balance_offset = len(shift_days)
else:
self.balance_offset = balance_offset
# weight the shift for balancing, default is 1
self.balance_weighting = balance_weighting
@@ -615,6 +619,12 @@ class RotaBuilder(object):
initialize=availability_init,
)
# Validate shifts are valid
work_request_sets = set([i[3] for i in self.work_requests])
invalid_shifts = work_request_sets - set(self.get_shift_names())
if invalid_shifts:
raise InvalidShift(f"Invalid worker shift request [shift(s): ${invalid_shifts}]")
def work_request_init(model, wid, week, day, shift):
if (wid, week, day, shift) in self.work_requests:
self.work_requests_map[(wid, week, day)] = shift
@@ -2016,6 +2026,7 @@ class RotaBuilder(object):
"""
Process the added shifts
"""
self.shifts_by_name = {}
self.shift_names = [] # type: List[ShiftName]
@@ -2026,6 +2037,19 @@ class RotaBuilder(object):
self.week_day_shift_product = []
self.week_day_shiftclass_product = []
for s in self.shifts:
if s.name in self.shift_names:
raise InvalidShift(f"Duplicate shift: {s.name}")
self.shifts_by_name[s.name] = s
self.shift_names.append(s.name)
# for day in s.shift_days:
# self.week_day_shifts_dict[(week, day)].add(s.name)
for site in s.site:
self.sites.add(site)
self.shift_counts = defaultdict(int)
for week, day in self.weeks_days_product:
self.week_day_shifts_dict[(week, day)] = set()
@@ -2043,15 +2067,6 @@ class RotaBuilder(object):
self.week_day_shifts_dict[(week, day)].add(s.name)
self.shift_counts[s] = self.shift_counts[s] + 1
# print(self.week_day_shift_product)
for s in self.shifts:
self.shifts_by_name[s.name] = s
self.shift_names.append(s.name)
# for day in s.shift_days:
# self.week_day_shifts_dict[(week, day)].add(s.name)
for site in s.site:
self.sites.add(site)
# # Todo replace with week_day.....
# self.day_shift_product = []
@@ -2762,11 +2777,14 @@ class RotaBuilder(object):
class NoActiveSites(Exception):
"""Raised when there are no active sites"""
pass
class NoWorkers(Exception):
"""Raised when there are no active sites"""
pass
class InvalidShift(Exception):
"""Raised when there are no active sites"""
pass
rota/workers.py
+22 -39
View File
@@ -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