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

start pydanitification

Browse Source
This commit is contained in:
Ross
2022-05-26 15:38:35 +01:00
parent a8cf3e3460
commit c9ba2a098c
14 changed files with 767 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rota/shifts.py
+74 -23
View File
@@ -40,7 +40,7 @@ for bank_holiday in bank_holidays.get_holidays(division="england-and-wales"):
SHIFT_BOUNDS = {
"bank_holiday": (0, 9),
"shift_count": (0, 400),
"night_shift_count": (0, 19),
"night_shift_count": (0, 100),
"weekend_count": (0, 60),
}
@@ -55,7 +55,7 @@ class SingleShift(object):
postclear(2) / preclear(2)
require_remote_site_presence:
require_remote_site_presence_week:
options: (site, required_number)
night
@@ -185,6 +185,7 @@ class RotaBuilder(object):
self.unavailable_to_work = set()
self.unavailable_to_work_reason = {}
self.pref_not_to_work = {}
self.pref_not_to_work_reason = {}
self.work_requests = set()
self.work_requests_map = {}
@@ -203,14 +204,13 @@ class RotaBuilder(object):
self.max_weekend_frequency = max_weekend_frequency
self.constraint_options = {
"ensure_1_st4_plus_on_nights": True,
"balance_nights": True,
"constrain_time_off_after_nights": False,
"balance_nights_across_sites": True,
"balance_bank_holidays": True,
"balance_blocks": True,
"balance_shifts": True, # Does not use a quadratic function
"balance_shifts_quadratic": False,
"balance_shifts_quadratic": False, # Will prevent spreading of spreading across different shifts
"balance_shifts_over_workers": True,
"minimise_shift_diffs": False, # less sophisticated version of balance_shifts_over_workers
"balance_weekends": True,
@@ -223,8 +223,6 @@ class RotaBuilder(object):
"prevent_monday_and_tuesday_after_full_weekends": [],
"prevent_fridays_before_full_weekends": [],
"prevent_thursdays_before_full_weekends": [],
# This may be better defined on the shift?
"require_presence_at_site_overnight": [],
"avoid_st2_first_month": False,
"hard_constrain_pair_separation": False,
}
@@ -804,7 +802,7 @@ class RotaBuilder(object):
),
)
def presenceAtRemoteSite(model, week, shift, required_site, required_number):
def presenceAtRemoteSiteWeek(model, week, shift, required_site, required_number):
required_site_workers = [
w for w in self.workers if required_site == w.remote_site
]
@@ -817,6 +815,40 @@ class RotaBuilder(object):
>= required_number
)
for shift in self.get_shifts_with_constraint("require_remote_site_presence_week"):
site, required_number = shift.constraint_options[
"require_remote_site_presence_week"
]
# self.model.require_presence_at_site_overnight_rule = Constraint(
setattr(
self.model,
f"require_remote_site_presence_week_{shift.name}",
Constraint(
[week for week in self.weeks],
[shift.name],
[site],
[required_number],
rule=presenceAtRemoteSiteWeek,
),
)
def presenceAtRemoteSite(model, day, week, shift, required_site, required_number):
required_site_workers = [
w for w in self.workers if required_site == w.remote_site
]
for w in required_site_workers:
if (w.id, week, day, shift) not in model.works:
return Constraint.Skip
return (
sum(
model.works[w.id, week, day, shift]
for w in required_site_workers
)
>= required_number
)
for shift in self.get_shifts_with_constraint("require_remote_site_presence"):
site, required_number = shift.constraint_options[
"require_remote_site_presence"
@@ -826,6 +858,7 @@ class RotaBuilder(object):
self.model,
f"require_remote_site_presence_{shift.name}",
Constraint(
[day for day in self.days],
[week for week in self.weeks],
[shift.name],
[site],
@@ -912,10 +945,9 @@ class RotaBuilder(object):
full_workers = []
for w in workers:
if w.nwd:
if w.non_working_day_list:
l = []
# This should take into account dates!
for nwd, start_nwd_date, end_nwd_date in w.nwd:
for nwd, start_nwd_date, end_nwd_date in w.non_working_day_list:
if nwd in shift.shift_days:
if start_nwd_date > self.get_week_start_date(week):
continue
@@ -1121,7 +1153,7 @@ class RotaBuilder(object):
if self.constraint_options["balance_shifts_quadratic"]:
# This may need to be updated
xU = 25
xU = 10
xL = 1
self.model.constraints.add(
inequality(
@@ -1333,9 +1365,9 @@ class RotaBuilder(object):
)
# Ensure worker is not allocated shifts on non working days
if worker.nwd:
if worker.non_working_day_list:
for week, day, shift in self.get_all_shiftclass_combinations():
for n, start, end in worker.nwd:
for n, start, end in worker.non_working_day_list:
if not shift.rota_on_nwds and day == n:
# print(start, self.week_day_date_map[(week, day)], end)
if start <= self.week_day_date_map[(week, day)] < end:
@@ -1932,7 +1964,9 @@ class RotaBuilder(object):
Args:
workers (List(Worker)):
"""
self.workers.extend(workers)
for worker in workers:
self.add_worker(worker)
#self.workers.extend(workers)
def build_workers(self) -> None:
"""Process loaded shifts and workers
@@ -1947,6 +1981,7 @@ class RotaBuilder(object):
self.workers_name_map = {}
for worker in self.workers:
worker.load_rota(self)
wid = worker.id
if wid in self.workers_id_map:
raise ValueError(f"Worker with id '{wid}' has been added twice")
@@ -2251,16 +2286,23 @@ class RotaBuilder(object):
return self.workers_name_map[name]
def get_workers_by_group(self) -> Dict[str, Worker]:
group_workers = defaultdict(set)
group_workers = defaultdict(list)
for worker in self.workers:
group_workers[worker.site].add(worker)
group_workers[worker.site].append(worker)
return group_workers
def get_workers_by_remote_group(self) -> Dict[str, Worker]:
group_workers = defaultdict(list)
for worker in self.workers:
group_workers[worker.remote_site].append(worker)
return group_workers
def get_workers_by_grade(self) -> Dict[str, Worker]:
group_workers = defaultdict(set)
group_workers = defaultdict(list)
for worker in self.workers:
group_workers[worker.grade].add(worker)
group_workers[worker.grade].append(worker)
return group_workers
@@ -2462,7 +2504,7 @@ class RotaBuilder(object):
current_site = worker.site
shifts = []
nwds = json.dumps(worker.nwd, default=str)
nwds = json.dumps(worker.non_working_day_list, default=str)
#if worker.nwd:
# # TODO: limit to dates
# nwds = ", ".join([i[0] for i in worker.nwd])
@@ -2525,8 +2567,8 @@ class RotaBuilder(object):
remote_site = ""
if shift_name:
shift = self.get_shift_by_name(shift_name)
if "require_remote_site_presence" in shift.constraints:
remote_site = f" data-shift-remote-site='{shift.constraint_options['require_remote_site_presence'][0]}'"
if "require_remote_site_presence_week" in shift.constraints:
remote_site = f" data-shift-remote-site='{shift.constraint_options['require_remote_site_presence_week'][0]}'"
shift_tds.append(
f"<td title='{title}' class='rota-day {css_class}' data-shift='{shift_name}' data-available='{available}' data-unavailable_reason='{unavailable_reason}' data-date='{d}' data-week='{week}' data-day='{day}'{remote_site}{requests}{bank_holiday}>{a}</td>"
@@ -2564,8 +2606,8 @@ class RotaBuilder(object):
name=worker.name,
fte=worker.fte,
fte_adj=worker.fte_adj,
start_date=worker.start_date,
end_date=worker.end_date,
start_date=worker.calculated_start_date,
end_date=worker.calculated_end_date,
targets=worker_targets,
worker_shift_counts=json.dumps(shift_count_dict),
weekend_target=worker.weekend_shift_target_number,
@@ -2698,6 +2740,15 @@ class RotaBuilder(object):
return shifts
def get_workers_total_shifts(self) -> Dict[str, int]:
shifts = {}
for worker in self.workers:
shifts[worker.name] = len([i for i in self.get_worker_shift_list(worker) if i != ""])
return shifts
def get_worker_shift_list(self, worker: Worker) -> List:
shifts = []